Merge branch 'main' into 26-04-04-config

This commit is contained in:
PJB3005
2026-04-05 23:08:03 +02:00
19 changed files with 139 additions and 106 deletions
+2
View File
@@ -14,6 +14,8 @@ constexpr const char* SHOW_STUB_LOG = "F5";
constexpr const char* SHOW_CAMERA_DEBUG = "F6";
constexpr const char* SHOW_AUDIO_DEBUG = "F7";
constexpr const char* TURBO = "Tab";
}
#endif // DUSK_HOTKEYS_H
+9 -5
View File
@@ -13,11 +13,11 @@ extern ConfigVar<bool> enableFullscreen;
}
namespace audio {
extern ConfigVar<float> masterVolume;
extern ConfigVar<float> mainMusicVolume;
extern ConfigVar<float> subMusicVolume;
extern ConfigVar<float> soundEffectsVolume;
extern ConfigVar<float> fanfareVolume;
extern ConfigVar<int> masterVolume;
extern ConfigVar<int> mainMusicVolume;
extern ConfigVar<int> subMusicVolume;
extern ConfigVar<int> soundEffectsVolume;
extern ConfigVar<int> fanfareVolume;
extern ConfigVar<bool> enableReverb;
}
@@ -53,6 +53,9 @@ extern ConfigVar<bool> canTransformAnywhere;
// Technical
extern ConfigVar<bool> restoreWiiGlitches;
// Controls
extern ConfigVar<bool> enableTurboKeybind;
}
void Register();
@@ -75,6 +78,7 @@ struct CollisionViewSettings {
struct TransientSettings {
CollisionViewSettings collisionView;
bool skipFrameRateLimit;
};
TransientSettings& getTransientSettings();