Commit graph

28 commits

Author SHA1 Message Date
Lwmte
e05f0b89a2 Rename newinv2 to gui 2021-11-16 15:51:50 +03:00
Lwmte
dedb938b24 Tier 1 2021-11-16 14:38:04 +03:00
Lwmte
b7e5a81322 Tests and fixes, removed unnecessary flags from SetAnimation 2021-11-10 11:59:54 +03:00
Lwmte
8f51243ca4 First commit 2021-11-10 02:41:59 +03:00
Troye
af287cdf6d InventoryClass; 2021-10-12 04:15:22 -05:00
Troye
acc4281555 purge ring inventory; 2021-10-12 00:26:46 -05:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
32b48e9c24 Rename some functions 2021-09-17 16:07:53 +03:00
Lwmte
5ae79a461e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +03:00
Lwmte
0a67b43841 Fix wall door collision positioning 2021-09-17 01:46:06 +03:00
Lwmte
8d86c2e97d Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
7f16b66dfc Simplify trigger handling code 2021-09-15 10:12:42 +03:00
Lwmte
ededdc0c1d Fix jumping into objects 2021-09-14 11:09:29 +03:00
Lwmte
f2f20ad36d "Fix" door collision 2021-09-14 10:59:09 +03:00
Lwmte
28aeceac98 Rename box 2021-09-13 02:46:48 +03:00
Lwmte
a8e128bc0b Rename some legacy fields, restore footsteps 2021-09-13 02:07:42 +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
010ae44410 Fix merge conflicts 2021-09-11 22:43:29 +03:00
Lwmte
f47d0d2179 Fix compile 2021-09-11 22:40:35 +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
MontyTRC89
887d509233 Fixed pushpull and kick doors 2021-09-07 06:04:09 +02:00
MontyTRC89
bba8de53e4 Fixed cog switch and raisable door 2021-09-06 05:41:03 +02:00
MontyTRC89
139d777cb2 Removed TR5 doors code; Added OCB for underwater switches; Small fixes to doors; 2021-09-06 05:27:27 +02:00
MontyTRC89
d5ea0becf1 Refactored doors in multiple files 2021-09-05 06:05:00 +02:00