Commit graph

837 commits

Author SHA1 Message Date
Lwmte
e99acea69e Decipher hex stuff 2021-10-27 19:00:30 +03:00
Lwmte
38862dac8d Use enum class for collision enums 2021-10-27 09:48:31 +03:00
Lwmte
1b6eb6d035 Stabilize shimmying 2021-10-24 04:08:54 +03:00
MontyTRC89
e3d1bb18f0 Merge remote-tracking branch 'origin/ai_fix' into savegame
# Conflicts:
#	TR5Main/Game/savegame.cpp
2021-10-17 16:10:06 +02:00
MontyTRC89
5c829c5c23 Renamed little bettes to scarabs; Added statics, cameras, scarabs, spiders, rats, bats to savegames 2021-10-15 10:28:32 +02:00
Troye
af287cdf6d InventoryClass; 2021-10-12 04:15:22 -05:00
Troye
acc4281555 purge ring inventory; 2021-10-12 00:26:46 -05:00
Lwmte
c82c6f5b6f Move no quadrants flag into coll setup 2021-10-09 19:19:02 +03:00
Lwmte
ef0bcf950a Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
Lwmte
c4edbe3f26 Fixes 2021-10-08 16:45:45 +03:00
MontyTRC89
5f091a01ce Fixing wraiths and demigods 2021-10-08 07:29:02 +02:00
Lwmte
65f5c17cc9 Deduplicate GetCollisionInfo code in preparation for unconstrained probe angles 2021-10-07 12:34:16 +03:00
MontyTRC89
fbd15b520d Merge remote-tracking branch 'origin/master' into entities_fixings 2021-10-07 05:30:35 +02:00
MontyTRC89
89d2755a46 Fixed demigods; Fixed energy bubbles; 2021-10-07 05:30:01 +02:00
Lwmte
dacd55fdd4 Demagic UPV sound IDs 2021-10-06 19:54:04 +03:00
Stranger1992
3f016b5603 Fixing the hard coded sounds for the UPV so they point towards sounds that make sense. 2021-10-06 17:14:42 +01:00
Stranger1992
81822213bc Update upv.cpp
Changed UPV Sound Effect to SFX_TR5_LARA_UNDERWATER_ENGINE (1807).
2021-10-04 18:05:40 +01:00
Lwmte
8725b900b7 Update upv.cpp 2021-10-04 12:31:35 +03:00
Lwmte
35d736421c Fix UPV bugs 2021-10-04 12:28:05 +03:00
Lwmte
5355bf3983 update object list comments 2021-10-04 10:06:46 +03:00
Raildex
4e1dd2fe20 made aiTarget a Pointer. EnableBaddieAI spawns a dummy target for use of the AI. 2021-10-03 10:07:01 +02:00
MontyTRC89
717662063c Fixing demigods 2021-10-03 07:23:54 +02:00
Lwmte
2e5a68f3d7 Fix Lara double damage 2021-10-02 19:52:37 +03:00
Lwmte
c871884301 Don't use legacy function names in sound code 2021-10-02 18:54:53 +03:00
Lwmte
2c3fed88fd Merge branch 'freeform_bridges' 2021-10-02 16:20:53 +03:00
Lwmte
ac2019f480 Use GetBridgeItemIntersect instead of IsOnTwoBlockPlatform 2021-10-01 10:35:36 +03:00
MontyTRC89
ff3b1b44d4 Fixing ID_BURNING_TORCH_ITEM; Namespace rename for generic objects; 2021-09-30 12:03:39 +02:00
MontyTRC89
7a4b9aed5f Refactored rope files; Fixed ID_POLE_ROPE; 2021-09-30 05:10:30 +02:00
Lwmte
6fa86f59c3 Temporarily flip X/Z room dimensions in UpdateBridgeItem 2021-09-29 18:10:12 +03:00
MontyTRC89
f35d6e80d0 Merge branch 'entities_fixings'
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
2021-09-29 05:35:17 +02:00
MontyTRC89
e174a1ed4d Added some ropes functions names 2021-09-29 05:29:25 +02:00
Lwmte
29ad4442c0 Work 2021-09-29 03:41:36 +03:00
Lwmte
788ce04661 First commit 2021-09-27 07:12:30 +03:00
Lwmte
f2591e19fb Fix ahmet ghost fire in release mode (hack) 2021-09-27 01:47:47 +03:00
Troye
552352dd21 W1 2021-09-25 16:03:28 -05:00
Lwmte
971d1b203f Cleanup 2 2021-09-25 16:04:16 +03:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Lwmte
b7cf7be08c Merge branch 'master' into item_info_include_fix 2021-09-25 15:59:51 +03:00
Lwmte
04f580c81a Fix boat sounds 2021-09-25 15:02:39 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Lwmte
b97d56f09d Update falling_block.cpp 2021-09-25 05:24:56 +03:00
Lwmte
21d93d8a86 Update falling_block.cpp 2021-09-25 05:15:35 +03:00
Lwmte
daeb2f622d Update falling_block.cpp 2021-09-25 05:00:06 +03:00
Lwmte
46e102ee46 Use precise bounds for two block platform thickness 2021-09-24 20:53:39 +03:00
Lwmte
bf87abd8c3 Use actual mesh bounds for trapdoor and falling floor/ceiling objects 2021-09-24 18:17:06 +03:00
Lwmte
c2c2abc42e Reduce falling block thickness 2021-09-24 17:02:16 +03:00
Lwmte
147c62728a Update falling_block.cpp 2021-09-24 15:52:27 +03:00
Lwmte
9a58aedda2 Update falling_block.cpp 2021-09-24 15:51:32 +03:00
Lwmte
0f8ecf03b5 Use mutators for drawing spikes, raising and expanding blocks 2021-09-24 15:44:44 +03:00
Lwmte
1c20cefd4e Fix merge and small things 2021-09-24 13:58:56 +03:00