Merge remote-tracking branch 'god-team/main' into okji/feat/macos-port

Author: Okladnoj

.github/workflows/ci.yml

@@ -80,15 +80,15 @@ jobs:
 #          - preset: "win32-debug"
 #            tools: true
 #            extras: true
-#          - preset: "win32-vcpkg"
-#            tools: true
-#            extras: true
-#          - preset: "win32-vcpkg-profile"
-#            tools: true
-#            extras: true
-#          - preset: "win32-vcpkg-debug"
-#            tools: true
-#            extras: true
+#          #- preset: "win32-vcpkg"
+#          #  tools: true
+#          #  extras: true
+#          #- preset: "win32-vcpkg-profile"
+#          #  tools: true
+#          #  extras: true
+#          #- preset: "win32-vcpkg-debug"
+#          #  tools: true
+#          #  extras: true
 #      fail-fast: false
 #    uses: ./.github/workflows/build-toolchain.yml
 #    with:
@@ -144,15 +144,15 @@ jobs:
           - preset: "win32-debug"
             tools: false
             extras: true
-#          - preset: "win32-vcpkg"
-#            tools: true
-#            extras: true
-#          - preset: "win32-vcpkg-profile"
-#            tools: true
-#            extras: true
-#          - preset: "win32-vcpkg-debug"
-#            tools: true
-#            extras: true
+          #- preset: "win32-vcpkg"
+          #  tools: true
+          #  extras: true
+          #- preset: "win32-vcpkg-profile"
+          #  tools: true
+          #  extras: true
+          #- preset: "win32-vcpkg-debug"
+          #  tools: true
+          #  extras: true
       fail-fast: false
     uses: ./.github/workflows/build-toolchain.yml
     with:

CMakePresets.json

