Commit graph

837 commits

Author SHA1 Message Date
Lwmte
e61c2fc324 Fix wade depth 2021-09-14 15:30:28 +03:00
Lwmte
798b54680e Replace usage of legacy average floor/ceiling values 2021-09-14 14:38:59 +03:00
Lwmte
53541993aa Fix merge 2021-09-14 12:14:33 +03:00
Lwmte
c9e93b9387 Demagic visibility distance 2021-09-14 11:22:59 +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
eb2f33217c Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type 2021-09-13 23:15:02 +03:00
Lwmte
bb775ff6c2 Demagic NO_LOS_ITEM 2021-09-13 10:22:00 +03:00
Lwmte
d8ab386840 Rename DeathIsPit to be more descriptive 2021-09-13 09:55:54 +03:00
Lwmte
9d25db4ca9 Merge branch 'master' into coll_info_reorganize 2021-09-13 09:48:59 +03:00
Lwmte
dc6c3fa72d Rename remaining legacy fields in FLOOR_INFO 2021-09-13 02:51:52 +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
MontyTRC89
035754d51f Fixed ID_STARGATE 2021-09-12 05:35:56 +02:00
MontyTRC89
84a6ef5bab Fixed ID_CHAIN, ID_COG; 2021-09-12 05:27:26 +02:00
MontyTRC89
e7b093d2f2 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-09-12 05:09:29 +02:00
MontyTRC89
e7eba9c30b Removed closed doors 2021-09-12 05:09:20 +02: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
7854679a69 Remove all floordata legacy code 2021-09-11 22:41:25 +03:00
Lwmte
f47d0d2179 Fix compile 2021-09-11 22:40:35 +03:00
Lwmte
47ecaae5b0 Merge branch 'master' into coll_info_reorganize 2021-09-11 10:13:37 +03:00
Lwmte
744325bea2 Revert "Fix regressions"
This reverts commit c1fc33ab52.
2021-09-11 10:13:04 +03:00
Lwmte
6372443766 Merge branch 'master' into coll_info_reorganize 2021-09-11 09:44:43 +03:00
Lwmte
c1fc33ab52 Fix regressions 2021-09-11 09:41:29 +03:00
Lwmte
8f3315a817 Update turn_switch.cpp 2021-09-11 09:36:28 +03:00
Lwmte
cbf22aa649 Merge branch 'master' into coll_info_reorganize 2021-09-11 09:35:04 +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
2f3af7e3ea Simplify GetCollisionInfo arguments 2021-09-10 12:14:28 +03:00
Lwmte
a016b4244e Demagic monkey collision height 2021-09-10 11:08:20 +03:00
Lwmte
280c9fa28b Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
MontyTRC89
9c169a87f2 Decompiled ID_OBELISK 2021-09-10 05:30:07 +02:00
Lwmte
c9d4914e3d Simplify COLL_POSITION 2021-09-10 00:43:26 +03:00
Lwmte
1df38ae15a Rename settings to setup 2021-09-10 00:20:59 +03:00
Lwmte
1efe0a9f09 Reorganize COLL_INFO 2021-09-10 00:18:47 +03:00
Lwmte
c81fcfe43e Fix merge conflicts 2021-09-09 11:25:03 +03:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
MontyTRC89
f5351e52ae Fixed turn switch 2021-09-09 05:29:59 +02:00
Lwmte
3fe6211e4e Further organizing 2021-09-08 18:31:35 +03:00
Lwmte
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
MontyTRC89
714e0a5ca2 Merge pull request #328 from MontyTRC89/new_objects_collision
Solid statics collision
2021-09-08 16:44:01 +02:00
Lwmte
f8ea09ea14 Replace all magic numbers with mesh flags 2021-09-08 15:01:19 +03:00
MontyTRC89
3f28ca6be0 Added turn switch setup code 2021-09-08 10:03:43 +02:00
MontyTRC89
f43e7b863b Fixed crowbar switch 2021-09-08 06:10:38 +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
Raildex
2ee57e5891 Renamed "generalPtr" of LaraInfo to "interactedItem"
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
2021-09-05 11:20:51 +02:00