Merge branch 'master' into SQC-15_online

2023-12-05 06:34:51 -05:00
parent 2446b90bff d9152a721c
commit 4775de01d8
69 changed files with 172 additions and 329 deletions
--- a/SQCSim2021/engine.h
+++ b/SQCSim2021/engine.h
@@ -81,6 +81,8 @@ private:
    void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
    void ProcessNotificationQueue();

+    Connector m_conn;
+
    Audio m_audio = Audio(AUDIO_PATH "start.wav");
    irrklang::ISound* m_powpow, * m_scream;
    irrklang::ISound* m_whoosh[MAX_BULLETS];