Commit graph

140 commits

Author SHA1 Message Date
Sezz
0fd94f2dbc Fix level load crash with certain items present; cleanup 2022-03-20 14:18:36 +11:00
Sezz
93e62d3e64 Update extra velocity handling; snap to floor height upon entering slope state; cleanup 2022-03-14 01:20:51 +11:00
Sezz
0091bc84d2 Move more members from ITEM_INFO into CreatureInfo; cleanup 2022-03-06 20:45:50 +11:00
Sezz
ed6ac2d7bc Rename ITEM_INFO members to comply with conventions 2022-02-09 16:55:46 +11:00
Sezz
daf5e69669 Merge branch 'master' into state_cleaning_tier_2 2022-02-03 19:29:07 +11:00
Sezz
be08902a5c Tentatively rename animation-related ITEM_INFO members 2022-02-02 20:16:16 +11:00
MontyTRC89
d8eb60a533 Merge branch 'animation_integers' into renderer_refactor 2022-01-11 13:21:02 +01:00
MontyTRC89
8b6a92ee14 Added LightType field in MESH struct; Optimized bindTexture class in DrawMesh function; 2022-01-06 11:12:05 +01:00
Lwmte
903260ca39 Merge branch 'master' into animation_integers 2021-12-24 03:34:53 +03:00
Lwmte
8f4ba68f30 Reorganize includes tier 3 2021-12-24 03:32:19 +03:00
Lwmte
70320ba0ba Merge branch 'master' into animation_integers 2021-12-22 16:24:12 +03:00
Lwmte
2101d3e65f Reorganize includes tier 2 2021-12-22 16:23:57 +03:00
Lwmte
48e52e9e7f Also use ints for num meshes and mesh index 2021-12-22 14:22:54 +03:00
Lwmte
412f788eb5 Also convert moveable animation index to int 2021-12-22 12:35:30 +03:00
Lwmte
a1bb992145 First commit 2021-12-22 12:17:59 +03:00
Lwmte
5d79cda341 Refactor baddy pickups a bit 2021-12-15 04:14:40 +03:00
Lwmte
9058f2e3de Use script for setting weather 2021-11-11 01:16:27 +03:00
Lwmte
282927ffda Fix #344 2021-11-08 17:28:04 +03:00
Lwmte
3ca6ede394 Code styling 2021-11-04 05:18:00 +03:00
Lwmte
83bae04c01 Replace logD/logE everywhere with TENLog 2021-10-31 10:50:36 +03:00
Lwmte
d470cdcf01 Refactor and fix sound code 2021-10-29 02:22:26 +03:00
Lwmte
b46e0466c3 Cleanup smoke particles on level load, add some logging to level load 2021-10-04 03:09:32 +03:00
Lwmte
788ce04661 First commit 2021-09-27 07:12:30 +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
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
016be41f97 Move anim structs to animation.h 2021-09-19 18:29:25 +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
1d0ceb0ff4 Fix more stuff 2021-09-16 01:12: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
d272d44d29 Remove reading of avg floor/height values 2021-09-14 14:46:19 +03:00
Lwmte
798b54680e Replace usage of legacy average floor/ceiling values 2021-09-14 14:38:59 +03:00
Lwmte
17ff197dc7 Merge branch 'coll_info_reorganize' into sky_fix 2021-09-14 12:08:05 +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
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
b8bb8562a3 Merge branch 'master' into sky_fix 2021-09-13 09:50:25 +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
bbf93167e0 Remove skyRoom/pitRoom 2021-09-11 23:50:54 +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
86d585263e Merge branch 'static_mesh_fixes' into sky_fix 2021-09-10 18:43:12 +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
62e4f2cdc5 Rename MiscTextures to SkyTexture 2021-09-09 13:39:25 +03:00