@@ -126,7 +126,8 @@
             "inherits": "win32",
             "displayName": "Windows 32bit Profile",
             "cacheVariables": {
-                "RTS_BUILD_OPTION_PROFILE": "ON"
+                "RTS_BUILD_OPTION_PROFILE": "ON",
+                "RTS_BUILD_OPTION_PROFILE_TRACY": "ON"
             }
         },
         {

CONTRIBUTING.md

@@ -2,6 +2,21 @@
 
 To contribute, fork this repository to create your own copy that you can clone locally and push back to. You can use your fork to create pull requests for your code to be merged into this repository.
 
+
+## Contribution guidelines
+
+Prefer opening fewer high quality Pull Requests over many low quality ones. Prioritize polishing existing Pull Requests instead of creating new ones. Do not open Pull Requests as draft unless there are specific requirements that justify it, because draft Pull Requests are generally not looked at and pollute the Pull Request section.
+
+
+## AI code generation guidelines
+
+Creating changes with LLM generated code is generally allowed. The author is responsible for verifying that all generated code is human readable, maintainable and logically correct. Furthermore, all generated code needs to be tested and verified. The author is not allowed to outsource the polishing of the generated code to the human code reviewers. In a Pull Request, generated code needs to be announced as such and to what extent it was polished by human intervention.
+
+### New code contributors and AI generated code
+
+New contributors are discouraged from submitting Pull Requests with thousands of lines changed or added with the help of LLMs, because human code reviewers cannot attend such volumes at the risk of wasting precious time with potentially poorly generated code.
+
+
 ## Code guidelines
 
 ### Scope of code changes

Core/CMakeLists.txt

@@ -22,6 +22,7 @@ target_sources(corei_libraries_include PRIVATE
 )
 target_link_libraries(corei_always INTERFACE
     core_config
+    core_profile_tracy
     core_utility
     corei_libraries_include
     resources

Core/GameEngine/CMakeLists.txt

@@ -120,7 +120,6 @@ set(GAMEENGINE_SRC
     Include/Common/STLTypedefs.h
     Include/Common/StreamingArchiveFile.h
     Include/Common/SubsystemInterface.h
-#    Include/Common/SystemInfo.h
 #    Include/Common/Team.h
 #    Include/Common/Terrain.h
 #    Include/Common/TerrainTypes.h
@@ -142,7 +141,7 @@ set(GAMEENGINE_SRC
     Include/Common/XferDeepCRC.h
     Include/Common/XferLoad.h
     Include/Common/XferSave.h
-#    Include/GameClient/Anim2D.h
+    Include/GameClient/Anim2D.h
 #    Include/GameClient/AnimateWindowManager.h
 #    Include/GameClient/CampaignManager.h
     Include/GameClient/ChallengeGenerals.h
@@ -154,10 +153,10 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/ControlBarResizer.h
 #    Include/GameClient/ControlBarScheme.h
     Include/GameClient/Credits.h
-#    Include/GameClient/DebugDisplay.h
+    Include/GameClient/DebugDisplay.h
 #    Include/GameClient/Diplomacy.h
 #    Include/GameClient/DisconnectMenu.h
-#    Include/GameClient/Display.h
+    Include/GameClient/Display.h
     Include/GameClient/DisplayString.h
     Include/GameClient/DisplayStringManager.h
 #    Include/GameClient/Drawable.h
@@ -168,17 +167,17 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/ExtendedMessageBox.h
 #    Include/GameClient/FontDesc.h
     Include/GameClient/FXList.h
-#    Include/GameClient/Gadget.h
-#    Include/GameClient/GadgetCheckBox.h
-#    Include/GameClient/GadgetComboBox.h
-#    Include/GameClient/GadgetListBox.h
-#    Include/GameClient/GadgetProgressBar.h
-#    Include/GameClient/GadgetPushButton.h
-#    Include/GameClient/GadgetRadioButton.h
-#    Include/GameClient/GadgetSlider.h
-#    Include/GameClient/GadgetStaticText.h
-#    Include/GameClient/GadgetTabControl.h
-#    Include/GameClient/GadgetTextEntry.h
+    Include/GameClient/Gadget.h
+    Include/GameClient/GadgetCheckBox.h
+    Include/GameClient/GadgetComboBox.h
+    Include/GameClient/GadgetListBox.h
+    Include/GameClient/GadgetProgressBar.h
+    Include/GameClient/GadgetPushButton.h
+    Include/GameClient/GadgetRadioButton.h
+    Include/GameClient/GadgetSlider.h
+    Include/GameClient/GadgetStaticText.h
+    Include/GameClient/GadgetTabControl.h
+    Include/GameClient/GadgetTextEntry.h
 #    Include/GameClient/GameClient.h
     Include/GameClient/GameFont.h
 #    Include/GameClient/GameInfoWindow.h
@@ -195,7 +194,7 @@ set(GAMEENGINE_SRC
     Include/GameClient/HeaderTemplate.h
 #    Include/GameClient/HintSpy.h
 #    Include/GameClient/HotKey.h
-#    Include/GameClient/Image.h
+    Include/GameClient/Image.h
     Include/GameClient/IMEManager.h
 #    Include/GameClient/InGameUI.h
     Include/GameClient/Keyboard.h
@@ -207,16 +206,16 @@ set(GAMEENGINE_SRC
     Include/GameClient/MapUtil.h
 #    Include/GameClient/MessageBox.h
 #    Include/GameClient/MetaEvent.h
-#    Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
-#    Include/GameClient/Module/BeaconClientUpdate.h
-#    Include/GameClient/Module/SwayClientUpdate.h
+    Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
+    Include/GameClient/Module/BeaconClientUpdate.h
+    Include/GameClient/Module/SwayClientUpdate.h
     Include/GameClient/Mouse.h
     Include/GameClient/ParabolicEase.h
     Include/GameClient/ParticleSys.h
 #    Include/GameClient/PlaceEventTranslator.h
     Include/GameClient/ProcessAnimateWindow.h
     Include/GameClient/RadiusDecal.h
-#    Include/GameClient/RayEffect.h
+    Include/GameClient/RayEffect.h
     Include/GameClient/SelectionInfo.h
 #    Include/GameClient/SelectionXlat.h
 #    Include/GameClient/Shadow.h
@@ -246,9 +245,9 @@ set(GAMEENGINE_SRC
 #    Include/GameLogic/AITNGuard.h
 #    Include/GameLogic/Armor.h
 #    Include/GameLogic/ArmorSet.h
-#    Include/GameLogic/CaveSystem.h
-#    Include/GameLogic/CrateSystem.h
-#    Include/GameLogic/Damage.h
+    Include/GameLogic/CaveSystem.h
+    Include/GameLogic/CrateSystem.h
+    Include/GameLogic/Damage.h
 #    Include/GameLogic/ExperienceTracker.h
 #    Include/GameLogic/FiringTracker.h
 #    Include/GameLogic/FPUControl.h
@@ -487,7 +486,7 @@ set(GAMEENGINE_SRC
 #    Include/GameLogic/PartitionManager.h
 #    Include/GameLogic/PolygonTrigger.h
 #    Include/GameLogic/Powers.h
-#    Include/GameLogic/RankInfo.h
+    Include/GameLogic/RankInfo.h
 #    Include/GameLogic/ScriptActions.h
 #    Include/GameLogic/ScriptConditions.h
 #    Include/GameLogic/ScriptEngine.h
@@ -695,13 +694,13 @@ set(GAMEENGINE_SRC
     Source/GameClient/ClientInstance.cpp
     Source/GameClient/Color.cpp
     Source/GameClient/Credits.cpp
-#    Source/GameClient/Display.cpp
+    Source/GameClient/Display.cpp
     Source/GameClient/DisplayString.cpp
     Source/GameClient/DisplayStringManager.cpp
 #    Source/GameClient/Drawable.cpp
-#    Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
-#    Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
-#    Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
+    Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
+    Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
+    Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
     Source/GameClient/DrawGroupInfo.cpp
 #    Source/GameClient/Eva.cpp
     Source/GameClient/FXList.cpp
@@ -726,17 +725,17 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
 #    Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
 #    Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
-#    Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
-#    Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
-#    Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
-#    Source/GameClient/GUI/Gadget/GadgetListBox.cpp
-#    Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
-#    Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
-#    Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
-#    Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
-#    Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
-#    Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
-#    Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
+    Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
+    Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
+    Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
+    Source/GameClient/GUI/Gadget/GadgetListBox.cpp
+    Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
+    Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
+    Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
+    Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
+    Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
+    Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
+    Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
     Source/GameClient/GUI/GameFont.cpp
     Source/GameClient/GUI/GameWindow.cpp
     Source/GameClient/GUI/GameWindowGlobal.cpp
@@ -824,13 +823,13 @@ set(GAMEENGINE_SRC
     Source/GameClient/SelectionInfo.cpp
     Source/GameClient/Snow.cpp
     Source/GameClient/Statistics.cpp
-#    Source/GameClient/System/Anim2D.cpp
+    Source/GameClient/System/Anim2D.cpp
 #    Source/GameClient/System/CampaignManager.cpp
     Source/GameClient/System/Debug/AudioDebugDisplay.cpp
-#    Source/GameClient/System/DebugDisplay.cpp
-#    Source/GameClient/System/Image.cpp
+    Source/GameClient/System/DebugDisplay.cpp
+    Source/GameClient/System/Image.cpp
     Source/GameClient/System/ParticleSys.cpp
-#    Source/GameClient/System/RayEffect.cpp
+    Source/GameClient/System/RayEffect.cpp
     Source/GameClient/System/Smudge.cpp
     Source/GameClient/Terrain/TerrainRoads.cpp
     Source/GameClient/Terrain/TerrainVisual.cpp
@@ -1091,12 +1090,12 @@ set(GAMEENGINE_SRC
 #    Source/GameLogic/ScriptEngine/ScriptEngine.cpp
 #    Source/GameLogic/ScriptEngine/Scripts.cpp
 #    Source/GameLogic/ScriptEngine/VictoryConditions.cpp
-#    Source/GameLogic/System/CaveSystem.cpp
-#    Source/GameLogic/System/CrateSystem.cpp
-#    Source/GameLogic/System/Damage.cpp
+    Source/GameLogic/System/CaveSystem.cpp
+    Source/GameLogic/System/CrateSystem.cpp
+    Source/GameLogic/System/Damage.cpp
 #    Source/GameLogic/System/GameLogic.cpp
-#    Source/GameLogic/System/GameLogicDispatch.cpp
-#    Source/GameLogic/System/RankInfo.cpp
+    Source/GameLogic/System/GameLogicDispatch.cpp
+    Source/GameLogic/System/RankInfo.cpp
     Source/GameNetwork/Connection.cpp
     Source/GameNetwork/ConnectionManager.cpp
     Source/GameNetwork/DisconnectManager.cpp

Core/GameEngine/Include/Common/ArchiveFileSystem.h

@@ -126,10 +126,7 @@ class ArchiveFileSystem : public SubsystemInterface
 	ArchiveFileSystem();
 	virtual ~ArchiveFileSystem() override;
 
-	virtual void init() = 0;
-	virtual void update() = 0;
-	virtual void reset() = 0;
-	virtual void postProcessLoad() = 0;
+	virtual void postProcessLoad() override = 0;
 
 	// ArchiveFile operations
 	virtual ArchiveFile*	openArchiveFile( const Char *filename ) = 0;		///< Create new or return existing Archive file from file name

Core/GameEngine/Include/Common/FileSystem.h

@@ -138,6 +138,8 @@ struct FileInfo {
 // TheSuperHackers @bugfix xezon 26/10/2025 Adds a mutex to the file exist map to try prevent
 // application hangs during level load after the file exist map was corrupted because of writes
 // from multiple threads.
+//
+// TheSuperHackers @feature Mauller 24/04/2026 Add extension removal functions
 //===============================
 class FileSystem : public SubsystemInterface
 {
@@ -162,6 +164,9 @@ class FileSystem : public SubsystemInterface
 	static AsciiString normalizePath(const AsciiString& path);	///< normalizes a file path. The path can refer to a directory. File path must be absolute, but does not need to exist. Returns an empty string on failure.
 	static Bool isPathInDirectory(const AsciiString& testPath, const AsciiString& basePath);	///< determines if a file path is within a base path. Both paths must be absolute, but do not need to exist.
 
+	static bool removeExtension(AsciiString& path);
+	static bool removeExtension(UnicodeString& path);
+
 protected:
 #if ENABLE_FILESYSTEM_EXISTENCE_CACHE
 	struct FileExistData

Core/GameEngine/Include/Common/GameAudio.h

@@ -296,8 +296,6 @@ class AudioManager : public SubsystemInterface
 		// For the file cache to know when to remove files.
 		virtual void closeAnySamplesUsingFile( const void *fileToClose ) = 0;
 
-		virtual Bool isMusicAlreadyLoaded() const;
-
 		Bool getDisallowSpeech() const { return m_disallowSpeech; }
 		void setDisallowSpeech( Bool disallowSpeech ) { m_disallowSpeech = disallowSpeech; }
 
@@ -383,55 +381,4 @@ class AudioManager : public SubsystemInterface
 		Bool m_disallowSpeech			: 1;
 };
 
-// TheSuperHackers @feature helmutbuhler 17/05/2025
-// AudioManager that does nothing. Used for Headless Mode.
-class AudioManagerDummy : public AudioManager
-{
-#if defined(RTS_DEBUG)
-	virtual void audioDebugDisplay(DebugDisplayInterface* dd, void* userData, FILE* fp) {}
-#endif
-	virtual void stopAudio(AudioAffect which) override {}
-	virtual void pauseAudio(AudioAffect which) override {}
-	virtual void resumeAudio(AudioAffect which) override {}
-	virtual void pauseAmbient(Bool shouldPause) override {}
-	virtual void killAudioEventImmediately(AudioHandle audioEvent) override {}
-	virtual void nextMusicTrack() override {}
-	virtual void prevMusicTrack() override {}
-	virtual Bool isMusicPlaying() const override { return false; }
-	virtual Bool hasMusicTrackCompleted(const AsciiString& trackName, Int numberOfTimes) const override { return false; }
-	virtual AsciiString getMusicTrackName() const override { return ""; }
-	virtual void openDevice() override {}
-	virtual void closeDevice() override {}
-	virtual void* getDevice() override { return nullptr; }
-	virtual void notifyOfAudioCompletion(UnsignedInt audioCompleted, UnsignedInt flags) override {}
-	virtual UnsignedInt getProviderCount() const override { return 0; };
-	virtual AsciiString getProviderName(UnsignedInt providerNum) const override { return ""; }
-	virtual UnsignedInt getProviderIndex(AsciiString providerName) const override { return 0; }
-	virtual void selectProvider(UnsignedInt providerNdx) override {}
-	virtual void unselectProvider() override {}
-	virtual UnsignedInt getSelectedProvider() const override { return 0; }
-	virtual void setSpeakerType(UnsignedInt speakerType) override {}
-	virtual UnsignedInt getSpeakerType() override { return 0; }
-	virtual UnsignedInt getNum2DSamples() const override { return 0; }
-	virtual UnsignedInt getNum3DSamples() const override { return 0; }
-	virtual UnsignedInt getNumStreams() const override { return 0; }
-	virtual Bool doesViolateLimit(AudioEventRTS* event) const override { return false; }
-	virtual Bool isPlayingLowerPriority(AudioEventRTS* event) const override { return false; }
-	virtual Bool isPlayingAlready(AudioEventRTS* event) const override { return false; }
-	virtual Bool isObjectPlayingVoice(UnsignedInt objID) const override { return false; }
-	virtual void adjustVolumeOfPlayingAudio(AsciiString eventName, Real newVolume) override {}
-	virtual void removePlayingAudio(AsciiString eventName) override {}
-	virtual void removeAllDisabledAudio() override {}
-	virtual Bool has3DSensitiveStreamsPlaying() const override { return false; }
-	virtual void* getHandleForBink() override { return nullptr; }
-	virtual void releaseHandleForBink() override {}
-	virtual void friend_forcePlayAudioEventRTS(const AudioEventRTS* eventToPlay) override {}
-	virtual void setPreferredProvider(AsciiString providerNdx) override {}
-	virtual void setPreferredSpeaker(AsciiString speakerType) override {}
-	virtual Real getFileLengthMS(AsciiString strToLoad) const override { return -1; }
-	virtual void closeAnySamplesUsingFile(const void* fileToClose) override {}
-	virtual void setDeviceListenerPosition() override {}
-};
-
-
 extern AudioManager *TheAudio;