Sezz
|
54bb292e38
|
Fix jump timer oversight; remove hardcoded set hands free command when jumping off poles
|
2021-12-03 12:22:29 +11:00 |
|
Sezz
|
f1e604fdae
|
Death sector step tolerance; formatting and general cleanup pass
|
2021-12-02 18:52:00 +11:00 |
|
Sezz
|
2358dfcebc
|
Fix merge fail
|
2021-12-02 13:07:00 +11:00 |
|
Sezz
|
dc45376fdf
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-12-02 12:58:18 +11:00 |
|
Sezz
|
19921c31f3
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-12-02 12:47:07 +11:00 |
|
Lwmte
|
6307806c2f
|
Increase stacked pole stability more
|
2021-12-02 01:58:58 +03:00 |
|
Lwmte
|
1b3ff3a274
|
Fix locked up hands status after getting off pole
|
2021-12-02 01:32:54 +03:00 |
|
Lwmte
|
c7726b80e0
|
Stabilize stacked pole collision
|
2021-12-02 01:22:41 +03:00 |
|
Lwmte
|
0668e17641
|
Update lara_objects.cpp
|
2021-12-02 00:57:15 +03:00 |
|
Lwmte
|
33bb659863
|
Better pole collision detection
|
2021-12-02 00:51:26 +03:00 |
|
Lwmte
|
5653a571bc
|
Update lara_objects.cpp
|
2021-12-01 20:04:32 +03:00 |
|
Lwmte
|
2af6164a26
|
Finite poles
|
2021-12-01 19:54:52 +03:00 |
|
Lwmte
|
b183543d42
|
Use TestLastFrame in corner anim transitions
|
2021-11-30 03:24:50 +03:00 |
|
Sezz
|
70b92558f1
|
Add macro for pole turn rates
|
2021-11-27 20:47:57 +11:00 |
|
Sezz
|
38cf4f74f5
|
Fix jump at bottom of vertical pole; move test functions
|
2021-11-26 13:58:35 +11:00 |
|
Sezz
|
d85eea8c1f
|
Rename basic state functions; rename some state enum members; rename LG_NO_ARMS to LG_HANDS_FREE; move lara_as_gymnast() to lara_hang.cpp; minor corrections
|
2021-11-25 23:38:59 +11:00 |
|
Sezz
|
f3881f9796
|
Fix floating away from pole bug; fix turn lock when holding FORWARD against a wall in a fast turn state; adjust jump count max in walk state; remove old comments
|
2021-11-25 21:08:51 +11:00 |
|
Sezz
|
5f55fc8d3c
|
Fix pole step off in mid-air upon reload
|
2021-11-24 22:17:20 +11:00 |
|
Sezz
|
81973a87ee
|
Only shift position when releasing pole in idle
|
2021-11-23 22:35:15 +11:00 |
|
Sezz
|
b35df488e1
|
Hardcode set position when falling off vertical pole
|
2021-11-23 15:07:00 +11:00 |
|
Sezz
|
9d1eb23a9c
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-23 12:43:20 +11:00 |
|
Sezz
|
583588e4c5
|
Add JUMP input check to pole up/down states
|
2021-11-23 00:08:28 +11:00 |
|
Sezz
|
61dab85056
|
lara_objects.cpp cleanup
|
2021-11-22 22:47:34 +11:00 |
|
Sezz
|
d34be4f719
|
Add ceiling check to vertical pole turn states
|
2021-11-21 21:08:12 +11:00 |
|
Sezz
|
68a5240a30
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-21 21:03:05 +11:00 |
|
Sezz
|
ef604f66b9
|
First pass vertical pole refactor
|
2021-11-21 20:50:17 +11:00 |
|
Sezz
|
768275c202
|
Refactor new tightrope
|
2021-11-21 00:04:28 +11:00 |
|
MontyTRC89
|
ff3b1b44d4
|
Fixing ID_BURNING_TORCH_ITEM; Namespace rename for generic objects;
|
2021-09-30 12:03:39 +02:00 |
|
MontyTRC89
|
7a4b9aed5f
|
Refactored rope files; Fixed ID_POLE_ROPE;
|
2021-09-30 05:10:30 +02:00 |
|
MontyTRC89
|
5a378b213f
|
Fixing ropes and added debug ropes drawing
|
2021-09-28 13:01:28 +02: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
|
8d86c2e97d
|
Rename draw.cpp to animation.cpp which makes more sense, some more edits
|
2021-09-16 05:06:03 +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 |
|
Lwmte
|
3cc0c21946
|
Demagic some fields
|
2021-09-10 01:19:15 +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
|
48a9a1d52a
|
Merge branch 'master' into item_data
|
2021-09-09 11:10:25 +03:00 |
|
Lwmte
|
3fe6211e4e
|
Further organizing
|
2021-09-08 18:31:35 +03:00 |
|
Lwmte
|
ba6c260b92
|
Further code organizing
|
2021-09-08 18:19:06 +03:00 |
|
MontyTRC89
|
713b52b616
|
Merge pull request #322 from MontyTRC89/generalPtr
Renamed "generalPtr" of LaraInfo to "interactedItem"
|
2021-09-08 16:43:33 +02:00 |
|
MontyTRC89
|
1ee650487b
|
Merge pull request #323 from MontyTRC89/new_tightrope
Added new Tightrope behaviour
|
2021-09-08 16:43:18 +02:00 |
|
Raildex
|
f62f900fb0
|
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 |
|
Raildex
|
2ee57e5891
|
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 |
|
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 |
|
Lwmte
|
21df1e84f1
|
Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug
|
2021-08-29 23:53:58 +03:00 |
|