Commit graph

292 commits

Author SHA1 Message Date
hispidence
498873bc65 Remove HandleScriptMessage and associated globals - apparently this is no longer supposed to be here. 2021-08-02 12:49:17 +01:00
MontyTRC89
7c1e29e6d0 Added code (to finish) for executing LUA triggers 2021-07-17 05:56:40 +02:00
MontyTRC89
223e7b673f New volume triggers logic 2021-07-16 11:13:57 +02:00
MontyTRC89
0495681cb1 Fixed volumes and added debug message 2021-07-15 10:56:03 +02:00
MontyTRC89
916d22759b 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
98c62c58bb Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-07-14 05:30:04 +02:00
hispidence
85f5c9dadd Call title script if present. 2021-07-10 17:51:01 +01:00
MontyTRC89
1effeed738 Refactored cameras, sinks and sound sources; Added sound sources playback; 2021-07-10 06:55:37 +02:00
Troye
88407761b1 clean up larainfo; add anim bools' 2021-07-08 14:15:14 -05:00
MontyTRC89
c98c51f5b5 Made LUA script optional; Deleted my bugged test code for volumes; 2021-07-06 11:54:34 +02:00
MontyTRC89
a12d9d8793 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
465e5f2347 Added trigger volumes experimental 2021-07-05 16:33:50 +02:00
hispidence
534e458395 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
adad1e69e7 Init and call new Lua script callbacks. 2021-07-01 19:32:10 +01:00
MontyTRC89
aaee0e833a 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
c4577641c2 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main into NewLuaScripting 2021-06-29 05:01:35 +02:00
hispidence
a9583065f6 Run the level script inside DoLevel. For now, this just runs the script once. 2021-06-28 18:34:59 +01:00
MontyTRC89
a4d3ec9d26 Switched audio tracks from int index to string; Added Tracks.lua loading support; 2021-06-26 07:36:54 +02:00
wolfcheese
0bea268332 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
062d926a8d Disable debris on level unload to avoid crashes 2021-06-23 14:14:58 -04:00
Trxye
0c6f3de5b7 fix pickup display; fix ring inv compile; implement extra puzzle/key items in inventory; 2021-06-10 14:40:28 -05:00
wolfcheese
c4c57a87f6 Disable all bubbles when the game unloads to avoid crashing 2021-06-06 18:14:13 -04:00
MontyTRC89
b3f1f246e1 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
abb7b0c862 Added some constants to TestTrigger(); Fixed ID_SETH_BLADE; Fixed many collision bugs with Lara; 2021-06-04 06:02:19 +02:00
Trxye
d87d6e2030 fix crowbar inv bug 2021-05-31 11:57:42 -05:00
Trxye
e41623d3be fix level select; fix pause menu audio bug; fix clockwork beetle hand pos; 2021-05-28 00:57:53 -05:00
Trxye
e3ba7234e7 fix ClockworkBeetleControl(); 2021-05-27 18:35:31 -05:00
Trxye
41508e1b92 fix setting ClockworkBeetleFlag; 2021-05-27 18:02:25 -05:00
Trxye
a6de3f6141 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 16:08:09 -05:00
Trxye
3edfe48af6 decompile clockwork beetle; 2021-05-27 16:07:57 -05:00
MontyTRC89
6ed2dfd28d Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
Trxye
c0ca04a806 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
Trxye
d7fa758df7 fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
Trxye
6074ab93a2 implement new inventory 2021-05-18 19:16:58 -05:00
MontyTRC89
c707f533c8 Possibly fixed DoRayBox and GetTargetOnLOS for working like in original game; Fixed ID_TROOPS; 2021-05-07 06:06:30 +02:00
MontyTRC89
adf51a567c Fixed baddy state 0 2021-04-21 06:45:08 +02:00
MontyTRC89
4ae7d54e6b Fixed SameZone(); Adding picking to Baddy 1-2; 2021-04-16 10:13:59 +02:00
MontyTRC89
7a93fb25fa Fixed energy arcs 2021-04-16 06:46:54 +02:00
MontyTRC89
14e9a09598 Temporary fixes to AI; Decompiling energy arcs WIP; 2021-04-13 06:08:33 +02:00
asasas9500
5682a3b6cd Delete empty files 2021-02-07 18:15:20 -03:00
asasas9500
495641c632 Remove comments; Fix ID_ANIMATING13, ID_ANIMATING14, ID_ANIMATING15 and ID_ANIMATING16 2021-02-07 00:10:36 -03:00
asasas9500
6eb1a5e963 Merge branch 'master' into PushableOCB 2021-02-06 11:50:08 -03:00
Trxye
b4303e030a uncomment original GetFloorHeight things 2021-02-04 17:36:03 -06:00
asasas9500
700c1b5907 Remove function markers 2021-02-03 01:50:59 -03:00
asasas9500
2917bd9997 Implement virtual rooms into floordata 2021-01-06 17:53:13 -03:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
KrysB4k
735e73f1ea 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
187efb475f Fixed ID_SPHINX; Fixed heavy triggers; 2020-12-10 15:22:18 +01:00
asasas9500
8ec8decc59 Merge branch 'master' into NewTRMath 2020-11-11 16:09:33 -03:00