Merge pull request #45 from fortressforever-2013/dev

v3.0.0-alpha1

.gitattributes

@@ -49,3 +49,12 @@ ccache binary
 
 gtest_output_test_golden_lin.txt binary
 mod_*_english.txt binary
+
+# These filetypes should be recognized as VDF, not ReScript
+*.res linguist-language=vdf
+**/*.res linguist-detectable=true
+
+# Do not export these files on download
+.gitattributes export-ignore
+.gitignore export-ignore
+.github export-ignore

.github/workflows/FF_Linux.yml

@@ -1,27 +1,30 @@
 name: FF_Linux
 
 on:
+  pull_request:
+    branches:
+      - main
+
   workflow_dispatch:
 
 jobs:
   build:
     runs-on:
       ubuntu-latest
+    container:
+      image: registry.gitlab.steamos.cloud/steamrt/sniper/sdk
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Configure dependencies
-        shell: bash
-        run: sudo apt update && sudo apt install -y g++-9-multilib gcc-9-multilib
 
       - name: Create project
         run: cd mp/src;devtools/bin/vpc /ff +game /mksln Game_FF
 
       - name: Build project
         env:
-          CC: gcc-9
-          CXX: g++-9
+          CC: gcc-10
+          CXX: g++-10
         run: cd mp/src;make -f Game_FF.mak
 
       - name: Pack

.github/workflows/FF_Windows.yml

@@ -1,6 +1,10 @@
 name: FF_Windows
 
 on:
+  pull_request:
+    branches:
+      - main
+
   workflow_dispatch:
 
 jobs:

README.md

@@ -5,9 +5,9 @@
 # Fortress Forever 2013
 This is an actively developed port of the game [Fortress Forever](https://store.steampowered.com/app/253530/Fortress_Forever/) on Source SDK 2013 using [@Nbc66](https://github.com/Nbc66)'s [SDK 2013 Community Edition](https://github.com/Nbc66/source-sdk-2013-ce) repository.
 
-Fortress Forever is based upon Source SDK 2006, the original repository of the game could be found [here](https://github.com/fortressforever/fortressforever).
+Fortress Forever is based upon Source SDK 2006, the original repository of the game can be found [here](https://github.com/fortressforever/fortressforever).
 
-**Note:** This repository contains the **source code** of the game and **not the game files**, The repository containing the game files could be found [here](https://github.com/fortressforever-2013/FortressForever2013).
+**Note:** This repository contains the **source code** of the game and **not the game files**, The repository containing the game files are found [here](https://github.com/fortressforever-2013/fortressforever).
 
 # Build Instructions
 
@@ -22,7 +22,7 @@ Fortress Forever is based upon Source SDK 2006, the original repository of the g
   2. Open the generated `Game_FF.sln` or `Everything_FF.sln` using Visual Studio 2022.
   3. Switch the current configuration from `Debug` to `Release`.
   4. Run `Build Solution`.
-      * The compiled binaries would automatically be copied to `mp\game\FortressForever2013`.
+      * The compiled binaries should automatically be copied to `mp\game\FortressForever2013`.
 
 - ## Linux
   **Note:** These instructions were only tested on Ubuntu 22.04 (Jammy Jellyfish), but should work for most Debian-based Linux distributions.
@@ -41,8 +41,7 @@ Fortress Forever is based upon Source SDK 2006, the original repository of the g
       * The compiled binaries would automatically be copied to `mp/game/FortressForever2013`.
 
 # External content
-
 - ### [Coplay](https://github.com/CoaXioN-Games/coplay)
 - ### [Discord-RPC](https://github.com/discord/discord-rpc)
 - ### [Lua (5.1.5)](https://www.lua.org/)
-- ### [LuaBridge3](https://github.com/kunitoki/LuaBridge3)
+- ### [LuaBridge3](https://github.com/kunitoki/LuaBridge3)