v1.4.1

.github/workflows/build.yml

@@ -11,49 +11,30 @@ jobs:
   build-launcher:
     runs-on: windows-2022
     steps:
-      - name: Setup bundled plugins
-        uses: actions/checkout@v2
-        with:
-          repository: R2Northstar/NorthstarDiscordRPC
-          path: discord-plugin
-      - name: Checkout launcher repository
+      - name: Checkout
         uses: actions/checkout@v2
         with:
           repository: R2Northstar/NorthstarLauncher
           ref: ${{ env.NORTHSTAR_VERSION }}
-          path: northstar-launcher
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1.1
       - name: Setup resource file version
         shell: bash
-        working-directory: northstar-launcher
         run: |
           sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' LauncherInjector/resources.rc
           FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | tr -d '[:alpha:]')
-          sed -i "s/0,0,0,1/${FILEVERSION}/g" LauncherInjector/resources.rc
+          sed -i "s/0,0,0,0/${FILEVERSION}/g" LauncherInjector/resources.rc
       - name: Build
-        working-directory: northstar-launcher 
-        run: |
-          cp -r ../discord-plugin/*Discord* .
-          msbuild /p:Configuration=Release R2Northstar.sln
-          msbuild /p:Configuration=Release NorthstarDiscordRPC.sln
-      - name: Upload launcher build as artifact
+        run: msbuild /p:Configuration=Release
+      - name: Upload Build Artifact
         uses: actions/upload-artifact@v2
         with:
           name: northstar-launcher
           path: |
-            northstar-launcher/x64/Release/Northstar.dll
-            northstar-launcher/x64/Release/wsock32.dll
-            northstar-launcher/x64/Release/NorthstarLauncher.exe
-            northstar-launcher/x64/Release/discord_game_sdk.dll
-            northstar-launcher/x64/Release/DiscordRPC.dll
-            northstar-launcher/x64/Release/*.txt
-      - name: Upload debug build artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: launcher-debug-files
-          path: |
-            northstar-launcher/x64/Release/*.pdb
+            x64/Release/Northstar.dll
+            x64/Release/wsock32.dll
+            x64/Release/NorthstarLauncher.exe
+            x64/Release/*.txt
 
   build-northstar:
     needs: build-launcher
@@ -64,15 +45,12 @@ jobs:
         with:
           name: northstar-launcher
           path: northstar-launcher
-      - name: Download compiled stubs
-        run:
-          wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
-      - name: Checkout release files
+      - name: Checkout
         uses: actions/checkout@v2
         with:
           ref: ${{ env.NORTHSTAR_VERSION }}
           path: northstar
-      - name: Checkout core mods
+      - name: Checkout
         uses: actions/checkout@v2
         with:
           repository: R2Northstar/NorthstarMods
@@ -84,22 +62,13 @@ jobs:
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Client/mod.json) > northstar-mods/Northstar.Client/mod.json
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Custom/mod.json) > northstar-mods/Northstar.Custom/mod.json
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.CustomServers/mod.json) > northstar-mods/Northstar.CustomServers/mod.json
-      - name: Generate md5sum file
-        working-directory: northstar-mods
+      - name: Download repositories
         run: |
-          echo -e "# Check with 'md5sum -c md5sum.txt' at the root of mods folder\n" > md5sum.txt
-          git ls-tree -r $NORTHSTAR_VERSION --name-only | xargs -L1 md5sum >> md5sum.txt
-      - name: Make folder structure
-        run: |
-          mv -v northstar/release/* northstar/.
+          mv northstar/release/* northstar/.
           mkdir -p northstar/R2Northstar/mods
-          mkdir -p northstar/R2Northstar/plugins
           mkdir -p northstar/bin/x64_retail
-          mv -v northstar-launcher/DiscordRPC.dll northstar/R2Northstar/plugins
-          mv -v northstar-launcher/discord_game_sdk.dll northstar
-          mv -v northstar-launcher/wsock32.dll northstar/bin/x64_retail
-          unzip NorthstarStubs.zip -d northstar/bin/x64_dedi
-          mv -v northstar-launcher/* northstar
+          mv northstar-launcher/wsock32.dll northstar/bin/x64_retail
+          mv northstar-launcher/* northstar
           rsync -avr --exclude="Northstar.Coop" --exclude=".git*" northstar-mods/. northstar/R2Northstar/mods
       - name: Cleanup
         run: |

README.md

@@ -15,19 +15,15 @@ Northstar is a modding framework client that allows users to host their own Tita
 Northstar's development is split into 4 repositories:
 
 1. [NorthstarLauncher](https://github.com/R2Northstar/NorthstarLauncher) (Code for the C++ hook DLL)
-1. [NorthstarMods](https://github.com/R2Northstar/NorthstarMods) (Code for the squirrel mods responsible for server gamelogic recreation and custom content)
-1. [NorthstarMasterServer](https://github.com/R2Northstar/NorthstarMasterServer) (Responsible for server browser, authentication and persistence)
-1. [NorthstarStubs](https://github.com/R2Northstar/NorthstarStubs) (D3D11 and GFSDK stubs for the Northstar dedicated server)
-
-The documentation is split into two repositories:
-1. [NorthstarWiki](https://github.com/R2Northstar/NorthstarWiki) (Wiki covering installation, hosting and configuration of Northstar)
-1. [ModdingDocs](https://github.com/R2Northstar/ModdingDocs) (Guides and tutorials on how to mod using Northstar)
+2. [NorthstarMods](https://github.com/R2Northstar/NorthstarMods) (Code for the squirrel mods responsible for server gamelogic recreation and custom content)
+3. [NorthstarMasterServer](https://github.com/R2Northstar/NorthstarMasterServer) (Responsible for server browser, authentication and persistence)
+4. [NorthstarWiki](https://github.com/R2Northstar/NorthstarWiki) (Documentation for Northstar)
 
 ## Special Thanks
   
 Thanks to everyone that's put up with me and helped out with this project, it's been a fun passion project I've had throughout 2021 so releasing it is pretty cathartic. Specifically: 
 
 - Thanks to the Icepick developers for making the Icepick, I initially forked it for earlier versions of Northstar and it was a great base to experiment with stuff on before moving to the custom launcher.
-- Thanks to everyone on R5R team for giving me advice on some later parts of development.  
-- Thanks to everyone in the testing server for putting up with me and helping find bugs.  
-- Thanks to everyone else that's helped, gave advice, all that.
+- Thanks to everyone on R5R team for giving me advice on some later parts of development  
+- Thanks to everyone in the testing server for putting up with me and helping find bugs  
+- Thanks to everyone else that's helped, gave advice, all that

release/r2ds.bat

@@ -0,0 +1 @@
+NorthstarLauncher.exe -dedicated -multiple