Commit graph

38 commits

Author SHA1 Message Date
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
hispidence
d1ca2df0a6 Fix old LARA_DRAW_TYPE usage with LARA_TYPE constants.
These don't need to be scoped, but I originally made it an enum class and plan to end up doing so down the line anyway, and this should save a bit of time there.
2021-08-07 19:24:39 +01:00
Lwmte
fd844d5d6b Remove poisoning by medkits 2021-08-02 14:44:28 +03:00
Lwmte
4da3b6b624 Fix binoculars mode engaging other states 2021-08-02 12:35:17 +03:00
MontyTRC89
8294e73199 Merge remote-tracking branch 'origin/lara_info'
# Conflicts:
#	TR5Main/Game/Lara/lara_flare.h
#	TR5Main/Scripting/GameLogicScript.cpp
2021-07-14 05:48:42 +02:00
hispidence
78e8e52ef7 Use GetInventoryCount in have_i_got_object as it works the same way. 2021-07-11 17:10:35 +01:00
Troye
c6cb23af9f fix control selection screens 2021-07-08 17:57:08 -05:00
MontyTRC89
3bd65d3629 Removed test code; Removed scripts from project (they will be created by LD); Added some missing strings for inventory; Added scripting for puzzles; Removed some old code for scripting; 2021-06-23 05:58:24 +02: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
Trxye
c31a98c9bc move options_table to the inventory list; implement rotation flags 2021-06-11 02:47:23 -05:00
Trxye
0bfedd8466 implement extra pickup items & examines 2021-06-11 01:06:43 -05: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
3757f236bf Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-06 15:01:52 -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
wolfcheese
18cb0b05f7 Same apply/cancel return key fix applied to pause menu 2021-06-06 14:01:20 -04:00
Trxye
770ec1f45f improve waterskin combination 2021-06-06 11:38:39 -05:00
Trxye
245d82566a add apply and cancel to the pause menu 2021-06-06 10:51:20 -05:00
Trxye
2fb00cde8a Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-05 15:27:26 -05:00
Trxye
a6091bdc70 implement waterskins 2021-06-05 15:27:19 -05:00
wolfcheese
fa9e301a9d Fixed bug preventing user from using Return key on Apply and Cancel in title's control settings 2021-06-02 23:03:04 -04:00
Trxye
91ed7b0cf7 clean up some inv code; add clockwork beetle to items cheat; 2021-05-29 11:54:01 -05:00
Trxye
5973a049b7 fix level select; fix pause menu audio bug; fix clockwork beetle hand pos; 2021-05-28 00:57:53 -05:00
Trxye
8f74bad385 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 16:08:09 -05:00
Trxye
e5ffb1f70e decompile clockwork beetle; 2021-05-27 16:07:57 -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
MontyTRC
64d090277f
Merge pull request #256 from MontyTRC89/inventory
correct ammo counts, correct combine list positions;
2021-05-25 06:01:08 +02:00
Trxye
997b515a93 correct ammo counts, correct combine list positions; 2021-05-21 11:33:05 -05:00
MontyTRC89
8d88fcce5b Fix merge conflicts 2021-05-21 05:38:20 +02: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
asasas9500
a63a46c82e Delete empty files 2021-02-07 18:15:20 -03:00
TokyoSU
9c1c4517d7
New project format (#206)
* Starting Reformat the project

- New Import Method, no more "../../" in import,
- New Entity Folder Structure, less compile time

* Refactoring the Project

- added precompiled header with default import like microsoft or directx.
- fix many double import.
- fix math.h confliting math.h from
microsoft.
- fix effects.h confliting Effects.h from DirectX.
- refactored TR4 entity folder and how it's loaded.

* Update Some Code Before Switching to Master

* Finished the NewProjectFormat Template

- need to finish entity in the master later.

* Added Monty NewFileFormat

* Fixed Monty NewFileFormat Include

* Revert "Fixed Monty NewFileFormat Include"

This reverts commit ebf0afca10.

* Trying to fix conflits for NewFileFormat

* Fixed .filters

* Last Commit in NewProjectFormat
2020-05-27 09:21:20 +02:00
TokyoSU
52b5136443 misc fix & adding boat/kayak/snowmobile file 2019-11-20 11:24:36 +01:00
MontyTRC89
e6114af969 First commit 2018-08-19 09:46:58 +02:00