bump version number

fallahn · Sep 9, 2024 · 33f41d8 · 33f41d8
1 parent 51ffba9
commit 33f41d8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/crogine.sln b/crogine.sln
@@ -703,8 +703,8 @@ Global
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|ARM.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|ARM64.ActiveCfg = Release|Win32
-		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.ActiveCfg = ReleaseGNS|x64
-		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.Build.0 = ReleaseGNS|x64
+		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.ActiveCfg = Release|x64
+		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x64.Build.0 = Release|x64
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x86.ActiveCfg = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release|x86.Build.0 = Release|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Release-asan|Any CPU.ActiveCfg = Release-asan|Win32

diff --git a/libsocial/include/Social.hpp b/libsocial/include/Social.hpp
@@ -48,13 +48,14 @@ source distribution.
 //(player avatar data format changed 1110 -> 1120)
 //(ball started sending wind effect 1120 -> 1124)
 //(added night mode/weather 1141 -> 1150)
-//(player avatar data format changed 1153->1160)
-//(player avatar data format changed 1170->1180)
-static constexpr std::uint16_t CURRENT_VER = 1180;
+//(player avatar data format changed 1153 -> 1160)
+//(player avatar data format changed 1170 -> 1180)
+//(course data changed 1180 -> 1181)
+static constexpr std::uint16_t CURRENT_VER = 1181;
 #ifdef __APPLE__
-static const std::string StringVer("1.18.0 (macOS beta)");
+static const std::string StringVer("1.18.1 (macOS beta)");
 #else
-static const std::string StringVer("1.18.0");
+static const std::string StringVer("1.18.1");
 #endif
 
 struct HallEntry final

diff --git a/samples/golf/golf.aps b/samples/golf/golf.aps
diff --git a/samples/golf/golf.rc b/samples/golf/golf.rc
@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "icon.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,0,0
- PRODUCTVERSION 1,18,0,0
+ FILEVERSION 1,18,1,0
+ PRODUCTVERSION 1,18,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Trederia"
             VALUE "FileDescription", "Super Video Golf"
-            VALUE "FileVersion", "1.18.0.0"
+            VALUE "FileVersion", "1.18.1.0"
             VALUE "InternalName", "golf.exe"
             VALUE "LegalCopyright", "Copyright (C) 2024 Trederia Games"
             VALUE "OriginalFilename", "golf.exe"
             VALUE "ProductName", "Super Video Golf"
-            VALUE "ProductVersion", "1.18.0.0"
+            VALUE "ProductVersion", "1.18.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/samples/scratchpad/src/MyApp.cpp b/samples/scratchpad/src/MyApp.cpp
@@ -182,7 +182,8 @@ bool MyApp::initialise()
     m_stateStack.registerState<PseutheMenuState>(States::ScratchPad::PseutheMenu);
 
 #ifdef CRO_DEBUG_
-    m_stateStack.pushState(States::ScratchPad::PseutheBackground);
+    m_stateStack.pushState(States::ScratchPad::BatCat);
+    //m_stateStack.pushState(States::ScratchPad::PseutheBackground);
     //m_stateStack.pushState(States::ScratchPad::MainMenu);
 #else
     //m_stateStack.pushState(States::ScratchPad::MainMenu);

diff --git a/samples/scratchpad/src/batcat/BatcatState.cpp b/samples/scratchpad/src/batcat/BatcatState.cpp
@@ -92,7 +92,7 @@ source distribution.
 
 namespace
 {
-    cro::UISystem* uiSystem = nullptr;
+    //cro::UISystem* uiSystem = nullptr;
     cro::CommandSystem* commandSystem = nullptr;
 
     std::size_t queryCount = 0;
@@ -187,7 +187,7 @@ bool BatcatState::handleEvent(const cro::Event& evt)
         }
     }
 
-    uiSystem->handleEvent(evt);
+    //uiSystem->handleEvent(evt);
     m_scene.forwardEvent(evt);
     return true;
 }
@@ -227,7 +227,7 @@ void BatcatState::addSystems()
 
     m_scene.addDirector<PlayerDirector>();
 
-    uiSystem = m_overlayScene.addSystem<cro::UISystem>(mb);
+    //uiSystem = m_overlayScene.addSystem<cro::UISystem>(mb);
     m_overlayScene.addSystem<cro::CameraSystem>(mb);
     m_overlayScene.addSystem<cro::SpriteSystem2D>(mb);
     m_overlayScene.addSystem<cro::TextSystem>(mb);