Commit graph

59 commits

Author SHA1 Message Date
Lwmte
a8dab89ce1 Simplify animation switching 2021-11-16 17:25:17 +03:00
Sezz
4b9205c653 Change return type of deflect functions to bool; rename LaraDeflectEdgeDuck() to LaraDeflectEdgeCrawl() 2021-11-11 23:46:59 +11:00
Lwmte
e442c6caee Fix quicksand 2021-11-07 04:54:48 +03:00
Lwmte
38862dac8d Use enum class for collision enums 2021-10-27 09:48:31 +03:00
Lwmte
0f322e9db8 Simplify and fix crawl2hang 2021-10-26 18:05:16 +03:00
Lwmte
d8464b4ce9 Update lara_crawl.cpp 2021-10-08 01:47:16 +03:00
Lwmte
7203a4ee51 Re-enable custom animations 2021-10-08 01:46:29 +03:00
Lwmte
3053734663 Update lara_crawl.cpp 2021-09-25 13:41:01 +03:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
016be41f97 Move anim structs to animation.h 2021-09-19 18:29:25 +03:00
Lwmte
add6629267 Swap BadHeightUp/Down 2021-09-19 17:48:32 +03:00
Lwmte
b3898b7940 Embed height data into COLL_INFO, fix issues with rolling under statics and statics submerged into water 2021-09-19 06:42:24 +03:00
Lwmte
e790f47d27 Unhack GetCollisionInfo a bit 2021-09-19 04:11:55 +03:00
Lwmte
015815c5d3 Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes 2021-09-17 22:55:09 +03:00
Lwmte
8d86c2e97d Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
4a551c0918 Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
4851214aa4 TestLaraWall 2021-09-14 00:41:11 +03:00
Lwmte
7852f2fa8e Make order to lara_tests naming 2021-09-14 00:30:44 +03:00
Lwmte
bb775ff6c2 Demagic NO_LOS_ITEM 2021-09-13 10:22:00 +03:00
Lwmte
06909ba86d Demagic crawl code more 2021-09-13 09:47:37 +03:00
Lwmte
9702f55435 Fix more messed up crawl code (still causes some bugs when forward crawl) 2021-09-13 09:44:37 +03:00
Lwmte
80cfc1739a Demagic stepup height 2021-09-10 14:24:51 +03:00
Lwmte
2f3af7e3ea Simplify GetCollisionInfo arguments 2021-09-10 12:14:28 +03:00
Lwmte
280c9fa28b Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
MontyTRC89
6f0914e39e Merge pull request #318 from MontyTRC89/item_data
Item data
2021-09-10 05:01:45 +02:00
Lwmte
5f43252fec Demagic crawl radius 2021-09-10 01:22:27 +03:00
Lwmte
c9d4914e3d Simplify COLL_POSITION 2021-09-10 00:43:26 +03:00
Lwmte
1df38ae15a Rename settings to setup 2021-09-10 00:20:59 +03:00
Lwmte
1efe0a9f09 Reorganize COLL_INFO 2021-09-10 00:18:47 +03:00
Lwmte
9f3a824499 Crawl under solid static meshes 2021-09-09 20:21:05 +03:00
Raildex
31ec83f9cc Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
MontyTRC89
cea3608a25 Cleaned collision code; Cleaning AI code; Usin visibility for for statics culling; Fixed Lara crawling; 2021-09-04 07:53:21 +02:00
Lwmte
71ff4588b9 Fix two collision bugs 2021-09-02 22:28:55 +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
Raildex
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03: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
Lwmte
2756a65095 COLL_RESULT conversion in progress (broken) 2021-08-22 01:39:14 +03:00
Troye
5d8bb0014d FLARE_AGE constant; fix dynamic light intensity; fix release builds 2021-07-13 22:29:47 -05:00
Troye
f5ec4695ef Add more anims to NewAnims; Fix lean 2021-07-09 19:41:56 -05:00
Troye
88407761b1 clean up larainfo; add anim bools' 2021-07-08 14:15:14 -05:00
wolfcheese
0cf524b572 Fixed collision for crouch roll 2021-06-02 20:44:39 -04:00
Trxye
0b34f1d730 comment feet hanging 2021-06-02 13:24:17 -05:00
asasas9500
495641c632 Remove comments; Fix ID_ANIMATING13, ID_ANIMATING14, ID_ANIMATING15 and ID_ANIMATING16 2021-02-07 00:10:36 -03:00
asasas9500
6eb1a5e963 Merge branch 'master' into PushableOCB 2021-02-06 11:50:08 -03:00
asasas9500
700c1b5907 Remove function markers 2021-02-03 01:50:59 -03:00
asasas9500
393e6a4b27 Fix body part; Fix lara_col_all4s() 2021-01-29 01:14:20 -03:00