Commit graph

290 commits

Author SHA1 Message Date
MontyTRC89
0caaab8c52 New volume triggers logic 2021-07-16 11:13:57 +02:00
MontyTRC89
3836ed7a26 Fixed volumes and added debug message 2021-07-15 10:56:03 +02:00
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
hispidence
42a11f2118 Call title script if present. 2021-07-10 17:51:01 +01:00
MontyTRC89
c1bfae6bf9 Refactored cameras, sinks and sound sources; Added sound sources playback; 2021-07-10 06:55:37 +02:00
Troye
e201df8f97 clean up larainfo; add anim bools' 2021-07-08 14:15:14 -05:00
MontyTRC89
99f476f3b9 Made LUA script optional; Deleted my bugged test code for volumes; 2021-07-06 11:54:34 +02:00
MontyTRC89
d85d624609 Merge branch 'NewLuaScripting' of https://github.com/MontyTRC89/TR5Main into NewLuaScripting
# Conflicts:
#	TR5Main/Game/control.cpp
#	TR5Main/Scripting/GameScriptItemInfo.cpp
2021-07-05 16:38:22 +02:00
MontyTRC89
34862c94e7 Added trigger volumes experimental 2021-07-05 16:33:50 +02:00
hispidence
19402f8d55 Move OnStart and OnLoad calls to after things are initialised but before the game loop begins. 2021-07-03 22:56:12 +01:00
hispidence
76aa8cd786 Init and call new Lua script callbacks. 2021-07-01 19:32:10 +01:00
MontyTRC89
b6e74eb4e6 Merge branch 'NewLuaScripting' of https://github.com/MontyTRC89/TR5Main into NewLuaScripting
# Conflicts:
#	TR5Main/Scripting/GameLogicScript.cpp
2021-06-29 05:03:57 +02:00
MontyTRC89
7f8cdec884 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main into NewLuaScripting 2021-06-29 05:01:35 +02:00
hispidence
9e17b737ea Run the level script inside DoLevel. For now, this just runs the script once. 2021-06-28 18:34:59 +01:00
MontyTRC89
4c7110558f Switched audio tracks from int index to string; Added Tracks.lua loading support; 2021-06-26 07:36:54 +02:00
wolfcheese
d7b1720ca2 Removed code messing up angle of crossbow arrows during lasersight. Crossbow ammo now depletes during lasersight. 2021-06-23 14:45:04 -04:00
wolfcheese
ef46715233 Disable debris on level unload to avoid crashes 2021-06-23 14:14:58 -04:00
Trxye
8813790f9a fix pickup display; fix ring inv compile; implement extra puzzle/key items in inventory; 2021-06-10 14:40:28 -05:00
wolfcheese
ad231589bb Disable all bubbles when the game unloads to avoid crashing 2021-06-06 18:14:13 -04:00
MontyTRC89
7406577e29 Partially fixed ID_GUIDE; Restored flipeffects processing; Fixed LARA_INFO struct for flipeffect 30 Lara location; 2021-06-06 06:49:49 +02:00
MontyTRC89
6235959889 Added some constants to TestTrigger(); Fixed ID_SETH_BLADE; Fixed many collision bugs with Lara; 2021-06-04 06:02:19 +02:00
Trxye
fbb50b4609 fix crowbar inv bug 2021-05-31 11:57:42 -05:00
Trxye
5973a049b7 fix level select; fix pause menu audio bug; fix clockwork beetle hand pos; 2021-05-28 00:57:53 -05:00
Trxye
3952e8bdca fix ClockworkBeetleControl(); 2021-05-27 18:35:31 -05:00
Trxye
8b31698cd2 fix setting ClockworkBeetleFlag; 2021-05-27 18:02:25 -05:00
Trxye
8f74bad385 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 16:08:09 -05:00
Trxye
e5ffb1f70e decompile clockwork beetle; 2021-05-27 16:07:57 -05:00
MontyTRC89
99614caa27 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
Trxye
35af9b2c92 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
MontyTRC89
6b5a932ff8 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
Trxye
622cc4210a fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
Trxye
4cc7cee4c9 implement new inventory 2021-05-18 19:16:58 -05:00
MontyTRC89
93a2693abb Possibly fixed DoRayBox and GetTargetOnLOS for working like in original game; Fixed ID_TROOPS; 2021-05-07 06:06:30 +02:00
MontyTRC89
5a481ccb0b Fixed baddy state 0 2021-04-21 06:45:08 +02:00
MontyTRC89
976ce7a316 Fixed SameZone(); Adding picking to Baddy 1-2; 2021-04-16 10:13:59 +02:00
MontyTRC89
8c07826651 Fixed energy arcs 2021-04-16 06:46:54 +02:00
MontyTRC89
bc84a2bf03 Temporary fixes to AI; Decompiling energy arcs WIP; 2021-04-13 06:08:33 +02:00
asasas9500
a63a46c82e Delete empty files 2021-02-07 18:15:20 -03:00
asasas9500
3a56b42ae2 Remove comments; Fix ID_ANIMATING13, ID_ANIMATING14, ID_ANIMATING15 and ID_ANIMATING16 2021-02-07 00:10:36 -03:00
asasas9500
128d409aa7 Merge branch 'master' into PushableOCB 2021-02-06 11:50:08 -03:00
Trxye
3c7665ab0c uncomment original GetFloorHeight things 2021-02-04 17:36:03 -06:00
asasas9500
4521994088 Remove function markers 2021-02-03 01:50:59 -03:00
asasas9500
7bbb65581a Implement virtual rooms into floordata 2021-01-06 17:53:13 -03:00
asasas9500
d4c6cc4a97 Fix line endings 2020-12-21 13:16:29 -03:00
KrysB4k
8f6b428942 Removed duplicate function GetFloorAndTestTriggers, fix pushblock issues
GetFloorAndItemTriggers() was removed in favor of TestTriggersAtXYZ() from switch.cpp, which does the same. All calls to GetFloorAndItemTriggers were replaced with TestTriggersAtXYZ.

Pushables pulling bug was fixed in TestBlockPull(). PushableBlockControl() now calls ItemNewRoom() to signal change of room membership of pushable.
2020-12-19 23:02:55 +01:00
MontyTRC89
efc5d1e09d Fixed ID_SPHINX; Fixed heavy triggers; 2020-12-10 15:22:18 +01:00
asasas9500
b110c32199 Merge branch 'master' into NewTRMath 2020-11-11 16:09:33 -03:00
asasas9500
e45daf7d24 Separate bridge floor and ceiling; Fix pushables 2020-11-11 15:01:45 -03:00
asasas9500
804de67381 Improve new floordata static functions; Rework bridges 2020-11-10 22:31:29 -03:00