Commit graph

51 commits

Author SHA1 Message Date
Lwmte
8a87881c72 Tier 1 2021-11-16 14:38:04 +03:00
Lwmte
c4090b7c9a Use script for setting weather 2021-11-11 01:16:27 +03:00
Lwmte
3e6fde22fc Draw real snow 2021-11-10 16:21:41 +03:00
Lwmte
1a066661e9 Add transparency and ripples to weather particles 2021-11-10 15:31:10 +03:00
Lwmte
c4daadd251 Merge branch 'master' into rain_snow 2021-11-10 14:53:31 +03:00
Sezz
58079c170a Refactor lara_tests.cpp 2021-11-10 02:01:43 +11:00
Sezz
f3da356588 Move various functions out of lara_swim.cpp 2021-11-10 01:32:54 +11:00
Sezz
d4b5dc240f Refactor LaraControl() 2021-11-09 16:03:56 +11:00
Lwmte
813273432e Fixes 2021-11-08 21:25:52 +03:00
Lwmte
2b36da25d1 Merge branch 'master' into rain_snow 2021-11-08 20:42:38 +03:00
Lwmte
ae80832d9b Swap y/z args in new FD funcs 2021-11-08 17:48:57 +03:00
Lwmte
64abfca9b1 Fix #344 2021-11-08 17:28:04 +03:00
Lwmte
b122b2b3a9 Test 2021-11-08 10:55:12 +03:00
Lwmte
bac8fb7171 Remove more unused globals, refactor ObjectOnLOS 2021-11-04 20:23:26 +03:00
Lwmte
6193a758ff Move savegames to separate folder, organize savegame code 2021-10-31 21:36:51 +03:00
Lwmte
363f508d42 Replace logD/logE everywhere with TENLog 2021-10-31 10:50:36 +03:00
Lwmte
462770767c Restore background track on savegame reload 2021-10-29 03:39:22 +03:00
Lwmte
18bddbf7e8 Refactor and fix sound code 2021-10-29 02:22:26 +03:00
MontyTRC89
a1394ae183 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
1d259e3678 Merge branch 'master' into errors 2021-10-28 11:28:24 +03:00
MontyTRC89
9816746567 Merge branch 'savegame' 2021-10-28 07:29:50 +02:00
Lwmte
6de4b8fa92 Merge branch 'master' into errors 2021-10-27 19:05:50 +03:00
MontyTRC89
3009f6776c Added safety check for num lights in renderer; Increased rooms and flipmaps to 1024; 2021-10-27 08:35:11 +02:00
Lwmte
816ea1cbd0 Move rumble timer to camera code 2021-10-22 16:33:15 +03:00
MontyTRC89
2da82f8813 Renamed little bettes to scarabs; Added statics, cameras, scarabs, spiders, rats, bats to savegames 2021-10-15 10:28:32 +02:00
MontyTRC89
2ca666d2d6 Changed savegames function calls from using strings to slot number 2021-10-15 05:35:44 +02:00
MontyTRC89
a1162635d3 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
d62f5d5a32 get rid of bitwise menuing 2021-10-13 15:10:48 -05:00
Troye
0df9c8c9bc Implement LoadSave UI; Fix Grenade ammo selection; Fix pause flicker; fix infinite shotgun ammo; 2021-10-12 15:05:07 -05:00
Troye
f67a591836 InventoryClass; 2021-10-12 04:15:22 -05:00
Troye
3e7e9a0f1c purge ring inventory; 2021-10-12 00:26:46 -05:00
MontyTRC89
2bbb00c83c Skeleton for load and save GUI; First tests with object api of flat buffer; 2021-10-12 06:43:25 +02:00
Lwmte
9eed8a645b Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
Lwmte
45acfcab06 Implement two-pass ledge angle check for tight diagonal setups 2021-10-08 13:58:51 +03:00
Lwmte
08964e8da7 Cleanup control.cpp 2021-10-04 03:14:05 +03:00
Lwmte
af476df8dd Cleanup smoke particles on level load, add some logging to level load 2021-10-04 03:09:32 +03:00
Lwmte
961937d7cd Don't use legacy function names in sound code 2021-10-02 18:54:53 +03:00
Lwmte
35543fed30 Fix PAD/ANTIPAD triggers 2021-10-01 18:31:06 +03:00
Lwmte
9fd2441855 First commit 2021-09-27 07:12:30 +03:00
Troye
6c0e7645fb W1 2021-09-25 16:03:28 -05:00
Lwmte
d1735d4bbd Cleanup 2021-09-25 16:00:30 +03:00
Lwmte
853fee66b2 Merge branch 'master' into item_info_include_fix 2021-09-25 15:59:51 +03:00
Nils
8b336fcf73 Added newlines 2021-09-25 11:27:47 +02:00
Lwmte
e38b42b34e Use actual mesh bounds for trapdoor and falling floor/ceiling objects 2021-09-24 18:17:06 +03:00
Lwmte
1895fd6347 Remove test code 2021-09-24 14:24:19 +03:00
Lwmte
0a2ecdd16e cleanup 2021-09-24 14:22:47 +03:00
Lwmte
30bad7ce73 Merge branch 'master' into mesh_mutator 2021-09-24 13:53:39 +03:00
Lwmte
b172c6333f Fix everything 2021-09-24 13:50:31 +03:00
Nils
01bf1881b3 Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
MontyTRC89
f1ce048ffa Refactored flame emitters, Lara burn and lightning bolts; 2021-09-22 05:51:25 +02:00