Commit graph

154 commits

Author SHA1 Message Date
Sezz
5bba1df285 More LaraInfo cleanup; update savegame schema 2022-02-10 01:38:32 +11:00
Sezz
ed6ac2d7bc Rename ITEM_INFO members to comply with conventions 2022-02-09 16:55:46 +11:00
Sezz
0eaf6f9d02 Begin tidying ITEM_INFO; update savegame schema 2022-02-09 13:20:57 +11:00
Sezz
64a57cad92 Minor refactoring, cleanup 2022-02-04 22:18:55 +11:00
Sezz
daf5e69669 Merge branch 'master' into state_cleaning_tier_2 2022-02-03 19:29:07 +11:00
Sezz
beb134505a Fix jump stutter near steps; cleanup 2022-02-02 23:11:57 +11:00
Sezz
be08902a5c Tentatively rename animation-related ITEM_INFO members 2022-02-02 20:16:16 +11:00
Sezz
953742964e Rename IN_DUCK to IN_CROUCH for consistency 2022-02-02 18:32:52 +11:00
Sezz
d21c8fa010 Update TestEnvironment(); cleanup 2022-02-02 13:09:24 +11:00
Sezz
9c6003cd39 Add GetWaterSurface(), GetWaterDepth() and GetWaterHeight() overrides; cleanup 2022-02-01 21:46:58 +11:00
MontyTRC89
7a956274b8 Code cleaning; Moved fade stuff to camera code; 2022-01-25 05:42:41 +01:00
Sezz
948575752c Rename gravityStatus to airborne 2022-01-21 23:23:10 +11:00
Sezz
1d17e833c5 Add death dispatches to monkey states; don't activate death sectors when airborne; temp. disable buggy non-monkey sector deflection; cleanup 2022-01-19 22:45:38 +11:00
Sezz
4f72e5e9b8 Refine monkey swing collision; fix minor bugs; cleanup 2022-01-19 16:17:16 +11:00
Sezz
25df67c227 Merge branch 'vault_without_embedding' into state_cleaning_tier_2 2022-01-13 18:45:28 +11:00
MontyTRC89
aaa927c21e Added cinematic bars and fade in/out effects 2022-01-13 07:40:13 +01:00
Sezz
a2fd3128b1 Begin monkey swing refactor 2022-01-12 17:31:03 +11:00
MontyTRC89
8fe2887312 Merge branch 'master' into renderer_refactor 2022-01-11 13:21:20 +01:00
Lwmte
fbd74ebc29 Rename global properly 2022-01-11 15:16:24 +03:00
Sezz
95363e3719 Rename LaraInfo members; cleanup 2022-01-03 17:01:07 +11:00
MontyTRC89
c3a748cc78 Merge branch 'master' into renderer_refactor
# Conflicts:
#	TR5Main/Renderer/Renderer11.cpp
2021-12-24 15:19:12 +01:00
Lwmte
8f4ba68f30 Reorganize includes tier 3 2021-12-24 03:32:19 +03:00
Lwmte
2101d3e65f Reorganize includes tier 2 2021-12-22 16:23:57 +03:00
MontyTRC89
651709d759 Merge branch 'master' into renderer_refactor
# Conflicts:
#	TR5Main/Renderer/RenderView/RenderView.h
#	TR5Main/TombEngine.vcxproj.filters
2021-12-19 08:00:40 +01:00
Lwmte
2671ca453b Collide code reorganizing (#393)
* Tier 1

* Tier 2

* Remove old GetRoomList implementation and use CollectConnectedRooms one

* Tier 3

* Tier 4

* Tier 5

* Tier 6

* Tier 7

Co-authored-by: Lwmte <initiator@nm.ru>
2021-12-19 05:24:12 +03:00
MontyTRC89
ecb6a4668a Merge branch 'master' into renderer_refactor 2021-12-17 13:28:55 +01:00
MontyTRC89
9c48aa227b Merge branch 'master' into renderer_refactor 2021-12-17 05:57:19 +01:00
Sezz
46d0470c04 Merge branch 'master' into lara_state_cleaning_etc 2021-12-16 22:14:32 +11:00
Lwmte
5d79cda341 Refactor baddy pickups a bit 2021-12-15 04:14:40 +03:00
MontyTRC89
36300d301c Converted MESH* to int in SHATTER_ITEM; Fixed rendering of items and statics; 2021-12-14 17:20:13 +01:00
Lwmte
7b0c3a732c Cleanup LaraControl and related functions a bit 2021-12-14 15:07:04 +03:00
Sezz
4432fe6420 Merge branch 'master' into lara_state_cleaning_etc 2021-12-13 18:25:34 +11:00
Lwmte
758fe234c3 Fix CreatureMood crash if enemy is null 2021-12-13 01:55:49 +03:00
Sezz
899418215b Merge branch 'master' into lara_state_cleaning_etc 2021-12-10 12:33:59 +11:00
Lwmte
22f2f03288 Fix boat collision, refactor boat a bit 2021-12-10 01:27:53 +03:00
Sezz
ea4a2992bd Merge branch 'master' into lara_state_cleaning_etc 2021-12-10 09:09:09 +11:00
Lwmte
f520e655aa Use individual block heights for water surface calculation 2021-12-09 19:18:29 +03:00
Sezz
dc45376fdf Merge branch 'master' into lara_state_cleaning_etc 2021-12-02 12:58:18 +11:00
Lwmte
313cf0a764 Minor cleanups 2021-12-01 18:12:04 +03:00
Sezz
cc8d1c79b7 Merge branch 'master' into lara_state_cleaning_etc 2021-11-28 13:58:46 +11:00
Lwmte
652d0ff2fd Clean up ITEM_INFO 2021-11-27 17:50:58 +03:00
Lwmte
07b88a2559 Update box.cpp 2021-11-27 02:34:25 +03: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
Lwmte
edcf588c22 Restore drips 2021-11-23 02:53:52 +03:00
Lwmte
03f19b00b1 Fix breathing in other animations 2021-11-22 19:19:48 +03:00
Lwmte
9785ae3b04 Small fixes 2021-11-22 19:14:29 +03:00
Lwmte
d14d8d484c Cold breath 2021-11-22 18:55:29 +03:00
Sezz
a036810db9 Refactor lara_fire.cpp 2021-11-20 15:39:05 +11:00
Lwmte
e05f0b89a2 Rename newinv2 to gui 2021-11-16 15:51:50 +03:00
Lwmte
685bf2e4d6 Tier 5 2021-11-16 15:35:41 +03:00