Sezz
79cabfe63b
Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor
2022-03-14 22:54:56 +11:00
Sezz
0c65382576
Preserve momentum when sliding into a pit; cleanup
2022-03-14 22:44:10 +11:00
Stranger1992
8eec1cfd95
Merge branch 'TEN_Sound_Refactor_COPY' into SC2COPY
2022-03-01 23:39:29 +00:00
Stranger1992
6644d942c0
Revert "Replaced hardcoded Animating 2 for Minecraft switch with new item ID_MINECRAFT_SWITCH"
...
This reverts commit bb976c82dd
2022-02-27 03:28:25 +00:00
Stranger1992
bb976c82dd
Replaced hardcoded Animating 2 for Minecraft switch with new item ID_MINECRAFT_SWITCH
2022-02-20 20:38:14 +00:00
Stranger1992
21bbafe469
Added some object IDs
2022-02-04 22:31:15 +00:00
Lwmte
7ae51e9083
Uncomment bridge checks
2021-12-22 03:56:10 +03:00
Lwmte
c2751f392b
Update objectslist.h
2021-12-15 18:14:51 +03:00
Lwmte
27a9009f33
Remove more unused globals, refactor ObjectOnLOS
2021-11-04 20:23:26 +03:00
MontyTRC89
e4329c4974
Merge branch 'errors'
...
# Conflicts:
# TR5Main/Game/effects/flmtorch.cpp
# TR5Main/Game/objects.cpp
# TR5Main/Objects/Effects/enemy_missile.cpp
# TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
# TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
2021-10-28 11:06:02 +02:00
MontyTRC89
e5c8c1010e
Merge branch 'entities_fixings'
...
# Conflicts:
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/TombEngine.vcxproj.filters
2021-10-28 10:43:09 +02:00
Lwmte
7c3bccce93
Update objectslist.h
2021-10-28 00:16:02 +03:00
Lwmte
5355bf3983
update object list comments
2021-10-04 10:06:46 +03:00
MontyTRC89
717662063c
Fixing demigods
2021-10-03 07:23:54 +02:00
MontyTRC89
7a4b9aed5f
Refactored rope files; Fixed ID_POLE_ROPE;
2021-09-30 05:10:30 +02:00
MontyTRC89
e174a1ed4d
Added some ropes functions names
2021-09-29 05:29:25 +02:00
MontyTRC89
6cf4db33f1
Merge branch 'entities_fixings'
...
# Conflicts:
# TR5Main/Game/item.h
# TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
# TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp
# TR5Main/Objects/TR4/Trap/tr4_blade.cpp
# TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
# TR5Main/Objects/TR4/Trap/tr4_mine.cpp
# TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp
# TR5Main/TombEngine.vcxproj.filters
2021-09-20 06:15:39 +02:00
MontyTRC89
8ccccf083b
Cleaned ID_MAPPER, ID_ELEMENT_PUZZLE and ID_MINE
2021-09-20 05:50:47 +02:00
Lwmte
e70b87ca90
Merge branch 'master' into coll_info_reorganize
2021-09-19 23:47:31 +03:00
MontyTRC89
7c7db1ca1c
Cleaned SENTRY_GUN
2021-09-18 11:15:01 +02:00
MontyTRC89
1ec7f8a58b
Cleaned ID_JOBY_SPIKES and ID_MOVING_BLADE
2021-09-18 10:56:40 +02:00
MontyTRC89
234bc02b2f
Fixed ID_TEETH_SPIKES and ID_SETH_BLADE
2021-09-18 06:20:56 +02:00
MontyTRC89
1744c0ae12
Fixed GenericSphereBoxCollision(); Fixed ID_BIRD_BLADE and ID_PLOUGH;
2021-09-17 06:01:15 +02:00
MontyTRC89
22ea3f636c
Fixed ID_CATWALK_BLADE and ID_PLINTH_BLADE
2021-09-16 05:44:49 +02:00
Lwmte
ec84760f80
Merge branch 'master' into coll_info_reorganize
2021-09-15 14:38:05 +03:00
MontyTRC89
fa720f000d
Merge branch 'entities_fixings'
2021-09-15 06:09:16 +02:00
MontyTRC89
08691fc6ee
Fixed bug in GenericSphereBoxCollision(); Fixed ID_SPIKEY_BALL, ID_FLOOR_4BLADES, ID_CEILING_4BLADES;
2021-09-15 06:08:48 +02:00
Lwmte
9d25db4ca9
Merge branch 'master' into coll_info_reorganize
2021-09-13 09:48:59 +03:00
MontyTRC89
84a6ef5bab
Fixed ID_CHAIN, ID_COG;
2021-09-12 05:27:26 +02:00
MontyTRC89
e7eba9c30b
Removed closed doors
2021-09-12 05:09:20 +02:00
Lwmte
7854679a69
Remove all floordata legacy code
2021-09-11 22:41:25 +03:00
MontyTRC89
f43e7b863b
Fixed crowbar switch
2021-09-08 06:10:38 +02:00
MontyTRC89
053deaa302
Fixed ID_AHMET firing death; Decompiled missing code form TriggerFireFlame();
2021-08-31 12:59:46 +02:00
MontyTRC89
2b0624b166
Fixed ID_SAS_DRAG_BLOKE; Added namespaces to SAS functions;
2021-08-28 19:12:19 +02:00
MontyTRC89
a12247a287
Refactoring switches; Fixed ID_JUMP_SWITCH and ID_LEVER_SWITCH;
2021-08-25 09:42:17 +02: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
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
MontyTRC89
3bc685dc3b
Fixed missile control routine; Improved ID_CROCODILE_GOD;
2021-08-20 16:03:53 +02: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
ab37257b77
Fixed ID_HAMMERHEAD
2021-08-16 05:44:55 +02:00
Raildex
485638988a
Added new Sprite Slots for Bars, Binoculars,(Lasersight) and Caustics
2021-08-04 10:21:45 +02: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
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
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
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
Trxye
55b517010d
diary bs
2021-06-15 14:09:49 -05:00
MontyTRC89
00a5c93eb4
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2021-06-06 06:49:58 +02: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
