Commit graph

224 commits

Author SHA1 Message Date
Lwmte
3b45f66463 Add splat animation if static bounds are taller than Lara headroom 2021-09-08 16:14:13 +03:00
Lwmte
15bd790230 Remove unused hitCeiling flag 2021-09-08 15:59:22 +03:00
Raildex
b422cafc79 Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/Lara/lara.cpp
#	TR5Main/Game/Lara/lara_collide.cpp
#	TR5Main/Game/Lara/lara_monkey.cpp
#	TR5Main/Game/Lara/lara_struct.h
#	TR5Main/Game/Lara/lara_tests.cpp
#	TR5Main/Game/collide.h
#	TR5Main/Game/control.h
#	TR5Main/Game/effect.h
#	TR5Main/Game/effect2.cpp
#	TR5Main/Game/flipeffect.cpp
#	TR5Main/Game/floordata.h
#	TR5Main/Game/hair.cpp
#	TR5Main/Game/health.cpp
#	TR5Main/Game/items.cpp
#	TR5Main/Game/newinv2.cpp
#	TR5Main/Game/spotcam.cpp
#	TR5Main/Objects/Effects/tr4_bubbles.cpp
#	TR5Main/Objects/TR1/Entity/tr1_ape.cpp
#	TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
#	TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
#	TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
#	TR5Main/Objects/TR2/Entity/tr2_shark.cpp
#	TR5Main/Objects/TR2/Entity/tr2_spider.cpp
#	TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
#	TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
#	TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
#	TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
#	TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
#	TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
#	TR5Main/Objects/TR3/Entity/tr3_trex.cpp
#	TR5Main/Objects/TR3/Vehicles/kayak.cpp
#	TR5Main/Objects/TR3/Vehicles/minecart.cpp
#	TR5Main/Objects/TR4/Entity/tr4_bat.cpp
#	TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
#	TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_dog.cpp
#	TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
#	TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
#	TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
#	TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
#	TR5Main/Objects/TR4/Entity/tr4_troops.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
#	TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
#	TR5Main/Objects/TR4/Vehicles/motorbike.cpp
#	TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
#	TR5Main/Objects/TR5/Entity/tr5_imp.cpp
#	TR5Main/Objects/TR5/Entity/tr5_larson.cpp
#	TR5Main/Objects/TR5/Entity/tr5_lion.cpp
#	TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
#	TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
#	TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
#	TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
#	TR5Main/Renderer/Renderer11Draw2D.cpp
#	TR5Main/Specific/input.cpp
#	TR5Main/Specific/level.cpp
#	TR5Main/TombEngine.vcxproj.filters
2021-08-31 18:20:23 +02:00
Troye
84cc6d9c7f revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05:00
Lwmte
21df1e84f1 Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
Raildex
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Lwmte
b42a7ba096 Remove more magic 2021-08-26 13:47:47 +03:00
Lwmte
c74fd2c3da Remove magic numbers from GetCollisionInfo 2021-08-26 13:06:24 +03:00
Lwmte
3378c8791a Organize COLL_INFO 2021-08-25 06:54:17 +03:00
Lwmte
70626854f0 Replace all remaining occurences of coll globals 2021-08-24 16:54:26 +03:00
Troye
f5ec4695ef Add more anims to NewAnims; Fix lean 2021-07-09 19:41:56 -05:00
wolfcheese
7f87f695b7 Prevent crouching from overriding lasersight 2021-06-09 18:28:25 -04:00
Trxye
0b34f1d730 comment feet hanging 2021-06-02 13:24:17 -05:00
wolfcheese
d081ff97a5 Commenting out more diagonal floor checks, this time for jumping upward or forward to grab ledges 2021-05-30 23:50:32 -04:00
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
asasas9500
700c1b5907 Remove function markers 2021-02-03 01:50:59 -03:00
asasas9500
1693bf741d Revert move angle relative to Lara rotation 2020-12-19 23:34:52 -03:00
Woops
0bd7ac9082 remove bitshifts from Lara code 2020-10-06 11:15:37 -05:00
Sezz
0b6721058f Revert "Cleanup, control code standardisation, some command-query separation, un-hardcoding of animation state dispatches, QOL improvements to Lara's basic moveset."
This reverts commit cde394c3f4.
2020-09-26 05:06:08 +10:00
Sezz
cde394c3f4 Cleanup, control code standardisation, some command-query separation, un-hardcoding of animation state dispatches, QOL improvements to Lara's basic moveset. 2020-09-26 03:28:30 +10:00
Woops
71de03a231 sideways jumps hotfix 2020-09-02 15:59:57 -05:00
asasas9500
0d258fd25d Finish merge 2020-08-25 19:39:50 -03:00
Woops
6ada970725 Lara refactor: lara_cheat, move the rest of the functions out of laramisc.cpp and delete it. fix includes. 2020-08-16 16:01:58 -05:00
Woops
ade98fec65 Lara refactor: move basic movements to lara_basic, take care of the other functions. 2020-08-14 17:54:25 -05:00