Commit graph

1877 commits

Author SHA1 Message Date
Lwmte
fb65e68191 Remove broken CollideStaticObjects function
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:50:10 +02:00
Lwmte
cccd7a048b Clarify function names
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +02:00
MontyTRC89
e73aaf14e9 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-09-02 05:51:17 +02:00
MontyTRC89
b77b1c53cb Decompiled ID_HORSEMAN and ID_HORSE (to finish states names) 2021-09-02 05:51:10 +02:00
Lwmte
3c4213f5c9 Fix static collision in water 2021-09-01 14:23:58 +03:00
Nils
ded829ab1f Fixed stupid hair 2021-09-01 05:53:08 +02:00
Nils
54857431be Fixed Crashing Inventory 2021-08-31 18:24:32 +02:00
MontyTRC89
a767f15ee4 Fixed ID_AHMET firing death; Decompiled missing code form TriggerFireFlame(); 2021-08-31 12:59:46 +02:00
MontyTRC89
cacba03060 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-31 05:20:05 +02:00
MontyTRC89
7d3b8c1bef Fixed TR4 dog 2021-08-31 05:19:11 +02:00
Lwmte
e879038220 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
aae46a5f3f Move some more stuff to trigger.cpp 2021-08-30 17:52:38 +03:00
Lwmte
d2f4576b27 Move trigger functions into separate file 2021-08-30 17:50:32 +03:00
Lwmte
7ace89c1d5 Add volumes for flyby cams (with heavy flag) 2021-08-30 16:13:27 +03:00
Lwmte
56c71d1fe6 Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +03:00
Lwmte
c04afb30fe Fix copypaste bug 2021-08-30 11:02:33 +03:00
MontyTRC
a88aafef72
Merge pull request #311 from MontyTRC89/legacy_trigger_refactor
Floordata convenience improvements and de-corefication
2021-08-30 09:51:06 +02:00
Lwmte
1115b9d5f5 More cleanup 2021-08-30 10:34:20 +03:00
Lwmte
e2e20a2497 Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
Lwmte
e5945b578e Merge branch 'master' into legacy_trigger_refactor 2021-08-29 20:18:41 +03:00
Lwmte
03a0bb37d5 Fix trolling 2021-08-29 20:01:28 +03:00
Lwmte
4badfde0dc Merge branch 'master' into legacy_trigger_refactor 2021-08-29 19:49:43 +03:00
MontyTRC89
d6133d393a Placed some namespaces 2021-08-29 14:20:05 +02:00
Lwmte
8f990d5d5b Merge branch 'master' into legacy_trigger_refactor 2021-08-29 09:16:39 +03:00
MontyTRC89
09ed0381ac Cleaned ID_AHMET 2021-08-29 08:10:29 +02:00
MontyTRC89
94dfbd2c92 Fixed puzzles holes 2021-08-29 05:53:07 +02:00
Lwmte
1d2af1238a Simplify GetSwitchTrigger/GetKeyTrigger 2021-08-29 00:56:16 +03:00
Lwmte
efa66ca8ff Fix idiocy 2021-08-29 00:00:15 +03:00
Lwmte
f946437c5e Update TombEngine.vcxproj.filters 2021-08-28 22:09:57 +03:00
Lwmte
be47484def Manually fix merge conflicts 2021-08-28 21:43:47 +03:00
Lwmte
1de60cfc1c Merge branch 'master' into legacy_trigger_refactor 2021-08-28 21:38:58 +03:00
MontyTRC89
86c79a4f7f Fixed ID_SAS_DRAG_BLOKE; Added namespaces to SAS functions; 2021-08-28 19:12:19 +02: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
04931cfdff Fix crash if caustics are missing 2021-08-27 17:01:54 +03:00
Lwmte
5fee75b27f Fix grenades destroying environment and not doing damage on Lara 2021-08-27 16:30:03 +03:00
Lwmte
a974e4798c Fix incorrect height calc 2021-08-27 15:48:22 +03:00
Lwmte
39f2a8803a Update lara.cpp 2021-08-26 19:55:52 +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
7b8fc9bef2 Make flipeffect names consistent 2021-08-26 16:11:04 +03:00
Lwmte
dd3b6fa4e5 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
17fa367e33 Update effect.cpp 2021-08-26 14:59:59 +03:00
Lwmte
2c04b225c1 Cleanup collide.cpp a bit more 2021-08-26 14:58:06 +03:00
Lwmte
d5597dc35e Rename DoObjectDynamics to DoProjectileDynamics 2021-08-26 14:13:29 +03:00