Commit graph

163 commits

Author SHA1 Message Date
Nils
54857431be Fixed Crashing Inventory 2021-08-31 18:24:32 +02:00
Lwmte
e879038220 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
56c71d1fe6 Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +03:00
MontyTRC89
556b8b90a9 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
# Conflicts:
#	TR5Main/TombEngine.vcxproj
#	TR5Main/TombEngine.vcxproj.filters
2021-08-28 06:45:36 +02:00
MontyTRC89
d3e6bfc7dd Refactored switches 2021-08-28 06:37:22 +02:00
Lwmte
04931cfdff Fix crash if caustics are missing 2021-08-27 17:01:54 +03:00
MontyTRC89
45213a595f Fixed drawing of little beetles 2021-08-23 05:49:47 +02:00
MontyTRC89
327a21489f Refactoring ID_LITTLE_BEETLES 2021-08-22 06:08:02 +02:00
MontyTRC89
109b7d6e18 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
MontyTRC89
aa706f010c Fixed locusts; First try of namespaces for objects; 2021-08-19 14:17:21 +02:00
hispidence
ee8f580002 Big audio & audio settings cleanup.
Remove "Sound Enabled" setting, as it would disable BASS if used, leading to a load of warning messages and missing sounds when re-enabled.

Currently-playing track(s) now get quieter/louder when using the music volume slider in the audio settings menu.

Encapsulate GlobalMusicVolume and GlobalFXVolume in functions (at the time of writing this is only strictly necessary for music volume, since SetVolumeMusic needs to also set the volume of currently-playing tracks).

Make "apply" button return to the previous menu, as it does with keyboard controls.

Replace a printf call with a TENLog call.
2021-08-12 00:38:15 +01:00
Lwmte
5b432b133b Fix git mess 2021-08-06 12:21:16 +03:00
Lwmte
0bc21337fb Add alternate way to make a debug box 2021-08-06 12:18:28 +03:00
Lwmte
16c36be7de Reorder renderer operations, redo debug output (use F10-F11 to switch pages), add debug sphere/box drawing 2021-08-06 11:12:34 +03:00
Nils
ca583d15ff Added new Sprite Slots for Bars, Binoculars,(Lasersight) and Caustics 2021-08-04 10:21:45 +02:00
Lwmte
5b9bcc2715 Fix several silly mistakes with std::vector 2021-08-03 01:30:44 +03:00
Lwmte
256d4efe6e Fix crash if meshswap is not present 2021-08-02 19:20:58 +03:00
Lwmte
71dd879ee8 Fix #236 2021-08-02 17:16:23 +03:00
Nils
95bec0e3b0 Reduced Vertex Count for Bars from 9 to 5
Added define for PI for shaders
Added Primes to Vertex Hash generation
Fixed Debris
2021-08-02 13:16:51 +02:00
Lwmte
90f595b55c Remove gnFrameCounter which is seemingly the same as GlobalCounter 2021-08-02 11:25:53 +03:00
Lwmte
054dafeeac Fix blending modes issue (#281)
Only for rooms and some objects but not for Lara or most effects
2021-08-01 15:54:54 +03:00
Lwmte
95bd4f7466 Use refraction as before but accounting for vertex weight factor 2021-08-01 11:39:02 +03:00
Lwmte
e0b504ff00 Draw vertex colors for moveables too 2021-07-30 14:45:18 +03:00
hispidence
d61b38647b Compile fix; forgot to commit this last time. 2021-07-30 11:44:00 +01:00
MontyTRC89
3836ed7a26 Fixed volumes and added debug message 2021-07-15 10:56:03 +02:00
Troye
7b0025a1c9 FLARE_AGE constant; fix dynamic light intensity; fix release builds 2021-07-13 22:29:47 -05:00
Troye
c6cb23af9f fix control selection screens 2021-07-08 17:57:08 -05:00
MontyTRC89
907fce42e7 Added translations support and fixed some bugs with strings 2021-06-20 06:33:44 +02:00
MontyTRC89
dfa4740519 Merge conflicts 2021-06-19 07:14:38 +02:00
MontyTRC89
1bb5965157 Moving to stringed keys for game strings 2021-06-19 07:11:22 +02:00
Trxye
6cb971715e diary bs 2021-06-15 14:09:49 -05:00
wolfcheese
62643f4c64 Added rudimentary implementation of EXPANDING_PLATFORM 2021-06-11 22:57:58 -04:00
Trxye
8813790f9a fix pickup display; fix ring inv compile; implement extra puzzle/key items in inventory; 2021-06-10 14:40:28 -05:00
Trxye
307d4ba47a implement inv obj rotations 2021-06-07 04:23:30 -05:00
Trxye
87b6f25678 implement examines; add inventory scale support; fix rocket and harpoon ammo not showing; 2021-06-06 15:01:46 -05:00
Trxye
245d82566a add apply and cancel to the pause menu 2021-06-06 10:51:20 -05:00
Trxye
a6091bdc70 implement waterskins 2021-06-05 15:27:19 -05:00
Trxye
91ed7b0cf7 clean up some inv code; add clockwork beetle to items cheat; 2021-05-29 11:54:01 -05:00
Nils
0750bee65b Setting correct blend state after horizon and sky 2021-05-28 09:22:17 +02:00
Trxye
8b31698cd2 fix setting ClockworkBeetleFlag; 2021-05-27 18:02:25 -05:00
MontyTRC89
99614caa27 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
Trxye
35af9b2c92 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
MontyTRC89
6b5a932ff8 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
MontyTRC89
ad9a6eaba2 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-25 06:01:25 +02:00
MontyTRC89
1ccd6eb160 Merge branch 'AnimTextures'; Fixed doors init;
# Conflicts:
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/TR5Main.vcxproj.filters
2021-05-25 05:58:44 +02:00
Trxye
d8166daae0 show level name in the statistics 2021-05-23 00:47:06 -05:00
Trxye
622cc4210a fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
Trxye
4cc7cee4c9 implement new inventory 2021-05-18 19:16:58 -05:00
Trxye
c7fc2f89e7 rewrite (hack) title 2021-05-14 18:01:56 -05:00
Nils
d5cbc07d2a Fixed Animated Textures 2021-03-23 15:38:17 +01:00