Commit graph

837 commits

Author SHA1 Message Date
Lwmte
54d649899d Merge branch 'master' into legacy_trigger_refactor 2021-08-26 00:38:21 +03:00
MontyTRC89
a12247a287 Refactoring switches; Fixed ID_JUMP_SWITCH and ID_LEVER_SWITCH; 2021-08-25 09:42:17 +02:00
MontyTRC89
5129f0e064 Fixed ID_COG_SWITCH 2021-08-25 08:16:35 +02:00
Lwmte
ca36cb5a47 Fix skeleton crash 2021-08-25 09:14:32 +03:00
Lwmte
3378c8791a Organize COLL_INFO 2021-08-25 06:54:17 +03:00
Lwmte
ec9479860f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
Lwmte
70626854f0 Replace all remaining occurences of coll globals 2021-08-24 16:54:26 +03:00
hispidence
cb1ad16b2d 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
MontyTRC89
4d6658ebef Cleaned last commit 2021-08-23 13:37:13 +02:00
MontyTRC89
dc7e1f683a Fixed the minus sign inside TestLaraPosition 2021-08-23 13:35:26 +02:00
MontyTRC89
9474284c87 Refactoring ID_LITTLE_BEETLES 2021-08-22 06:08:02 +02:00
MontyTRC89
517ba6b88a Fixed ID_SKELETON 2021-08-22 05:48:14 +02:00
Lwmte
2756a65095 COLL_RESULT conversion in progress (broken) 2021-08-22 01:39:14 +03:00
MontyTRC89
3bc685dc3b Fixed missile control routine; Improved ID_CROCODILE_GOD; 2021-08-20 16:03:53 +02:00
Lwmte
1828ddaeab Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs 2021-08-20 14:13:06 +03:00
MontyTRC89
7093a8df24 Refactored energy bubbles function names; Removed LanguageScript.cpp from the project; Working on ID_CROCODILE_GOD; 2021-08-20 06:00:34 +02:00
MontyTRC89
0ed8181cda Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
MontyTRC89
095423b30a Fixed locusts; First try of namespaces for objects; 2021-08-19 14:17:21 +02:00
MontyTRC89
fa009c4dfc Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-18 11:18:18 +02:00
MontyTRC89
11f8e533e9 Fixed ID_LOCUST_EMITTER (missing only rendering) 2021-08-18 11:17:42 +02:00
Lwmte
5c8cfd1764 Revert pushable "fix" 2021-08-17 12:23:57 +03:00
asasas9500
e47d359625 Fix laser head 2021-08-16 23:40:51 -03:00
Lwmte
17501c45d0 Update tr5_pushableblock.cpp 2021-08-17 03:13:22 +03:00
Lwmte
a277954a8c Fix pushable detection without hacks 2021-08-17 01:40:25 +03:00
Lwmte
26e75629ac Fix big scorpion and harpy poisoning 2021-08-17 00:15:09 +03:00
MontyTRC89
ab37257b77 Fixed ID_HAMMERHEAD 2021-08-16 05:44:55 +02:00
MontyTRC89
4f0f077378 FIxed ID_HARPY 2021-08-15 16:04:07 +02:00
Lwmte
b25ba9e71e Rollback flame sizes 2021-08-05 16:12:10 +03:00
Raildex
485638988a Added new Sprite Slots for Bars, Binoculars,(Lasersight) and Caustics 2021-08-04 10:21:45 +02:00
Lwmte
c61b0a0d95 Assign remaining hit effect flags for TR4 2021-08-03 01:43:34 +03:00
Lwmte
2c64db3e30 Fix demigod fireballs and binoculars zoom 2021-08-02 16:51:36 +03:00
Lwmte
7683cacb3f Fix Lara fire 2021-08-02 15:40:51 +03:00
Lwmte
7e37ee8572 Fix some sentry gun bugs 2021-08-02 15:01:28 +03:00
Lwmte
1c4c321e0d Assign hitEffect for most objects 2021-08-02 14:21:41 +03:00
Lwmte
1317c85bd6 Fix small scorpion poisoning ratio 2021-08-02 12:07:54 +03:00
Lwmte
551982d453 Fix poisoning 2021-08-01 23:28:54 +03:00
hispidence
2353be1fc2 Fix assignment-addition operator of GAME_OBJECT_ID, thus fixing a stack overflow. The operator was calling itself... Silly me D: 2021-08-01 20:49:28 +01:00
Lwmte
2c802289ea Fix #276 2021-07-31 07:32:01 +03:00
Lwmte
3a2327a220 Fix #268 2021-07-31 04:48:15 +03:00
hispidence
6e8886dadd Make the GAME_OBJECT_ID compound addition-assignment operator take references, as is the canonical implementation (and so we don't return a reference to a local, as cppcheck very correctly warned me about). 2021-07-24 14:10:16 +01:00
hispidence
5e98a7aff7 Define some PHD_3DPOS vars before TriggerShockwave calls so that we don't take an address of a temporary. 2021-07-23 21:51:41 +01:00
hispidence
f65ec91756 Rearrange headers so generic_bridge.h sees g_Level. 2021-07-23 21:41:44 +01:00
hispidence
53b971c033 Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings. 2021-07-18 15:22:15 +01: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
2dbaac0572 Add += operator and from_underlying function, because for some reason C++ doesn't like implicitly converting between an enum and its own underlying type.
These ONLY work for the type itself and its underlying type - this means the compiler will notify us if we try and use an int or long instead of a bool, and we can double check to make sure it is intended.
2021-07-11 16:50:29 +01:00
hispidence
af75b4f55d Make GAME_OBJECT_ID a short in its underlying type (since that's the type that's mostly used to refer to it) and remove typedef to make VC++ stop giving tons of warnings. 2021-07-11 13:07:50 +01:00
hispidence
10fe19f559 Cast to GAME_OBJECT_ID. 2021-07-10 17:46:45 +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