Commit graph

57 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
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
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
Sezz
a2fd3128b1 Begin monkey swing refactor 2022-01-12 17:31:03 +11:00
Lwmte
fbd74ebc29 Rename global properly 2022-01-11 15:16:24 +03: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
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
Lwmte
d14d8d484c Cold breath 2021-11-22 18:55:29 +03:00
Lwmte
27c4dee8b2 Merge branch 'master' into errors 2021-10-28 11:28:24 +03:00
MontyTRC89
57bd42a0fe Changed FLIPON and FLIPOFF triggers 2021-10-28 06:16:33 +02:00
Lwmte
226c0aaee1 Update trigger.cpp 2021-10-08 16:49:08 +03:00
Lwmte
ef0bcf950a Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
Lwmte
daf23132c9 Cleanup control.cpp 2021-10-04 03:14:05 +03:00
Lwmte
2c3fed88fd Merge branch 'freeform_bridges' 2021-10-02 16:20:53 +03:00
Lwmte
401666b8cd Fix PAD/ANTIPAD triggers 2021-10-01 18:31:06 +03:00
MontyTRC89
f35d6e80d0 Merge branch 'entities_fixings'
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
2021-09-29 05:35:17 +02:00
Troye
552352dd21 W1 2021-09-25 16:03:28 -05:00
Lwmte
971d1b203f Cleanup 2 2021-09-25 16:04:16 +03:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
MontyTRC89
9455e17dd5 Fixed darts emitter triggering again and again 2021-09-24 05:48:27 +02:00
MontyTRC89
4b0d76ed95 Refactored flame emitters, Lara burn and lightning bolts; 2021-09-22 05:51:25 +02:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
5ae79a461e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +03:00
Lwmte
68923228dd Remove unused globals and move others from control.cpp to needed source files 2021-09-15 21:09:09 +03:00
Lwmte
2e62725933 Move flipmap stuff out of control.cpp 2021-09-15 17:40:00 +03:00
Lwmte
4a551c0918 Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
e289644e87 Move flipeffect global to filpeffect.cpp 2021-09-15 11:38:55 +03:00
Lwmte
7f16b66dfc Simplify trigger handling code 2021-09-15 10:12:42 +03:00
Lwmte
5e9d243ac0 Move PlaySoundTrack to sound code 2021-09-13 11:16:48 +03:00
Lwmte
e3df0a4960 CheckNoColFloorTriangle enum 2021-09-13 03:20:53 +03:00
Lwmte
8ddab16e6a Demagic 2021-09-13 03:07:58 +03:00
Lwmte
a8e128bc0b Rename some legacy fields, restore footsteps 2021-09-13 02:07:42 +03:00
Lwmte
7d856a01ef Remove unused skeleton trigger type 2021-09-13 01:18:06 +03:00
Lwmte
bbf93167e0 Remove skyRoom/pitRoom 2021-09-11 23:50:54 +03:00
Lwmte
258a9b367f Merge branch 'master' into coll_info_reorganize 2021-09-11 22:44:25 +03:00
Lwmte
7854679a69 Remove all floordata legacy code 2021-09-11 22:41:25 +03:00
Lwmte
aad027c675 Re-enable TR1-2 moving camera 2021-09-11 18:59:14 +03:00
Lwmte
744325bea2 Revert "Fix regressions"
This reverts commit c1fc33ab52.
2021-09-11 10:13:04 +03:00
Lwmte
c1fc33ab52 Fix regressions 2021-09-11 09:41:29 +03:00
MontyTRC89
8db7df3868 Merge branch 'doors_refactoring'
# Conflicts:
#	TR5Main/Game/door.cpp
#	TR5Main/Game/door.h
#	TR5Main/Game/memory/malloc.cpp
#	TR5Main/Objects/Generic/Switches/cog_switch.cpp
#	TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
#	TR5Main/Objects/Generic/Switches/generic_switch.h
#	TR5Main/Objects/Generic/Switches/turn_switch.cpp
#	TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/Specific/level.cpp
#	TR5Main/TombEngine.vcxproj
#	TR5Main/TombEngine.vcxproj.filters
2021-09-11 05:38:26 +02:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +03:00