Commit graph

46 commits

Author SHA1 Message Date
Lwmte
75b6f61baa Make order to lara_tests naming 2021-09-14 00:30:44 +03:00
Lwmte
228c771161 Deint lara_tests 2021-09-14 00:03:24 +03:00
Lwmte
91c11645d5 Fix undefined return bugs 2021-09-13 23:44:52 +03:00
KrysB4k
00bb7b29f3 Removed remnants of bad ideas
Removed SplitFloor and SplitCeiling completely from affected source files
2021-09-13 20:19:33 +02:00
Lwmte
64c310c144 Deint lara tests 2021-09-13 09:12:46 +03:00
Lwmte
df4ae1c099 Remove obsolete constants 2021-09-13 03:11:13 +03:00
Lwmte
7fe7d7edd3 Simplify GetCollisionInfo arguments 2021-09-10 12:14:28 +03:00
Lwmte
e509290192 Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
MontyTRC
2efff94858
Merge pull request #318 from MontyTRC89/item_data
Item data
2021-09-10 05:01:45 +02:00
Lwmte
8136b41f42 Simplify COLL_POSITION 2021-09-10 00:43:26 +03:00
Lwmte
8728405870 Rename settings to setup 2021-09-10 00:20:59 +03:00
Lwmte
26957e806e Reorganize COLL_INFO 2021-09-10 00:18:47 +03:00
Lwmte
b23532090a Crawl under solid static meshes 2021-09-09 20:21:05 +03:00
Lwmte
4186dfe685 Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Nils
a431006ce7 Added new Tightrope behaviour
You can use Left and Right to control lara's balance
Lara will gradually lose balance
When lara stops, her balance regenerates
2021-09-05 14:49:00 +02:00
Nils
7f774d04b3 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
Lwmte
e879038220 Fix namespace case 2021-08-30 18:03:21 +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
Nils
58eda862e3 Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Lwmte
dd3b6fa4e5 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
c0cb6ae37c Organize COLL_INFO 2021-08-25 06:54:17 +03:00
Lwmte
e0b47d629f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
Lwmte
0b8ca4fa54 Replace all remaining occurences of coll globals 2021-08-24 16:54:26 +03:00
MontyTRC89
109b7d6e18 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
Lwmte
e7e1cca356 First commit 2021-08-20 02:01:50 +03:00
Troye
1cf0aef90d Add more anims to NewAnims; Fix lean 2021-07-09 19:41:56 -05:00
Troye
e201df8f97 clean up larainfo; add anim bools' 2021-07-08 14:15:14 -05:00
Trxye
9728282c14 comment feet hanging 2021-06-02 13:24:17 -05:00
wolfcheese
f3613375f8 Removed diagonal checks, which prevented Lara from vaulting when standing on a split floor 2021-05-30 12:25:48 -04:00
Trxye
0b53c552de remove monkeyswing jump with action 2021-05-23 21:49:24 -05:00
asasas9500
128d409aa7 Merge branch 'master' into PushableOCB 2021-02-06 11:50:08 -03:00
asasas9500
4521994088 Remove function markers 2021-02-03 01:50:59 -03:00
asasas9500
750409c372 Fix crawling 2021-01-17 15:56:48 -03:00
asasas9500
d4c6cc4a97 Fix line endings 2020-12-21 13:16:29 -03:00
asasas9500
91f0bb20f7 Revert move angle relative to Lara rotation 2020-12-19 23:34:52 -03:00
asasas9500
6fc9bd9890 Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
Sezz
92bc8b662d 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 2ee7059470.
2020-09-26 05:06:08 +10:00
Sezz
2ee7059470 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
asasas9500
50ba19525d Finish merge 2020-08-25 19:39:50 -03:00
Woops
aca8da8db1 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
7d58b73cc4 Lara refactor: move sliding to lara_slide, move deathslide to lara_objects, add file descriptions 2020-08-14 04:08:10 -05:00
asasas9500
b9bc1cf54e Rename Lara files 2020-08-09 22:09:14 -03:00
Woops
80882f77a2 Lara refactor: move monkeyswing functions to lara_monkey 2020-08-09 19:18:29 -05:00
Woops
98dbafdd34 Lara refactor: Move functions around, clean up Lara.h 2020-08-09 00:54:57 -05:00
Woops
6a22e47ed7 Lara refactor: move collision functions to lara_collide 2020-08-08 16:35:05 -05:00
Woops
7d81793c9b Lara refactor: Move tests to lara_tests 2020-08-08 15:15:15 -05:00