Commit graph

37 commits

Author SHA1 Message Date
Nils
01bf1881b3 Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
Lwmte
afa0504c6c Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
a5848984f7 Move anim structs to animation.h 2021-09-19 18:29:25 +03:00
Lwmte
f8c2fc3895 Swap BadHeightUp/Down 2021-09-19 17:48:32 +03:00
Lwmte
6b7d805abb 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
99ab563ee7 Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +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
Lwmte
e41e7eb502 Demagic some fields 2021-09-10 01:19:15 +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
4186dfe685 Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
7f5dceef0c Further organizing 2021-09-08 18:31:35 +03:00
Lwmte
9af21e3146 Further code organizing 2021-09-08 18:19:06 +03:00
MontyTRC
94e002baa7
Merge pull request #322 from MontyTRC89/generalPtr
Renamed "generalPtr" of LaraInfo to "interactedItem"
2021-09-08 16:43:33 +02:00
MontyTRC
9df6ebc67a
Merge pull request #323 from MontyTRC89/new_tightrope
Added new Tightrope behaviour
2021-09-08 16:43:18 +02: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
a1c19a4b75 Renamed "generalPtr" of LaraInfo to "interactedItem"
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
2021-09-05 11:20:51 +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
Troye
6aabe62297 revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05: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
c0cb6ae37c Organize COLL_INFO 2021-08-25 06:54:17 +03:00
Lwmte
218e9f685a Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs 2021-08-20 14:13:06 +03:00
Troye
0aa262852a Fix camera on waterout and block pulling/pushing 2021-08-16 18:05:38 -05:00
MontyTRC89
06e0742286 Potentially fixed ID_PULLEY 2021-06-08 06:32:51 +02:00
MontyTRC89
6b5a932ff8 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
asasas9500
4521994088 Remove function markers 2021-02-03 01:50:59 -03:00
asasas9500
91f0bb20f7 Revert move angle relative to Lara rotation 2020-12-19 23:34:52 -03:00
Woops
516d100706 remove bitshifts from Lara code 2020-10-06 11:15:37 -05:00
asasas9500
6fc9bd9890 Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
asasas9500
8e4c5b186b Improve math functions 2020-09-29 11:27:09 -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
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
Woops
ab0f5ec2b4 Lara refactor: delete lara_pickup, move contents to lara_objects, move all object functions to lara_objects 2020-08-13 19:53:13 -05:00