Nils
01bf1881b3
Fixed duplicated ITEM_INFO definition
2021-09-24 07:53:42 +02:00
Lwmte
f8c2fc3895
Swap BadHeightUp/Down
2021-09-19 17:48:32 +03:00
Lwmte
a2c22e54c0
Fix climbing out of water
2021-09-19 07:38:15 +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
50e19688c4
Fix water
2021-09-18 01:32:48 +03:00
Lwmte
9e4ff5c56e
Remove legacy RoomBelow/Above helper funcs, fix door offset
2021-09-17 15:32:55 +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
dc5893639f
Make Lara targetable again
2021-09-16 03:56:04 +03:00
Lwmte
2b49b9aa42
Fix more stuff
2021-09-16 01:12:19 +03:00
Lwmte
1195e2077c
Simplify flipeffect call
2021-09-15 17:49:01 +03:00
Lwmte
da67b9166c
Remove optional TestTriggers argument
2021-09-15 16:58:53 +03:00
Lwmte
fc877ba3d0
Add safety checks for flipeffects
2021-09-15 14:45:20 +03:00
Lwmte
913190ce25
Move flipeffect global to filpeffect.cpp
2021-09-15 11:38:55 +03:00
Lwmte
da8f304a78
Fix wade depth
2021-09-14 15:30:28 +03:00
Lwmte
c226821bc6
Rename DeathIsPit to be more descriptive
2021-09-13 09:55:54 +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
9af21e3146
Further code organizing
2021-09-08 18:19:06 +03:00
MontyTRC
60e81f29d8
Merge pull request #328 from MontyTRC89/new_objects_collision
...
Solid statics collision
2021-09-08 16:44:01 +02:00
MontyTRC
9df6ebc67a
Merge pull request #323 from MontyTRC89/new_tightrope
...
Added new Tightrope behaviour
2021-09-08 16:43:18 +02:00
MontyTRC
0e529ecba0
Merge branch 'master' into bitshifts_2
2021-09-08 16:20:28 +02:00
Lwmte
9ec632f5d8
Add splat animation if static bounds are taller than Lara headroom
2021-09-08 16:14:13 +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
d08a1fa596
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
Lwmte
fb65e68191
Remove broken CollideStaticObjects function
...
# Conflicts:
# TR5Main/Game/collide.cpp
2021-09-02 19:50:10 +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
e879038220
Fix namespace case
2021-08-30 18:03:21 +03:00
Lwmte
56c71d1fe6
Separate volume code from TestTriggers, fix DoRayBox bounds
2021-08-30 15:35:00 +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
39f2a8803a
Update lara.cpp
2021-08-26 19:55:52 +03:00
Lwmte
5e48c0350e
Rename effect.cpp to flipeffect.cpp to avoid confusions
2021-08-26 16:24:43 +03:00
Lwmte
dd3b6fa4e5
Move collision and FX functions from effect.cpp
2021-08-26 15:54:52 +03:00
Lwmte
bcf1fbc6d4
Remove magic numbers from GetCollisionInfo
2021-08-26 13:06:24 +03:00
Lwmte
932ccc40d1
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
e0b47d629f
Merge branch 'master' into legacy_trigger_refactor
2021-08-24 19:04:54 +03:00
Lwmte
ef2ff5bf51
Completely get rid of TriggerIndex
2021-08-20 15:26:12 +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
MontyTRC89
2e1ac44c08
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
2021-08-20 05:26:07 +02: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
Lwmte
6727138e64
Add RefreshFloorGlobals hack to temporarily fix issues with monkeyswing and possibly other states
2021-08-19 18:43:52 +03:00
hispidence
d1ca2df0a6
Fix old LARA_DRAW_TYPE usage with LARA_TYPE constants.
...
These don't need to be scoped, but I originally made it an enum class and plan to end up doing so down the line anyway, and this should save a bit of time there.
2021-08-07 19:24:39 +01: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
