Commit graph

78 commits

Author SHA1 Message Date
Sezz
6978cb94f0 Refactor poison effect on Lara; LaraInfo cleanup; general cleanup; update savegame schema 2022-03-09 17:04:19 +11:00
Sezz
683c830259 WIP slope experiments; LaraInfo cleanup; cleanup 2022-03-08 18:22:14 +11:00
Sezz
c2fb6cd159 Generic object file cleanup 2022-02-24 14:22:30 +11:00
Sezz
603d7c4d08 Refactor vertical pole velocity handling; cleanup 2022-02-21 20:27:30 +11:00
Sezz
b6dbd5d362 Cleanup 2022-02-12 16:25:59 +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
a63563913b Adjust crawlspace exit tests; fix crawl flex; continue cleaning LaraItem struct; update savegame schema 2022-02-09 20:38:13 +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
8e3d7cfa4c Begin tidying LaraInfo; cleanup tr4_senet.cpp; update savegame schema 2022-02-08 20:45:21 +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
131a60184b Merge branch 'overhang_climbing' in to state_cleaning_tier_2 2022-01-26 12:47:38 +11:00
Sezz
948575752c Rename gravityStatus to airborne 2022-01-21 23:23:10 +11:00
Lwmte
7237cc197e Merge branch 'master' into overhang_climbing 2021-12-24 11:26:04 +03:00
Lwmte
1b78c08d57 Merge branch 'master' into animation_integers 2021-12-24 11:25:51 +03:00
Lwmte
b86d3b872c Reorganize includes tier 4 2021-12-24 11:08:16 +03:00
Lwmte
51ba4f8c1c Merge branch 'master' into overhang_climbing 2021-12-22 16:26:13 +03:00
Lwmte
70320ba0ba Merge branch 'master' into animation_integers 2021-12-22 16:24:12 +03:00
Lwmte
2101d3e65f Reorganize includes tier 2 2021-12-22 16:23:57 +03:00
Lwmte
a1bb992145 First commit 2021-12-22 12:17:59 +03:00
Lwmte
bd4436e0b3 Update generic_bridge.h 2021-12-22 05:00:42 +03:00
Lwmte
bead73396e Increase bridge_tilt thickness 2021-12-22 04:43:49 +03:00
Lwmte
7ae51e9083 Uncomment bridge checks 2021-12-22 03:56:10 +03: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
Sezz
72a64fa718 Merge branch 'master' into lara_state_cleaning_etc 2021-12-09 21:41:28 +11:00
Lwmte
edb4e130cd Fix polerope ghost grab in reach state 2021-12-09 12:48:54 +03:00
Sezz
40c8e63cf6 Merge branch 'master' into lara_state_cleaning_etc 2021-12-09 02:28:10 +11:00
Sezz
a79c6df007 Refactor lara_flare.cpp 2021-12-09 00:48:55 +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
1ac1fec4e1 Remove LaraItem global usage in lara_flare.cpp + minor cleanup 2021-11-12 19:52:48 +11:00
Lwmte
22e0e9e40f Cleanup camera code 2021-11-08 19:18:33 +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
MontyTRC89
e5c8c1010e Merge branch 'entities_fixings'
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/TombEngine.vcxproj.filters
2021-10-28 10:43:09 +02:00
MontyTRC89
fbd15b520d Merge remote-tracking branch 'origin/master' into entities_fixings 2021-10-07 05:30:35 +02: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
Lwmte
6fa86f59c3 Temporarily flip X/Z room dimensions in UpdateBridgeItem 2021-09-29 18:10:12 +03:00
Lwmte
29ad4442c0 Work 2021-09-29 03:41:36 +03:00
Lwmte
788ce04661 First commit 2021-09-27 07:12:30 +03:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Lwmte
b7cf7be08c Merge branch 'master' into item_info_include_fix 2021-09-25 15:59:51 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Lwmte
bf87abd8c3 Use actual mesh bounds for trapdoor and falling floor/ceiling objects 2021-09-24 18:17:06 +03:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
Lwmte
0ca822eb9e Fix ceiling trapdoor opening from top 2021-09-20 03:02:54 +03:00
Lwmte
6c0c0db43b Fix multiple openings of floor/ceiling trapdoors 2021-09-20 02:44:06 +03:00