Commit graph

34 commits

Author SHA1 Message Date
Lwmte
d470cdcf01 Refactor and fix sound code 2021-10-29 02:22:26 +03:00
MontyTRC89
e4329c4974 Merge branch 'errors'
# Conflicts:
#	TR5Main/Game/effects/flmtorch.cpp
#	TR5Main/Game/objects.cpp
#	TR5Main/Objects/Effects/enemy_missile.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
2021-10-28 11:06:02 +02:00
Lwmte
27c4dee8b2 Merge branch 'master' into errors 2021-10-28 11:28:24 +03:00
MontyTRC89
bb154867dd Merge branch 'savegame' 2021-10-28 07:29:50 +02:00
Lwmte
f592f36a24 Merge branch 'master' into errors 2021-10-27 19:05:50 +03:00
MontyTRC89
824430d4cf Added safety check for num lights in renderer; Increased rooms and flipmaps to 1024; 2021-10-27 08:35:11 +02:00
Lwmte
fb0de37d32 Move rumble timer to camera code 2021-10-22 16:33:15 +03:00
MontyTRC89
5c829c5c23 Renamed little bettes to scarabs; Added statics, cameras, scarabs, spiders, rats, bats to savegames 2021-10-15 10:28:32 +02:00
MontyTRC89
e4966ab976 Changed savegames function calls from using strings to slot number 2021-10-15 05:35:44 +02:00
MontyTRC89
4c3583c1ed Merge remote-tracking branch 'origin/inventory_class' into savegame
# Conflicts:
#	TR5Main/Game/savegame.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/Specific/input.cpp
2021-10-15 05:23:04 +02:00
Troye
82c968662e get rid of bitwise menuing 2021-10-13 15:10:48 -05:00
Troye
def1169966 Implement LoadSave UI; Fix Grenade ammo selection; Fix pause flicker; fix infinite shotgun ammo; 2021-10-12 15:05:07 -05: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
MontyTRC89
aa5c0821c7 Skeleton for load and save GUI; First tests with object api of flat buffer; 2021-10-12 06:43:25 +02:00
Lwmte
ef0bcf950a Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
Lwmte
30cea4bf15 Implement two-pass ledge angle check for tight diagonal setups 2021-10-08 13:58:51 +03:00
Lwmte
daf23132c9 Cleanup control.cpp 2021-10-04 03:14:05 +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
c871884301 Don't use legacy function names in sound code 2021-10-02 18:54:53 +03:00
Lwmte
401666b8cd Fix PAD/ANTIPAD triggers 2021-10-01 18:31:06 +03:00
Lwmte
788ce04661 First commit 2021-09-27 07:12:30 +03:00
Troye
552352dd21 W1 2021-09-25 16:03:28 -05:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Lwmte
b7cf7be08c Merge branch 'master' into item_info_include_fix 2021-09-25 15:59:51 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Lwmte
bf87abd8c3 Use actual mesh bounds for trapdoor and falling floor/ceiling objects 2021-09-24 18:17:06 +03:00
Lwmte
837f30060c Remove test code 2021-09-24 14:24:19 +03:00
Lwmte
4b242264f6 cleanup 2021-09-24 14:22:47 +03:00
Lwmte
e17a8a0d99 Merge branch 'master' into mesh_mutator 2021-09-24 13:53:39 +03:00
Lwmte
6c29ba5442 Fix everything 2021-09-24 13:50:31 +03:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
MontyTRC89
4b0d76ed95 Refactored flame emitters, Lara burn and lightning bolts; 2021-09-22 05:51:25 +02:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Renamed from TR5Main/Game/control.cpp (Browse further)