Commit graph

59 commits

Author SHA1 Message Date
MontyTRC89
8294e73199 Merge remote-tracking branch 'origin/lara_info'
# Conflicts:
#	TR5Main/Game/Lara/lara_flare.h
#	TR5Main/Scripting/GameLogicScript.cpp
2021-07-14 05:48:42 +02:00
MontyTRC89
1b60545b4a Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-07-14 05:30:04 +02:00
MontyTRC89
fcc4e4465d Added LUA name for statics; LUA names refactoring; 2021-07-14 05:29:23 +02:00
hispidence
10aec3d6f2 Make some functions take a GAME_OBJECT_ID instead of a short. Make AIOBJECT use a GAME_OBJECT_ID instead of a short. 2021-07-11 16:55:20 +01:00
MontyTRC89
c1bfae6bf9 Refactored cameras, sinks and sound sources; Added sound sources playback; 2021-07-10 06:55:37 +02:00
MontyTRC89
34862c94e7 Added trigger volumes experimental 2021-07-05 16:33:50 +02:00
MontyTRC89
1c197bae7e Fix merge conflicts 2021-03-27 07:38:51 +01:00
MontyTRC89
2e86229b5c New level loader code for anim textures 2021-03-27 07:33:40 +01:00
MontyTRC89
d544ab5917 Animated textures data in polygons 2021-03-12 21:33:02 +01:00
MontyTRC89
67dc6e0379 Implemented new anim textures in file format 2021-03-10 18:45:12 +01:00
asasas9500
29e00e9219 Fix boxes 2021-01-28 20:49:30 -03:00
asasas9500
fbd4848a22 Fix no pathfinding 2021-01-17 20:29:37 -03:00
asasas9500
98e9d953d2 Implement new random system 2020-10-24 01:05:59 -03:00
Nils
0ee12930d5 Added Static Mesh Tint Support 2020-10-07 09:08:23 +02:00
Nils
ea9afa7413 Refactored framework.h
Removed Renderer headers from framework.h
Removed bass headers from framework.h
Removed windows-related headers to avoid nameclashes with std::min and std::max
added <algorithm> for general-purpose functions (like std::min/max)
Added NOMINMAX define to project
Minor Refactorings
2020-09-29 21:43:56 +02:00
asasas9500
912b0abbae Fix bridges; Fix script IDs 2020-09-28 10:04:44 -03:00
asasas9500
9241d011b1 Fix first bugs in new floordata 2020-09-19 20:09:57 -03:00
asasas9500
26a32db4a0 New floordata prototype 2020-09-14 00:19:05 -03:00
Montagna Marco
d09e4d9ae7 Fixed sounds 2020-09-08 19:50:19 +02:00
Montagna Marco
82af97c8cc Fixed enemy monkey; Added new zone for ID_VON_CROY; Small AI fixes; Added 3 blocks jump; 2020-09-01 07:06:31 +02:00
Montagna Marco
73789e38bd Restored Lara's damage with grenade; HP for statics; 2020-08-16 21:06:35 +02:00
Nils Gaitzsch
11b2e2cd61 Refactored functions 2020-08-09 15:25:56 +02:00
Montagna Marco
05dd077d11 Increased itemFlags array; Added startPos to ITEM_INFO; Improved wraiths; Rewritten BuildOutsideRoomsTable; 2020-08-04 21:53:58 +02:00
Montagna Marco
325b5841d0 Decompiled wraiths; Added outside rooms table; 2020-08-02 19:39:55 +02:00
Montagna Marco
3f117dddd8 Lights refactor 2020-07-26 16:17:54 +02:00
Montagna Marco
1c4196832c Added ZLIB 2020-07-26 07:21:38 +02:00
Montagna Marco
014aa1baa7 Frames refactoring 2020-07-25 18:02:35 +02:00
Montagna Marco
18994dd59e Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
Montagna Marco
74efdea859 Normal mapping; Tangents and bitangents; 2020-07-18 06:58:44 +02:00
Montagna Marco
133c971aaf Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-07-11 21:29:49 +02:00
Montagna Marco
9f373c691a Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Nils Gaitzsch
4b825f364e Merge branch 'master' into memory
# Conflicts:
#	TR5Main/Objects/TR5/tr5_objects.cpp
2020-07-10 20:17:03 +02:00
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Nils Gaitzsch
8fb4c7002b Merge branch 'master' into memory 2020-07-05 22:19:28 +02:00
Nils Gaitzsch
da0eaeac0e Made Game_Malloc a template with a count parameter 2020-07-05 22:19:06 +02:00
Montagna Marco
e88d24347b Refactored again room and eshes geometry loading 2020-07-05 06:20:36 +02:00
Montagna Marco
439db540e3 New level format: meshes 2020-07-03 07:05:33 +02:00
Montagna Marco
e0aaae0a3e Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-29 13:29:45 +02:00
Montagna Marco
8da773758f New file format: rooms geometry 2020-06-28 15:51:33 +02:00
Nils Gaitzsch
bce320d1b8 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
2020-06-27 19:48:50 +02:00
Montagna Marco
6fa19edf3e New level format: ambient light now is Vector3 2020-06-26 20:51:59 +02:00
Montagna Marco
d6f45db5ec Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-26 07:06:51 +02:00
Montagna Marco
235dab2f13 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
Nils Gaitzsch
3781370e06 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
Nils Gaitzsch
08f3910e4d RAII texture2D 2020-06-21 11:51:46 +02:00
Nils Gaitzsch
c860919616 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
Montagna Marco
1cddd102d0 New level format: textures and sprites 2020-06-20 21:20:36 +02:00
TokyoSU
11b3751851 Finished Moving Function
- Moved Some Function to here respective file (new cpp/h).
- Changed effect_routines to function<void(ITEM_INFO*)>.
- Fixed ActivateCamera() not using ITEM_INFO* Argument for effect_routines[].
- Fixed ActivateKey() not using ITEM_INFO* Argument for effect_routines[].
- Fixed ActivateKey() and ActivateCamera() being defined 2 time.
- Commented the new level loader, for later.
2020-06-04 11:00:08 +02:00
Montagna Marco
1cc2e5824a Fixes to level loader 2020-05-31 09:39:32 +02:00
TokyoSU
ee59d27517 (Broken) Deleted Global Folder
- No more enums.h, constants.h, macro.h, etc...
- moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00