Lwmte
|
a8dab89ce1
|
Simplify animation switching
|
2021-11-16 17:25:17 +03:00 |
|
Troye
|
acc4281555
|
purge ring inventory;
|
2021-10-12 00:26:46 -05:00 |
|
Lwmte
|
cefc60c7ea
|
Move around some files
|
2021-09-19 23:41:26 +03:00 |
|
Lwmte
|
fd852f1c43
|
Depoison Lara on flycheat
|
2021-09-16 01:58:43 +03:00 |
|
Lwmte
|
1d0ceb0ff4
|
Fix more stuff
|
2021-09-16 01:12:19 +03:00 |
|
Lwmte
|
48a9a1d52a
|
Merge branch 'master' into item_data
|
2021-09-09 11:10:25 +03:00 |
|
Lwmte
|
ba6c260b92
|
Further code organizing
|
2021-09-08 18:19:06 +03:00 |
|
Lwmte
|
f293735d11
|
Move all effect source files to separate directory, rename effect2 to effects
|
2021-09-08 18:07:48 +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 |
|
Raildex
|
2621fa8f0d
|
Fixed More Include Hell
|
2021-08-28 13:27:58 +02:00 |
|
Trxye
|
61db16c17e
|
implement waterskins
|
2021-06-05 15:27:19 -05:00 |
|
Trxye
|
44a1f18bee
|
clean up some inv code; add clockwork beetle to items cheat;
|
2021-05-29 11:54:01 -05:00 |
|
Trxye
|
c0ca04a806
|
clean up ring inventory code; fix KillItem();
|
2021-05-26 01:58:30 -05:00 |
|
Trxye
|
d7fa758df7
|
fix inventory drawing; implement inventory in game code;
|
2021-05-20 14:19:11 -05:00 |
|
Trxye
|
6074ab93a2
|
implement new inventory
|
2021-05-18 19:16:58 -05:00 |
|
asasas9500
|
700c1b5907
|
Remove function markers
|
2021-02-03 01:50:59 -03:00 |
|
Raildex
|
2138df91c3
|
Fixing Ammo
|
2021-01-26 10:28:08 +01:00 |
|
Raildex
|
d45db30cd9
|
Ammo struct to better represent Ammo
|
2021-01-25 13:58:23 +01:00 |
|
Woops
|
47fc1ecb13
|
remove bitshifts
|
2020-10-16 12:06:33 -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
|
c695b76b14
|
fix motorbike crash, better explosions, better cheats
|
2020-09-16 13:03:30 -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 |
|