Commit graph

140 commits

Author SHA1 Message Date
Sezz
ef604f66b9 First pass vertical pole refactor 2021-11-21 20:50:17 +11:00
Sezz
a036810db9 Refactor lara_fire.cpp 2021-11-20 15:39:05 +11:00
Sezz
2e81fe9293 Refactor snowmobile.cpp 2021-11-17 23:56:34 +11:00
Sezz
3b9e0967b9 Modify behaviour when stepping down into wade-height water 2021-11-17 18:12:26 +11:00
Lwmte
7efbcb28b2 Merge branch 'master' into gui_refactor 2021-11-16 17:25:47 +03:00
Lwmte
a8dab89ce1 Simplify animation switching 2021-11-16 17:25:17 +03:00
Sezz
27b8f3486e Refactor quad.cpp 2021-11-17 00:17:25 +11:00
Lwmte
e05f0b89a2 Rename newinv2 to gui 2021-11-16 15:51:50 +03:00
Sezz
f68b5334e0 Refactor biggun.cpp and quad.cpp 2021-11-16 22:30:37 +11:00
Sezz
f926bfe70c Fix crawl exit flip into swamp resulting in snap to the surface 2021-11-11 21:47:18 +11:00
Lwmte
9058f2e3de Use script for setting weather 2021-11-11 01:16:27 +03:00
Sezz
d875bc9084 Replace STOP_SIZE where appropriate 2021-11-10 22:48:00 +11:00
Lwmte
b91a1c845f Update lara.cpp 2021-11-10 12:26:27 +03:00
Lwmte
d13d055a69 Update lara.cpp 2021-11-10 12:12:30 +03:00
Lwmte
e7840d8c56 Merge branch 'master' into simplified_anim_handling 2021-11-10 12:02:44 +03:00
Sezz
a3b1403433 Refactor health.cpp 2021-11-10 16:11:36 +11:00
Lwmte
8f51243ca4 First commit 2021-11-10 02:41:59 +03:00
Sezz
4a0b5c3961 Streamline state transitions between wading and treading water 2021-11-09 23:15:12 +11:00
Sezz
c6be395c90 Refactor LaraControl() 2021-11-09 16:03:56 +11:00
Lwmte
fe4589471d Fix water splash 2021-11-07 16:07:16 +03:00
Lwmte
e442c6caee Fix quicksand 2021-11-07 04:54:48 +03:00
Lwmte
319a532ffc Merge branch 'master' into arbitrary_hanging_and_shimmying 2021-11-03 02:26:09 +03:00
Lwmte
cf136ecba4 Implement separate flipeffects for left/right footprint, wad edit is needed 2021-11-02 13:23:22 +03:00
Lwmte
4cbf9a09f2 Revert "Remove hardcoded global"
This reverts commit ac5ffb1983.
2021-11-02 13:00:53 +03:00
Lwmte
ac5ffb1983 Remove hardcoded global 2021-11-02 12:55:26 +03:00
Lwmte
6a5707f419 Merge branch 'master' into arbitrary_hanging_and_shimmying 2021-10-31 21:42:23 +03:00
Lwmte
8e42d77243 Move savegames to separate folder, organize savegame code 2021-10-31 21:36:51 +03:00
Lwmte
b3869676fc Merge branch 'master' into arbitrary_hanging_and_shimmying 2021-10-29 04:06:57 +03:00
Lwmte
d470cdcf01 Refactor and fix sound code 2021-10-29 02:22:26 +03:00
Lwmte
7bc95c7fee Merge branch 'master' into arbitrary_hanging_and_shimmying 2021-10-28 12:23:34 +03:00
MontyTRC89
e4329c4974 Merge branch 'errors'
# Conflicts:
#	TR5Main/Game/effects/flmtorch.cpp
#	TR5Main/Game/objects.cpp
#	TR5Main/Objects/Effects/enemy_missile.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
2021-10-28 11:06:02 +02:00
Lwmte
e2b33061fc Merge branch 'master' into arbitrary_hanging_and_shimmying 2021-10-28 11:50:04 +03:00
Lwmte
837496123f Merge branch 'master' into arbitrary_hanging_and_shimmying 2021-10-28 11:47:03 +03:00
MontyTRC89
e5c8c1010e Merge branch 'entities_fixings'
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/TombEngine.vcxproj.filters
2021-10-28 10:43:09 +02:00
Lwmte
27c4dee8b2 Merge branch 'master' into errors 2021-10-28 11:28:24 +03:00
Lwmte
f592f36a24 Merge branch 'master' into errors 2021-10-27 19:05:50 +03:00
Lwmte
38862dac8d Use enum class for collision enums 2021-10-27 09:48:31 +03:00
Lwmte
17098c192b Move items with subfunction 2021-10-25 12:12:36 +03:00
Lwmte
58439f377e Vary embed offset when shimmying 2021-10-24 05:33:32 +03:00
Lwmte
4fdbeecc02 Fix accumulating rounding errors on side speed shifts 2021-10-24 05:09:54 +03:00
Lwmte
1b6eb6d035 Stabilize shimmying 2021-10-24 04:08:54 +03:00
Troye
acc4281555 purge ring inventory; 2021-10-12 00:26:46 -05:00
Lwmte
c82c6f5b6f Move no quadrants flag into coll setup 2021-10-09 19:19:02 +03:00
Lwmte
ef0bcf950a Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
Lwmte
034e961e10 Get rid of GetOrthogonalIntersect for vaults 2021-10-07 17:11:01 +03:00
MontyTRC89
fbd15b520d Merge remote-tracking branch 'origin/master' into entities_fixings 2021-10-07 05:30:35 +02:00
Lwmte
2c3fed88fd Merge branch 'freeform_bridges' 2021-10-02 16:20:53 +03:00
Lwmte
1bf5a7129a Update Lara room before vehicle handling 2021-10-01 10:40:29 +03: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