Commit graph

96 commits

Author SHA1 Message Date
Sezz
79cabfe63b Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor 2022-03-14 22:54:56 +11:00
Sezz
0c65382576 Preserve momentum when sliding into a pit; cleanup 2022-03-14 22:44:10 +11:00
Sezz
cb8435ee6a Move key functions from control.cpp to collide_room.cpp; cleanup 2022-03-14 15:18:11 +11:00
Sezz
93e62d3e64 Update extra velocity handling; snap to floor height upon entering slope state; cleanup 2022-03-14 01:20:51 +11:00
Sezz
85df2ed1b1 ITEM_INFO cleanup; rename some structs to comply with TEN conventions; LaraInfo cleanup 2022-03-13 02:04:24 +11:00
Stranger1992
fc75f30e0d Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor 2022-03-10 13:44:46 +00:00
Sezz
59fe5e419a Finish LaraInfo cleanup; general cleanup; update savegame schema 2022-03-10 00:29:28 +11:00
Sezz
b5ccf0c405 Lara weapon struct cleanup; general cleanup 2022-03-09 20:37:26 +11:00
Sezz
6978cb94f0 Refactor poison effect on Lara; LaraInfo cleanup; general cleanup; update savegame schema 2022-03-09 17:04:19 +11:00
Sezz
1d3453596f Entity cleanup 2022-03-06 01:26:27 +11:00
Stranger1992
20ee2b0d8e Hardcoded Sounds changed to new soundmap ENUMS 2022-03-02 00:17:02 +00:00
Sezz
b18d6e24f7 LaraInfo cleanup; update savegame schema 2022-02-15 21:25:24 +11:00
Sezz
6f0ac77f32 Use GetLaraInfo() everywhere in Lara state code; cleanup 2022-02-15 20:36:27 +11:00
Sezz
c2190ed872 LaraInfo cleanup; update savegame schema 2022-02-11 19:26:08 +11:00
Sezz
1e0f82b2c3 More LaraItem cleanup; update savegame schema; convert HandStatus and WaterStatus structs to enum class 2022-02-11 01:31:54 +11:00
Sezz
4ea2f10ec2 Further LaraInfo cleanup; update savegame schema 2022-02-10 16:18:15 +11:00
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
daf5e69669 Merge branch 'master' into state_cleaning_tier_2 2022-02-03 19:29:07 +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
MontyTRC89
aaa927c21e Added cinematic bars and fade in/out effects 2022-01-13 07:40:13 +01: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
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
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
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
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
9785ae3b04 Small fixes 2021-11-22 19:14:29 +03: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
Lwmte
dedb938b24 Tier 1 2021-11-16 14:38:04 +03:00
Lwmte
9058f2e3de Use script for setting weather 2021-11-11 01:16:27 +03:00
Lwmte
77d66f89db Draw real snow 2021-11-10 16:21:41 +03:00
Lwmte
3c92091d01 Add transparency and ripples to weather particles 2021-11-10 15:31:10 +03:00
Lwmte
a24d8dae37 Merge branch 'master' into rain_snow 2021-11-10 14:53:31 +03:00