Commit graph

413 commits

Author SHA1 Message Date
Lwmte
5ae79a461e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +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
d8aa65260f Make Lara targetable again 2021-09-16 03:56:04 +03:00
Lwmte
1d0ceb0ff4 Fix more stuff 2021-09-16 01:12:19 +03:00
Lwmte
c324f70774 Organize control.h too 2021-09-15 22:43:19 +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
4d8c219811 Simplify flipeffect call 2021-09-15 17:49:01 +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
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
bb445660e7 Add safety checks for flipeffects 2021-09-15 14:45:20 +03:00
Lwmte
26cd489da6 Move FlashFader to environment controller 2021-09-15 12:58:07 +03:00
Lwmte
e289644e87 Move flipeffect global to filpeffect.cpp 2021-09-15 11:38:55 +03:00
Lwmte
133ad97605 Update control.cpp 2021-09-15 11:18:11 +03:00
Lwmte
81af7bea10 Move wind to weather controller 2021-09-15 11:13:47 +03:00
Lwmte
d7c2e0e964 Clear spotcams on level reload 2021-09-14 16:34:58 +03:00
Lwmte
88b679ba22 Clear sky data on level restart 2021-09-14 16:00:06 +03:00
Lwmte
7253706cb0 Fix issue with active creatures 2021-09-14 15:54:49 +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
17ff197dc7 Merge branch 'coll_info_reorganize' into sky_fix 2021-09-14 12:08:05 +03:00
Lwmte
03e225f82d Move sky out of renderer 2021-09-14 12:05:36 +03:00
Lwmte
a2dd7e52e5 Merge branch 'master' into coll_info_reorganize 2021-09-14 08:48:36 +03:00
MontyTRC89
88de21198a Merge branch 'master' into displaystrings 2021-09-14 05:11:43 +02:00
Lwmte
b6d55c4ddc Use different sprites for left/right foot 2021-09-14 01:22:08 +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
095e194fbc Move FireCrossbowFromLasersight to lara_one_gun.cpp 2021-09-13 11:43:36 +03:00
Lwmte
5e9d243ac0 Move PlaySoundTrack to sound code 2021-09-13 11:16:48 +03:00
Lwmte
bb775ff6c2 Demagic NO_LOS_ITEM 2021-09-13 10:22:00 +03:00
Lwmte
b8bb8562a3 Merge branch 'master' into sky_fix 2021-09-13 09:50:25 +03:00
Lwmte
e3df0a4960 CheckNoColFloorTriangle enum 2021-09-13 03:20:53 +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
Lwmte
dc6d87d26d Fix CheckNoColTriangle functions 2021-09-13 00:23:55 +03:00
Lwmte
bbf93167e0 Remove skyRoom/pitRoom 2021-09-11 23:50:54 +03:00
Lwmte
f9aa0e9f12 Update control.cpp 2021-09-11 22:55:40 +03:00
Lwmte
7854679a69 Remove all floordata legacy code 2021-09-11 22:41:25 +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
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
86d585263e Merge branch 'static_mesh_fixes' into sky_fix 2021-09-10 18:43:12 +03:00
Lwmte
ce0614c397 Merge branch 'coll_info_reorganize' into static_mesh_fixes 2021-09-10 18:29:41 +03:00
Lwmte
2867ca0bee Calculate tilt and slopes from new floordata 2021-09-10 18:13:40 +03:00
Lwmte
42a6e45bca Merge branch 'master' into sky_fix 2021-09-10 14:04:00 +03:00
Lwmte
f8d9edeb81 Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type 2021-09-10 13:49:45 +03:00
Lwmte
b9ff80220e Move all sky stuff to renderer 2021-09-09 13:30:49 +03:00