Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

include/d/actor/d_a_alink.h

@@ -4570,6 +4570,7 @@ public:
     cXyz mIBChainInterpCurrHandRoot;
     bool mIBChainInterpPrevValid;
     bool mIBChainInterpCurrValid;
+    bool mIsRollstab = false;
 #endif
 };  // Size: 0x385C
 

include/dusk/achievements.h

@@ -5,7 +5,7 @@
 #include <queue>
 #include <string>
 #include <string_view>
-#include <unordered_set>
+#include <unordered_map>
 #include <vector>
 #include "nlohmann/json.hpp"
 
@@ -47,6 +47,7 @@ public:
     // Signals are visible to all achievement checks within the same tick, then cleared.
     void signal(const char* key);
     bool hasSignal(const char* key) const;
+    int signalCount(const char* key) const;
 
     std::vector<Achievement> getAchievements() const;
 
@@ -62,7 +63,7 @@ private:
     void processEntry(Entry& e);
 
     std::vector<Entry> m_entries;
-    std::unordered_set<std::string_view> m_signals;
+    std::unordered_map<std::string_view, int> m_signals;
     bool m_loaded = false;
     bool m_dirty = false;
 };

include/dusk/crash_handler.h

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace dusk::crash_handler {
+
+void install();
+
+}  // namespace dusk::crash_handler

include/dusk/logging.h

@@ -12,6 +12,7 @@ namespace dusk {
     void InitializeFileLogging(const std::filesystem::path& configDir, AuroraLogLevel logLevel);
     void ShutdownFileLogging();
     const char* GetLogFilePath();
+    int GetLogFileDescriptor();
     void SendToStubLog(AuroraLogLevel level, const char* module, const char* message);
 }
 
@@ -19,7 +20,11 @@ extern bool StubLogEnabled;
 
 extern aurora::Module DuskLog;
 
+#ifndef NDEBUG
 #define STUB_LOG() DuskLog.debug("{} is a stub", __FUNCTION__)
+#else
+#define STUB_LOG()
+#endif
 
 #if TARGET_PC
 #define STUB_RET(...) \

include/dusk/settings.h

@@ -202,6 +202,8 @@ struct UserSettings {
         ConfigVar<bool> invertCameraYAxis;
         ConfigVar<bool> invertFirstPersonXAxis;
         ConfigVar<bool> invertFirstPersonYAxis;
+        ConfigVar<bool> invertAirSwimX;
+        ConfigVar<bool> invertAirSwimY;
         ConfigVar<float> freeCameraSensitivity;
         ConfigVar<bool> debugFlyCam;
         ConfigVar<bool> debugFlyCamLockEvents;