fix ci again

.circleci/config.yml

@@ -73,7 +73,7 @@ jobs:
           command: |
             mkdir -p ~/deps
             cd ~/deps
-            curl https://openal-soft.org/openal-releases/openal-soft-1.22.2.tar.bz2 | tar xz
+            curl -k https://openal-soft.org/openal-releases/openal-soft-1.22.2.tar.bz2 | tar xz
             cd openal-soft-1.22.2
             if [ ! -f /usr/local/lib/libopenal.1.22.2.dylib ]; then
               cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DALSOFT_BACKEND_SNDIO=NO -DALSOFT_BACKEND_PORTAUDIO=NO -DALSOFT_BACKEND_WAVE=NO -DALSOFT_UTILS=NO -DALSOFT_EXAMPLES=NO -DCMAKE_MACOSX_RPATH=TRUE
@@ -331,7 +331,7 @@ jobs:
             name: Install dependencies
             command: |
               curl -fsSL --retry 3 --retry-delay 5 -o /tmp/sdl.zip https://www.libsdl.org/release/SDL2-devel-2.0.5-VC.zip
-              curl -fsSL --retry 3 --retry-delay 5 -o /tmp/openal.zip https://openal-soft.org/openal-binaries/openal-soft-1.17.2-bin.zip
+              curl -fsSLk --retry 3 --retry-delay 5 -o /tmp/openal.zip https://openal-soft.org/openal-binaries/openal-soft-1.17.2-bin.zip
               curl -fsSL --retry 3 --retry-delay 5 -o /tmp/ffmpeg.zip https://github.com/HaxeFoundation/hashlink/files/5648056/ffmpeg-3.4.2-win64-dev.zip
               cd /tmp
               7z x /tmp/sdl.zip    -oinclude; mv /tmp/include/SDL2*   /tmp/include/sdl
@@ -387,7 +387,7 @@ jobs:
               cd ~/deps
               git clone https://github.com/RandomityGuy/hxDatachannel
               cd hxDatachannel/cpp
-              "/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHASHLINK_LIBRARY_DIR="~/deps/hashlink/x64/Release" -DHASHLINK_INCLUDE_DIR="../../hashlink/src"
+              "/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHASHLINK_LIBRARY_DIR="~/deps/hashlink/x64/Release" -DHASHLINK_INCLUDE_DIR="../../hashlink/src" -DCMAKE_POLICY_VERSION_MINIMUM=3.5
               "/c/Program Files/CMake/bin/cmake" --build build --config Release -j4
               mv ~/deps/hxDatachannel/cpp/build/Release/datachannel.hdll ~/deps/hashlink/x64/Release
               mv ~/deps/hxDatachannel/cpp/build/Release/datachannel.lib ~/deps/hashlink/x64/Release
@@ -582,7 +582,13 @@ jobs:
                 exit 1
               fi
               cd ~/project
-              "C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool.exe" sign /fd sha256 /a /f key.pfx /p $UWP_PWD MBHaxe-Ultra-UWP.msix
+
+        - run:
+            name: Sign it
+            shell: powershell.exe
+            command: |
+              cd ~/project
+              & "C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool.exe" sign /fd sha256 /f key.pfx /p $UWP_PWD MBHaxe-Ultra-UWP.msix
 
         - run:
             name: Upload to Artifact Storage

src/MarbleGame.hx

@@ -41,7 +41,7 @@ class MarbleGame {
 	static var canvas:Canvas;
 	static var instance:MarbleGame;
 
-	static var currentVersion = "1.2.2";
+	static var currentVersion = "1.2.3";
 
 	var world:MarbleWorld;
 	var previewWorld:PreviewWorld;

src/net/Net.hx

@@ -524,7 +524,6 @@ class Net {
 			serverInfo.players++;
 		}
 
-		serverInfo.players++;
 		MasterServerClient.instance.sendServerInfo(serverInfo); // notify the server of the new player
 
 		if (MarbleGame.canvas.content is MultiplayerLevelSelectGui) {

uwp/Package.appxmanifest

@@ -10,12 +10,13 @@
   <Identity
     Name="mbhaxe"
     Publisher="CN=dlw"
-    Version="1.2.2.0" />
+    Version="1.2.3.0" />
 
-  <mp:PhoneIdentity PhoneProductId="5a528e66-e0fc-43fb-b377-ce0b1bb0d3e8" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="5a528e66-e0fc-43fb-b377-ce0b1bb0d3e8"
+    PhonePublisherId="00000000-0000-0000-0000-000000000000" />
 
   <Properties>
-    <DisplayName>MBHaxe</DisplayName>
+    <DisplayName>Marble Blast Ultra</DisplayName>
     <PublisherDisplayName>danwo</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -25,7 +26,7 @@
   </Dependencies>
 
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="x-generate" />
   </Resources>
 
   <Applications>
@@ -33,26 +34,27 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="uwp.App">
       <uap:VisualElements
-        DisplayName="MBHaxe"
+        DisplayName="Marble Blast Ultra"
         Square150x150Logo="Assets\Square150x150Logo.png"
         Square44x44Logo="Assets\Square44x44Logo.png"
         Description="Port of mbhaxe for UWP"
         BackgroundColor="transparent">
-	<!--<uap:SplashScreen Image="Assets\SplashScreen.png" /> -->
-        <uap:DefaultTile/>
+        <!--<uap:SplashScreen
+        Image="Assets\SplashScreen.png" /> -->
+        <uap:DefaultTile />
       </uap:VisualElements>
     </Application>
   </Applications>
 
   <Capabilities>
-    <rescap:Capability Name="runFullTrust"/>
+    <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="broadFileSystemAccess" />
     <rescap:Capability Name="expandedResources" />
     <Capability Name="internetClient" />
-    <uap:Capability Name="removableStorage"/>
-    <Capability Name="codeGeneration"/>
-    <Capability Name="internetClientServer"/>
-    <Capability Name="privateNetworkClientServer"/>
+    <uap:Capability Name="removableStorage" />
+    <Capability Name="codeGeneration" />
+    <Capability Name="internetClientServer" />
+    <Capability Name="privateNetworkClientServer" />
 
   </Capabilities>
-</Package>
+</Package>