Commit graph

573 commits

Author SHA1 Message Date
MontyTRC89
db15fce51e Fixed missile control routine; Improved ID_CROCODILE_GOD; 2021-08-20 16:03:53 +02:00
MontyTRC89
4991da66f6 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
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
MontyTRC89
aa706f010c Fixed locusts; First try of namespaces for objects; 2021-08-19 14:17:21 +02:00
MontyTRC89
40a76c648c Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-18 11:18:18 +02:00
MontyTRC89
a84b39886e Fixed ID_LOCUST_EMITTER (missing only rendering) 2021-08-18 11:17:42 +02:00
Lwmte
5ae3de037e Revert pushable "fix" 2021-08-17 12:23:57 +03:00
asasas9500
4b2f0211fc Fix laser head 2021-08-16 23:40:51 -03:00
Lwmte
582fa41e44 Update tr5_pushableblock.cpp 2021-08-17 03:13:22 +03:00
Lwmte
4b3964a6ae Fix pushable detection without hacks 2021-08-17 01:40:25 +03:00
Lwmte
b9c52e1038 Fix big scorpion and harpy poisoning 2021-08-17 00:15:09 +03:00
MontyTRC89
075c35ef95 Fixed ID_HAMMERHEAD 2021-08-16 05:44:55 +02:00
MontyTRC89
31f4173dca FIxed ID_HARPY 2021-08-15 16:04:07 +02:00
Lwmte
dc23aae147 Rollback flame sizes 2021-08-05 16:12:10 +03:00
Nils
ca583d15ff Added new Sprite Slots for Bars, Binoculars,(Lasersight) and Caustics 2021-08-04 10:21:45 +02:00
Lwmte
861f147390 Assign remaining hit effect flags for TR4 2021-08-03 01:43:34 +03:00
Lwmte
3291010b6b Fix demigod fireballs and binoculars zoom 2021-08-02 16:51:36 +03:00
Lwmte
8d717c86ad Fix Lara fire 2021-08-02 15:40:51 +03:00
Lwmte
2db7e4dd05 Fix some sentry gun bugs 2021-08-02 15:01:28 +03:00
Lwmte
041b03c91d Assign hitEffect for most objects 2021-08-02 14:21:41 +03:00
Lwmte
1a43e0efb0 Fix small scorpion poisoning ratio 2021-08-02 12:07:54 +03:00
Lwmte
b6e9b30293 Fix poisoning 2021-08-01 23:28:54 +03:00
hispidence
0d5c49e6c3 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
48a714b92b Fix #276 2021-07-31 07:32:01 +03:00
Lwmte
755708cae8 Fix #268 2021-07-31 04:48:15 +03:00
hispidence
520acc7180 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
eb3b2316b5 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
9bdd6d0058 Rearrange headers so generic_bridge.h sees g_Level. 2021-07-23 21:41:44 +01:00
hispidence
21a867e821 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
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
f7e79a1768 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
3485b5d5d4 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
a0257f5fb5 Cast to GAME_OBJECT_ID. 2021-07-10 17:46:45 +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
f81d8e439f Added FROM_DEGREES function; Added quantity param to PickedUpObject(); LUA scripting refactoring WIP; 2021-06-29 05:00:15 +02:00
MontyTRC89
4c7110558f Switched audio tracks from int index to string; Added Tracks.lua loading support; 2021-06-26 07:36:54 +02:00
asasas9500
d5be155d4b Improve expanding platform 2021-06-17 20:13:28 -03:00
wolfcheese
b87c296986 Missed these from the previous commit 2021-06-15 19:52:39 -04:00
wolfcheese
12c19e01c3 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-06-15 19:48:53 -04:00
wolfcheese
422ac5dad2 Added checks to raising block, pushable block, floor and ceiling trapdoors to prevent crashing upon load 2021-06-15 19:48:30 -04:00
Trxye
77bc377977 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-15 14:09:56 -05:00
Trxye
6cb971715e diary bs 2021-06-15 14:09:49 -05:00
wolfcheese
d07e134c6a Updates to expanding platform 2021-06-15 10:43:13 -04:00
wolfcheese
f8c28f0836 Added height check to expanding_platform based on its animation 2021-06-13 11:34:46 -04:00
wolfcheese
e97b93e471 Cleaned up code for generic trapdoors 2021-06-12 16:39:13 -04:00
wolfcheese
62643f4c64 Added rudimentary implementation of EXPANDING_PLATFORM 2021-06-11 22:57:58 -04:00
wolfcheese
2f485c7ef2 Added bridge collision to trapdoor 2021-06-11 12:07:09 -04:00
Trxye
add1a9b35b fix compile 2021-06-10 11:36:34 -05:00