Commit graph

407 commits

Author SHA1 Message Date
Lwmte
1195e2077c Simplify flipeffect call 2021-09-15 17:49:01 +03:00
Lwmte
cfe0c38522 Move flipmap stuff out of control.cpp 2021-09-15 17:40:00 +03:00
Lwmte
2dab494bfa Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
da67b9166c Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
fc877ba3d0 Add safety checks for flipeffects 2021-09-15 14:45:20 +03:00
Lwmte
a18a385f53 Move FlashFader to environment controller 2021-09-15 12:58:07 +03:00
Lwmte
913190ce25 Move flipeffect global to filpeffect.cpp 2021-09-15 11:38:55 +03:00
Lwmte
c3e23c52b3 Update control.cpp 2021-09-15 11:18:11 +03:00
Lwmte
b3f4589b4a Move wind to weather controller 2021-09-15 11:13:47 +03:00
Lwmte
d40aa785a6 Clear spotcams on level reload 2021-09-14 16:34:58 +03:00
Lwmte
f58066eb69 Clear sky data on level restart 2021-09-14 16:00:06 +03:00
Lwmte
f6c09e77e2 Fix issue with active creatures 2021-09-14 15:54:49 +03:00
Lwmte
9f1e6e7a0b Replace usage of legacy average floor/ceiling values 2021-09-14 14:38:59 +03:00
Lwmte
b6e0131053 Fix merge 2021-09-14 12:14:33 +03:00
Lwmte
7d17cce5df Merge branch 'coll_info_reorganize' into sky_fix 2021-09-14 12:08:05 +03:00
Lwmte
083776ab78 Move sky out of renderer 2021-09-14 12:05:36 +03:00
Lwmte
b235db5ac0 Merge branch 'master' into coll_info_reorganize 2021-09-14 08:48:36 +03:00
MontyTRC
4f527f9b9b
Merge branch 'master' into displaystrings 2021-09-14 05:11:43 +02:00
Lwmte
1d5c841bf3 Use different sprites for left/right foot 2021-09-14 01:22:08 +03:00
Lwmte
40b4d8e51e Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type 2021-09-13 23:15:02 +03:00
Lwmte
0340071cb3 Move FireCrossbowFromLasersight to lara_one_gun.cpp 2021-09-13 11:43:36 +03:00
Lwmte
63c215bea7 Move PlaySoundTrack to sound code 2021-09-13 11:16:48 +03:00
Lwmte
1df2234c4e Demagic NO_LOS_ITEM 2021-09-13 10:22:00 +03:00
Lwmte
8fadb92950 Merge branch 'master' into sky_fix 2021-09-13 09:50:25 +03:00
Lwmte
77ef567be4 CheckNoColFloorTriangle enum 2021-09-13 03:20:53 +03:00
Lwmte
50030b9f51 Rename remaining legacy fields in FLOOR_INFO 2021-09-13 02:51:52 +03:00
Lwmte
202bf42a12 Rename box 2021-09-13 02:46:48 +03:00
Lwmte
9554f8741a Rename some legacy fields, restore footsteps 2021-09-13 02:07:42 +03:00
Lwmte
4ff29416e1 Fix CheckNoColTriangle functions 2021-09-13 00:23:55 +03:00
Lwmte
0fd07f11dc Remove skyRoom/pitRoom 2021-09-11 23:50:54 +03:00
Lwmte
c67290bc30 Update control.cpp 2021-09-11 22:55:40 +03:00
Lwmte
55287a99da Remove all floordata legacy code 2021-09-11 22:41:25 +03:00
Lwmte
080b295c42 Merge branch 'master' into coll_info_reorganize 2021-09-11 10:13:37 +03:00
Lwmte
37d648cfd0 Revert "Fix regressions"
This reverts commit 7faf1fb02a.
2021-09-11 10:13:04 +03:00
Lwmte
742814c76f Merge branch 'master' into coll_info_reorganize 2021-09-11 09:44:43 +03:00
Lwmte
7faf1fb02a Fix regressions 2021-09-11 09:41:29 +03:00
Lwmte
bc5569967d Merge branch 'master' into coll_info_reorganize 2021-09-11 09:35:04 +03:00
MontyTRC89
865202b33c 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
fa9f75cadf Merge branch 'static_mesh_fixes' into sky_fix 2021-09-10 18:43:12 +03:00
Lwmte
cddff14e21 Merge branch 'coll_info_reorganize' into static_mesh_fixes 2021-09-10 18:29:41 +03:00
Lwmte
16a25c04e6 Calculate tilt and slopes from new floordata 2021-09-10 18:13:40 +03:00
Lwmte
eecdb638af Merge branch 'master' into sky_fix 2021-09-10 14:04:00 +03:00
Lwmte
8d2292c2c8 Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type 2021-09-10 13:49:45 +03:00
Lwmte
ff6b52b754 Move all sky stuff to renderer 2021-09-09 13:30:49 +03:00
Lwmte
4186dfe685 Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
7f5dceef0c Further organizing 2021-09-08 18:31:35 +03:00
Lwmte
9af21e3146 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
2bee1df81a Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
MontyTRC
60e81f29d8
Merge pull request #328 from MontyTRC89/new_objects_collision
Solid statics collision
2021-09-08 16:44:01 +02:00
Lwmte
e8f6c1fd54 Replace all magic numbers with mesh flags 2021-09-08 15:01:19 +03:00