Commit graph

313 commits

Author SHA1 Message Date
hispidence
10419d15a8 Fixed some GameFlowScript.cpp warnings:
Remove SkyVelocity1 and SkyVelocity2 - they weren't being used.
Change a loop var to a size_t.
Make GameScriptInventoryObject.yOffset a short.
2021-08-20 02:42:47 +01:00
hispidence
011c5b2222 Remove g_AudioTracks reference from a file where it's not used. 2021-08-17 13:15:38 +01:00
asasas9500
43bb0bc410 Remove hack remains 2021-08-16 18:19:40 -03:00
hispidence
97089fb2a6 Cast this bit too in service of killing warnings. 2021-08-12 22:17:08 +01:00
hispidence
561119ef09 Clean up some warnings. 2021-08-12 22:10:05 +01:00
hispidence
582b000fb9 Make OnControlPhase take a float, representing the delta time.
This is not ACTUALLY the amount of time that has passed, since things in the gameplay loop appear to assume they are being called thirty times per second, even if more or less time has passed. Thus to keep the scripts in sync with the the rest of the engine, we force a 1/30 second delta time.
2021-08-12 18:20:14 +01:00
Lwmte
7b9f01a1c4 Fix some lasersight issues 2021-08-11 15:18:22 +03:00
Lwmte
080658c416 Fix #289 2021-08-11 13:10:22 +03:00
hispidence
8e6ff2faee Fix what seems to be a copy-paste error (sky layer 2 doesn't seem to be implemented right now anyway, but still). 2021-08-07 19:25:55 +01:00
hispidence
0d8b9c881b Scope TITLE_TYPE usage. 2021-08-07 19:25:13 +01:00
hispidence
0974fc091c Fix old LARA_DRAW_TYPE usage with LARA_TYPE constants.
These don't need to be scoped, but I originally made it an enum class and plan to end up doing so down the line anyway, and this should save a bit of time there.
2021-08-07 19:24:39 +01:00
Lwmte
a43cb7506d Fix git mess 2021-08-06 12:21:16 +03:00
Lwmte
2bdb851092 Reorder renderer operations, redo debug output (use F10-F11 to switch pages), add debug sphere/box drawing 2021-08-06 11:12:34 +03:00
Lwmte
f9831ee892 Add support for sphere volumes 2021-08-05 15:46:03 +03:00
Lwmte
2e1bb88e5b Don't call nonexistent volume functions 2021-08-05 14:56:09 +03:00
Lwmte
408bbf8e73 Fix controls lockup if level was changed during flyby with disabled controls 2021-08-05 14:26:23 +03:00
hispidence
1d1653f995 Replace WarningsAsErrors usage with ScriptAssert usage.
For recoverable errors, add some recovery behaviour and logging so a level designer can see in the log what was done as a result of the error.

Warn about default behaviour if no callbacks are added.
2021-08-04 16:51:28 +01:00
hispidence
dfcbdb753a Wrap GameMain in a try-catch that catches TENScriptException. Any unhandled exception should be caught here and logged. 2021-08-03 15:14:24 +01:00
hispidence
818b0f7db2 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-02 12:49:32 +01:00
hispidence
498873bc65 Remove HandleScriptMessage and associated globals - apparently this is no longer supposed to be here. 2021-08-02 12:49:17 +01:00
Lwmte
e013ed4e24 Fix binoculars mode engaging other states 2021-08-02 12:35:17 +03:00
Lwmte
551982d453 Fix poisoning 2021-08-01 23:28:54 +03: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