Sezz
|
100f5ad1a4
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-12 00:17:29 +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
|
73c980fa61
|
Add missed merge changes
|
2021-11-10 23:27:37 +11:00 |
|
Sezz
|
52b962f0e8
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-10 23:26:55 +11: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
|
36641d87e3
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-10 16:24:16 +11: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
|
af656f3d77
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-10 01:18:42 +11:00 |
|
Sezz
|
4a0b5c3961
|
Streamline state transitions between wading and treading water
|
2021-11-09 23:15:12 +11:00 |
|
Sezz
|
c38cb3a315
|
Improve diving into swamps
|
2021-11-09 20:03:40 +11:00 |
|
Sezz
|
a48996f511
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-09 17:12:18 +11:00 |
|
Sezz
|
c6be395c90
|
Refactor LaraControl()
|
2021-11-09 16:03:56 +11:00 |
|
Sezz
|
c5dd714e51
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-08 22:27:12 +11:00 |
|
Lwmte
|
fe4589471d
|
Fix water splash
|
2021-11-07 16:07:16 +03:00 |
|
Sezz
|
80b9b3d131
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-07 13:28:00 +11:00 |
|
Sezz
|
d737e504c8
|
Add proper state functions for 180 roll; allow turning when performing 180 roll
|
2021-11-07 12:57:34 +11:00 |
|
Lwmte
|
e442c6caee
|
Fix quicksand
|
2021-11-07 04:54:48 +03:00 |
|
Sezz
|
962f07d3f4
|
Use copysign(); calibrate turn rate reset; increase z rotation tolerance for pickup action; give LS_POSE dispatch lowest precedence
|
2021-11-04 21:07:47 +11:00 |
|
Sezz
|
25ac2c8d46
|
Update turn rate reset; format comments.
|
2021-11-04 18:31:17 +11:00 |
|
Sezz
|
dd090ec9fc
|
Fix pickup bug: z rotation must reset to 0?!
|
2021-11-04 17:29:47 +11:00 |
|
Sezz
|
a0abdc5a17
|
Merge branch master into 'lara_state_cleaning_etc'
|
2021-11-03 21:16:06 +11: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 |
|
Sezz
|
bd2adcceb7
|
Allow turning while stationary in crawl idle state; use Lara.turnRate for turning in crouch and crawl states; refine how Lara.turnRate is reset to 0
|
2021-11-01 17:57:43 +11: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 |
|
Sezz
|
fa634a208f
|
Introduce optional AFK pose functionality
|
2021-10-31 18:33:39 +11:00 |
|
Sezz
|
a81e031537
|
Crawl/crouch state functions: rename; reorder
|
2021-10-30 12:45:52 +11: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 |
|
Sezz
|
ae5fe2168f
|
Merge branch 'master' into 'lara_state_cleaning_etc'
|
2021-10-28 23:33:12 +11: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 |
|