Lwmte
efa66ca8ff
Fix idiocy
2021-08-29 00:00:15 +03:00
Lwmte
1de60cfc1c
Merge branch 'master' into legacy_trigger_refactor
2021-08-28 21:38:58 +03:00
Lwmte
0b86ca1f67
Directly use beetle flag and remove ClockworkBeetleFlag from Lara struct
2021-08-28 10:29:48 +03:00
MontyTRC89
556b8b90a9
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
...
# Conflicts:
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
2021-08-28 06:45:36 +02:00
MontyTRC89
d3e6bfc7dd
Refactored switches
2021-08-28 06:37:22 +02:00
Lwmte
672607c16b
Remove OnObject global
2021-08-27 19:29:18 +03:00
Lwmte
7cfe471c26
Cleanup a bit more
2021-08-26 19:55:34 +03:00
Lwmte
d6a5e7b8c6
Merge branch 'master' into legacy_trigger_refactor
2021-08-26 19:49:09 +03:00
Lwmte
02d78da776
Cleanup sound code
2021-08-26 19:47:59 +03:00
Lwmte
31cb8408eb
Remove more magic
2021-08-26 19:00:50 +03:00
Lwmte
5e48c0350e
Rename effect.cpp to flipeffect.cpp to avoid confusions
2021-08-26 16:24:43 +03:00
Lwmte
dd3b6fa4e5
Move collision and FX functions from effect.cpp
2021-08-26 15:54:52 +03:00
Lwmte
932ccc40d1
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
b3424428ae
Fix building
2021-08-26 10:31:58 +03:00
Lwmte
f69f723a85
Further fixes
2021-08-25 06:33:15 +03:00
Lwmte
e0b47d629f
Merge branch 'master' into legacy_trigger_refactor
2021-08-24 19:04:54 +03:00
hispidence
4f6f3b9adf
Remove more vestiges of old trigger system. Replace TO_LUA_SCRIPT with the enum that used to be there - TO_BODYBAG - so that the following enums still have their same values.
2021-08-23 22:05:58 +01:00
hispidence
a1d5deed99
Merge remote-tracking branch 'origin/master'
2021-08-23 02:03:20 +01:00
hispidence
ef9a74d5e0
Clean up GameLogicScript.
...
Add some new member functions, ResetLevelTables and GetLevelFunc. The former is called in FreeLevelScripts, which is now called in control.cpp.
Remove AddTrigger, as the LevelFuncs table takes care of triggers.
2021-08-23 02:02:47 +01:00
MontyTRC89
327a21489f
Refactoring ID_LITTLE_BEETLES
2021-08-22 06:08:02 +02:00
Lwmte
b7d014080b
COLL_RESULT conversion in progress (broken)
2021-08-22 01:39:14 +03:00
Lwmte
ef2ff5bf51
Completely get rid of TriggerIndex
2021-08-20 15:26:12 +03:00
Lwmte
218e9f685a
Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs
2021-08-20 14:13:06 +03:00
MontyTRC89
2e1ac44c08
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
2021-08-20 05:26:07 +02:00
MontyTRC89
109b7d6e18
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine ; Renamed namespaces;
...
# Conflicts:
# TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
hispidence
ad7c6fddd1
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
Lwmte
e7e1cca356
First commit
2021-08-20 02:01:50 +03:00
MontyTRC89
aa706f010c
Fixed locusts; First try of namespaces for objects;
2021-08-19 14:17:21 +02:00
hispidence
d1c67f29cc
Remove g_AudioTracks reference from a file where it's not used.
2021-08-17 13:15:38 +01:00
asasas9500
b04354e35a
Remove hack remains
2021-08-16 18:19:40 -03:00
hispidence
8733903333
Cast this bit too in service of killing warnings.
2021-08-12 22:17:08 +01:00
hispidence
acebbad182
Clean up some warnings.
2021-08-12 22:10:05 +01:00
hispidence
8b7815c8a0
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
5802745c1c
Fix some lasersight issues
2021-08-11 15:18:22 +03:00
Lwmte
af38c9cc4e
Fix #289
2021-08-11 13:10:22 +03:00
hispidence
873f046533
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
e0ffefaf5d
Scope TITLE_TYPE usage.
2021-08-07 19:25:13 +01:00
hispidence
d1ca2df0a6
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
5b432b133b
Fix git mess
2021-08-06 12:21:16 +03:00
Lwmte
16c36be7de
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
bc15f34339
Add support for sphere volumes
2021-08-05 15:46:03 +03:00
Lwmte
6d91e7ddba
Don't call nonexistent volume functions
2021-08-05 14:56:09 +03:00
Lwmte
e8b1792d44
Fix controls lockup if level was changed during flyby with disabled controls
2021-08-05 14:26:23 +03:00
hispidence
ead31e63f2
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
19c776588f
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
6cbf19fe8d
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
2021-08-02 12:49:32 +01:00
hispidence
0da5f86f90
Remove HandleScriptMessage and associated globals - apparently this is no longer supposed to be here.
2021-08-02 12:49:17 +01:00
Lwmte
4da3b6b624
Fix binoculars mode engaging other states
2021-08-02 12:35:17 +03:00
Lwmte
b6e9b30293
Fix poisoning
2021-08-01 23:28:54 +03:00
MontyTRC89
f0698a3c80
Added code (to finish) for executing LUA triggers
2021-07-17 05:56:40 +02:00
