From 3a9176e4cdaa60e01c26b411630906b17ead3faa Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 17:54:47 +0000
Subject: [PATCH 01/33] Created Inital workflow

---
 .github/workflows/build-on-pr.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/build-on-pr.yml

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
new file mode 100644
index 0000000..0cc0ab2
--- /dev/null
+++ b/.github/workflows/build-on-pr.yml
@@ -0,0 +1,26 @@
+name: Build on Pull Request
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Bootstrap
+        run: ./bootstrap-vcpkg.sh
+
+      - name: Build
+        run: |
+          mkdir build
+          cd build
+          cmake ..
+          make
\ No newline at end of file

From ca32120f46058dab1b72aea3d347857ca4df3b54 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 17:59:33 +0000
Subject: [PATCH 02/33] renamed main branch in workflow

---
 .github/workflows/build-on-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 0cc0ab2..fa4786d 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -3,7 +3,7 @@ name: Build on Pull Request
 on:
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
   build:

From 8f9b30ab14c5ecd0b6497d0b3e8559ed81ce2a5b Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 18:02:09 +0000
Subject: [PATCH 03/33] removed bootstrap step

---
 .github/workflows/build-on-pr.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index fa4786d..d02998a 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -15,9 +15,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Bootstrap
-        run: ./bootstrap-vcpkg.sh
-
       - name: Build
         run: |
           mkdir build

From 591fc86905f33f19c49e1c701f7071175f4afdbc Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 18:05:24 +0000
Subject: [PATCH 04/33] Changes based on compiling source info

---
 .github/workflows/build-on-pr.yml | 42 +++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index d02998a..ed2f672 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -1,23 +1,49 @@
-name: Build on Pull Request
+name: Build HaloCEVR
 
 on:
+  push:
+    branches:
+      - master
   pull_request:
     branches:
       - master
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1
+
+      - name: Setup Visual Studio
+        uses: microsoft/setup-visualstudio@v1
         with:
-          fetch-depth: 0
+          vs-version: 2022
+
+      - name: Install vcpkg dependencies
+        run: |
+          .\vcpkg\bootstrap-vcpkg.bat
+          .\vcpkg\vcpkg.exe install
+
+      - name: Build MinHook
+        run: |
+          git clone https://github.com/TsudaKageyu/minhook
+          cd minhook/build/VC17
+          msbuild MinHook.sln /p:Configuration=Release /p:Platform=x86
+
+      - name: Copy MinHook library
+        run: |
+          copy minhook\build\VC17\Release\libMinHook.x86.lib HaloCEVR-master\ThirdParty\MinHook\lib\libMinHook.x86.lib
+
+      - name: Build HaloCEVR
+        run: |
+          msbuild HaloCEVR.sln /p:Configuration=Release /p:Platform=x86
 
-      - name: Build
+      - name: Package Release
         run: |
-          mkdir build
-          cd build
-          cmake ..
-          make
\ No newline at end of file
+          .\makerelease.bat
+          # Ensure openvr_api.dll is in the release folder or handle it manually
\ No newline at end of file

From 768640d3bce20c24bd1e827410fe40f0600d45d3 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 18:07:26 +0000
Subject: [PATCH 05/33] Changes

---
 .github/workflows/build-on-pr.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index ed2f672..fc636cf 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -16,15 +16,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1
-
-      - name: Setup Visual Studio
-        uses: microsoft/setup-visualstudio@v1
-        with:
-          vs-version: 2022
-
-      - name: Install vcpkg dependencies
+      - name: Setup vcpkg
         run: |
           .\vcpkg\bootstrap-vcpkg.bat
           .\vcpkg\vcpkg.exe install
@@ -32,7 +24,7 @@ jobs:
       - name: Build MinHook
         run: |
           git clone https://github.com/TsudaKageyu/minhook
-          cd minhook/build/VC17
+          cd minhook\build\VC17
           msbuild MinHook.sln /p:Configuration=Release /p:Platform=x86
 
       - name: Copy MinHook library

From 24386d3d707ddd2113e34578ef4d16f8d92ad17d Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:07:45 +0000
Subject: [PATCH 06/33] more changes

---
 .github/workflows/build-on-pr.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index fc636cf..a000233 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -16,10 +16,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: List vcpkg directory
+        run: dir .\vcpkg
+
       - name: Setup vcpkg
-        run: |
-          .\vcpkg\bootstrap-vcpkg.bat
-          .\vcpkg\vcpkg.exe install
+        working-directory: ./vcpkg
+        run: bootstrap-vcpkg.bat
 
       - name: Build MinHook
         run: |

From edae9ff5d72a810cce038293b0a6a0b2a81340b6 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:12:31 +0000
Subject: [PATCH 07/33] changes

---
 .github/workflows/build-on-pr.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index a000233..34b9991 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -15,9 +15,12 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        
+      - name: List root directory
+        run: dir .
 
       - name: List vcpkg directory
-        run: dir .\vcpkg
+        run: dir ./vcpkg
 
       - name: Setup vcpkg
         working-directory: ./vcpkg

From 0deadd6abdb2637926e39f019c63ee36b36e0202 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:14:36 +0000
Subject: [PATCH 08/33] trying something different

---
 .github/workflows/build-on-pr.yml | 53 ++++++++++++++-----------------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 34b9991..0888e95 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -1,46 +1,41 @@
-name: Build HaloCEVR
+name: Build on Pull Request
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        
-      - name: List root directory
-        run: dir .
-
-      - name: List vcpkg directory
-        run: dir ./vcpkg
-
-      - name: Setup vcpkg
-        working-directory: ./vcpkg
-        run: bootstrap-vcpkg.bat
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-      - name: Build MinHook
+      - name: Set up dependencies
         run: |
-          git clone https://github.com/TsudaKageyu/minhook
-          cd minhook\build\VC17
-          msbuild MinHook.sln /p:Configuration=Release /p:Platform=x86
+          sudo apt-get update
+          sudo apt-get install -y build-essential cmake
 
-      - name: Copy MinHook library
+      - name: Configure project
         run: |
-          copy minhook\build\VC17\Release\libMinHook.x86.lib HaloCEVR-master\ThirdParty\MinHook\lib\libMinHook.x86.lib
+          mkdir -p build
+          cd build
+          cmake ..
 
-      - name: Build HaloCEVR
+      - name: Build project
         run: |
-          msbuild HaloCEVR.sln /p:Configuration=Release /p:Platform=x86
+          cd build
+          make
 
-      - name: Package Release
+      - name: Run tests
         run: |
-          .\makerelease.bat
-          # Ensure openvr_api.dll is in the release folder or handle it manually
\ No newline at end of file
+          cd build
+          ctest --output-on-failure
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts
+          path: build/

From 10648e85ed0369f0c9b4e2b400bd47c7b096cc5d Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:16:52 +0000
Subject: [PATCH 09/33] fixed name

---
 .github/workflows/build-on-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 0888e95..e559863 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -3,7 +3,7 @@ name: Build on Pull Request
 on:
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
   build:

From 5217ec799b1bfe6a871a1dde2174bab066916a7b Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:21:11 +0000
Subject: [PATCH 10/33] test

---
 .github/workflows/build-on-pr.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index e559863..3f6bc6f 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -3,39 +3,36 @@ name: Build on Pull Request
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
+      # Step 1: Checkout repository
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      # Step 2: Set up dependencies
       - name: Set up dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential cmake
-
-      - name: Configure project
-        run: |
-          mkdir -p build
-          cd build
-          cmake ..
+          sudo apt-get install -y build-essential
 
+      # Step 3: Build project
       - name: Build project
         run: |
-          cd build
           make
 
+      # Step 4: Run tests
       - name: Run tests
         run: |
-          cd build
-          ctest --output-on-failure
+          make test
 
+      # Step 5: Upload build artifacts
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
           name: build-artifacts
-          path: build/
+          path: ./ # Adjust path to match where your build outputs are located

From fb50b524bb11da6b81219ece240549e787dc1736 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:21:46 +0000
Subject: [PATCH 11/33] name

---
 .github/workflows/build-on-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 3f6bc6f..8a8f2f2 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -3,7 +3,7 @@ name: Build on Pull Request
 on:
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
   build:

From cc2321b16be2ad4ba2d8814889ab740645101969 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:24:50 +0000
Subject: [PATCH 12/33] fix?

---
 .github/workflows/build-on-pr.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 8a8f2f2..557c1c9 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -7,32 +7,28 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
       # Step 1: Checkout repository
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      # Step 2: Set up dependencies
-      - name: Set up dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential
+      # Step 2: Set up Visual Studio
+      - name: Set up Visual Studio
+        uses: microsoft/setup-msbuild@v1
 
-      # Step 3: Build project
-      - name: Build project
+      # Step 3: Build the project
+      - name: Build HaloCEVR
         run: |
-          make
+          msbuild HaloCEVR.sln /p:Configuration=Release /p:Platform=x86
 
-      # Step 4: Run tests
-      - name: Run tests
-        run: |
-          make test
+      # Step 4: Run tests (if applicable)
+      # Add test steps here if you have any tests to run
 
       # Step 5: Upload build artifacts
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
           name: build-artifacts
-          path: ./ # Adjust path to match where your build outputs are located
+          path: HaloCEVR/Release
\ No newline at end of file

From 1d048b45b27bda9566adb154c2caa6d81c2a70fb Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:27:45 +0000
Subject: [PATCH 13/33] fix minhooks?

---
 .github/workflows/build-on-pr.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 557c1c9..46c2285 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -17,6 +17,8 @@ jobs:
       # Step 2: Set up Visual Studio
       - name: Set up Visual Studio
         uses: microsoft/setup-msbuild@v1
+        with:
+          vs-version: 2019 # Ensure this matches the version used to build MinHook
 
       # Step 3: Build the project
       - name: Build HaloCEVR

From b4e9a014da3f5da64401e977dea7c63ff2fb94c5 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:29:19 +0000
Subject: [PATCH 14/33] fix issue

---
 .github/workflows/build-on-pr.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 46c2285..557c1c9 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -17,8 +17,6 @@ jobs:
       # Step 2: Set up Visual Studio
       - name: Set up Visual Studio
         uses: microsoft/setup-msbuild@v1
-        with:
-          vs-version: 2019 # Ensure this matches the version used to build MinHook
 
       # Step 3: Build the project
       - name: Build HaloCEVR

From 56943fba541346334b3a721f575d90e484cda896 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:30:41 +0000
Subject: [PATCH 15/33] fix?

---
 .github/workflows/build-on-pr.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 557c1c9..a7a099f 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -18,10 +18,10 @@ jobs:
       - name: Set up Visual Studio
         uses: microsoft/setup-msbuild@v1
 
-      # Step 3: Build the project
+      # Step 3: Build the project with Whole Program Optimization disabled
       - name: Build HaloCEVR
         run: |
-          msbuild HaloCEVR.sln /p:Configuration=Release /p:Platform=x86
+          msbuild HaloCEVR.sln /p:Configuration=Release /p:Platform=x86 /p:WholeProgramOptimization=false
 
       # Step 4: Run tests (if applicable)
       # Add test steps here if you have any tests to run

From 859445eae778df9f1a7a7775a588905988cbae45 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:35:10 +0000
Subject: [PATCH 16/33] fix issue with moving files to halo dir

---
 .github/workflows/build-on-pr.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index a7a099f..dd9a192 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -18,15 +18,12 @@ jobs:
       - name: Set up Visual Studio
         uses: microsoft/setup-msbuild@v1
 
-      # Step 3: Build the project with Whole Program Optimization disabled
+      # Step 3: Build the project with PostBuildEvent disabled
       - name: Build HaloCEVR
         run: |
-          msbuild HaloCEVR.sln /p:Configuration=Release /p:Platform=x86 /p:WholeProgramOptimization=false
+          msbuild HaloCEVR.sln /p:Configuration=Release /p:Platform=x86 /p:WholeProgramOptimization=false /p:PostBuildEvent=""
 
-      # Step 4: Run tests (if applicable)
-      # Add test steps here if you have any tests to run
-
-      # Step 5: Upload build artifacts
+      # Step 4: Upload build artifacts
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:

From f36f94bdb4572d1da1599cfb689f4dd129034f01 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 20:41:20 +0000
Subject: [PATCH 17/33] testing

---
 .github/workflows/build-on-pr.yml |  4 +-
 HaloCEVR.sln                      |  6 +++
 HaloCEVR/HaloCEVR.vcxproj         | 80 ++++++++++++++++++++++++++++++-
 HaloCEVR/HaloCEVR.vcxproj.filters |  1 +
 4 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index dd9a192..ea674f8 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -18,10 +18,10 @@ jobs:
       - name: Set up Visual Studio
         uses: microsoft/setup-msbuild@v1
 
-      # Step 3: Build the project with PostBuildEvent disabled
+      # Step 3: Build the project using the CI-specific configuration
       - name: Build HaloCEVR
         run: |
-          msbuild HaloCEVR.sln /p:Configuration=Release /p:Platform=x86 /p:WholeProgramOptimization=false /p:PostBuildEvent=""
+          msbuild HaloCEVR.sln /p:Configuration=CI_Release /p:Platform=x86 /p:WholeProgramOptimization=false
 
       # Step 4: Upload build artifacts
       - name: Upload build artifacts
diff --git a/HaloCEVR.sln b/HaloCEVR.sln
index 342ef7d..9fe9283 100644
--- a/HaloCEVR.sln
+++ b/HaloCEVR.sln
@@ -7,12 +7,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HaloCEVR", "HaloCEVR\HaloCE
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		CI_Release|x64 = CI_Release|x64
+		CI_Release|x86 = CI_Release|x86
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.CI_Release|x64.ActiveCfg = CI_Release|x64
+		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.CI_Release|x64.Build.0 = CI_Release|x64
+		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.CI_Release|x86.ActiveCfg = CI_Release|Win32
+		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.CI_Release|x86.Build.0 = CI_Release|Win32
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Debug|x64.ActiveCfg = Debug|x64
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Debug|x64.Build.0 = Debug|x64
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Debug|x86.ActiveCfg = Debug|Win32
diff --git a/HaloCEVR/HaloCEVR.vcxproj b/HaloCEVR/HaloCEVR.vcxproj
index 62787ad..8f60af0 100644
--- a/HaloCEVR/HaloCEVR.vcxproj
+++ b/HaloCEVR/HaloCEVR.vcxproj
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="CI_Release|Win32">
+      <Configuration>CI_Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="CI_Release|x64">
+      <Configuration>CI_Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -39,6 +47,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -52,6 +67,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -63,12 +85,18 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ThirdParty\MinHook\include</IncludePath>
@@ -80,6 +108,11 @@
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)ThirdParty\MinHook\lib;$(SolutionDir)ThirdParty\OpenVR\lib</LibraryPath>
     <TargetName>d3d9</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'">
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ThirdParty\MinHook\include</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)ThirdParty\MinHook\lib;$(SolutionDir)ThirdParty\OpenVR\lib</LibraryPath>
+    <TargetName>d3d9</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -113,6 +146,31 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;HALOCEVR_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -125,7 +183,7 @@
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /D /Y "$(TargetDir)d3d9.dll" "E:\Halo"</Command>
+      <Command>xcopy /D /Y "$(TargetDir)d3d9.dll" "C:\Games\Halo"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -162,6 +220,25 @@
       <EnableUAC>false</EnableUAC>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;HALOCEVR_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Helpers\CmdLineArgs.cpp" />
     <ClCompile Include="Helpers\Cutscene.cpp" />
@@ -218,6 +295,7 @@
     <ClInclude Include="VR\VREmulator.h" />
     <ClInclude Include="VR\IVR.h" />
     <ClInclude Include="WeaponHandler.h" />
+    <ClInclude Include="WeaponHapticsConfig.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />
diff --git a/HaloCEVR/HaloCEVR.vcxproj.filters b/HaloCEVR/HaloCEVR.vcxproj.filters
index 925fbce..9ce9caa 100644
--- a/HaloCEVR/HaloCEVR.vcxproj.filters
+++ b/HaloCEVR/HaloCEVR.vcxproj.filters
@@ -180,5 +180,6 @@
   <ItemGroup>
     <None Include="VR\actions.json" />
     <None Include="cpp.hint" />
+    <None Include="VR\actions.json" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 49953f30d26c421501908e885c281d18774c6ce8 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 22:16:28 +0000
Subject: [PATCH 18/33] updated ci build

---
 HaloCEVR/HaloCEVR.vcxproj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/HaloCEVR/HaloCEVR.vcxproj b/HaloCEVR/HaloCEVR.vcxproj
index 8f60af0..4e4df10 100644
--- a/HaloCEVR/HaloCEVR.vcxproj
+++ b/HaloCEVR/HaloCEVR.vcxproj
@@ -158,6 +158,9 @@
       </ModuleDefinitionFile>
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
+    <PostBuildEvent>
+      <Command>xcopy /D /Y "$(TargetDir)d3d9.dll" "C:\Games\Halo"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'">
     <ClCompile>
@@ -183,7 +186,8 @@
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /D /Y "$(TargetDir)d3d9.dll" "C:\Games\Halo"</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

From 6d4340dd0a76d5cb7775830234316061a5ccf421 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 22:30:30 +0000
Subject: [PATCH 19/33] updated release

---
 .github/workflows/build-on-pr.yml | 2 +-
 .gitignore                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index ea674f8..4eb9610 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -28,4 +28,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: build-artifacts
-          path: HaloCEVR/Release
\ No newline at end of file
+          path: HaloCEVR/CI_Release
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index fa98710..98e36c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ mono_crash.*
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
+CI_[Rr]elease/
 [Rr]eleases/
 x64/
 x86/

From 3f967223e74fdb5f5a15deb41e960ab3902c7114 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 22:40:16 +0000
Subject: [PATCH 20/33] filex uploaded files

---
 .github/workflows/build-on-pr.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 4eb9610..a2a9ea6 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -27,5 +27,5 @@ jobs:
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: build-artifacts
-          path: HaloCEVR/CI_Release
\ No newline at end of file
+          name: HaloCEVR
+          path: CI_Release
\ No newline at end of file

From 87bd7569030d208749f93936a517f3e8b9e2937d Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 23:42:16 +0000
Subject: [PATCH 21/33] Updated build steps

---
 HaloCEVR/HaloCEVR.vcxproj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/HaloCEVR/HaloCEVR.vcxproj b/HaloCEVR/HaloCEVR.vcxproj
index 4e4df10..d03f260 100644
--- a/HaloCEVR/HaloCEVR.vcxproj
+++ b/HaloCEVR/HaloCEVR.vcxproj
@@ -112,6 +112,7 @@
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ThirdParty\MinHook\include</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)ThirdParty\MinHook\lib;$(SolutionDir)ThirdParty\OpenVR\lib</LibraryPath>
     <TargetName>d3d9</TargetName>
+    <OutDir>$(SolutionDir)Release\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -186,8 +187,8 @@
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent>
-      <Command>
-      </Command>
+      <Command>cd "$(ProjectDir).."
+call "makerelease.bat"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

From 5d2f28621eb7e2b1a0e71b326676236ae26fcbeb Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 23:47:59 +0000
Subject: [PATCH 22/33] updated artifact location

---
 .github/workflows/build-on-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index a2a9ea6..b6f66b8 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -28,4 +28,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: HaloCEVR
-          path: CI_Release
\ No newline at end of file
+          path: HaloCEVR.zip
\ No newline at end of file

From c3f300dd38412722f7ebc81c578889861ef2e02b Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 15 Dec 2024 23:58:13 +0000
Subject: [PATCH 23/33] attempt auto comment

---
 .github/workflows/build-on-pr.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index b6f66b8..dd816fd 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -28,4 +28,19 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: HaloCEVR
-          path: HaloCEVR.zip
\ No newline at end of file
+          path: HaloCEVR.zip
+
+      # Step 5: Comment on the PR with the artifact link
+      - name: Comment on PR with artifact link
+        if: github.event_name == 'pull_request'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const artifactUrl = `https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}`
+            github.issues.createComment({
+            issue_number: ${{ github.event.pull_request.number }},
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: `The build artifacts are available [here](${artifactUrl}).`
+            })
\ No newline at end of file

From 5f8540cfc69932dc19554be39dd2833f050e3a1c Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Mon, 16 Dec 2024 00:03:55 +0000
Subject: [PATCH 24/33] Attempting Comment fix

---
 .github/workflows/build-on-pr.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index dd816fd..3555df9 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -37,10 +37,11 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
+            const { context, github } = require('@actions/github');
             const artifactUrl = `https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}`
-            github.issues.createComment({
-            issue_number: ${{ github.event.pull_request.number }},
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: `The build artifacts are available [here](${artifactUrl}).`
+            await github.rest.issues.createComment({
+              issue_number: context.payload.pull_request.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `The build artifacts are available [here](${artifactUrl}).`
             })
\ No newline at end of file

From 7f2a86a2628d2199fa3cbc6431622267b13b317d Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Mon, 16 Dec 2024 00:09:48 +0000
Subject: [PATCH 25/33] Changed to Linux

---
 .github/workflows/build-on-pr.yml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 3555df9..503c213 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
       # Step 1: Checkout repository
@@ -30,18 +30,3 @@ jobs:
           name: HaloCEVR
           path: HaloCEVR.zip
 
-      # Step 5: Comment on the PR with the artifact link
-      - name: Comment on PR with artifact link
-        if: github.event_name == 'pull_request'
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const { context, github } = require('@actions/github');
-            const artifactUrl = `https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}`
-            await github.rest.issues.createComment({
-              issue_number: context.payload.pull_request.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `The build artifacts are available [here](${artifactUrl}).`
-            })
\ No newline at end of file

From f85ccfc610d4581cc3937aadf7d4ce64e9b59521 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Mon, 16 Dec 2024 00:15:04 +0000
Subject: [PATCH 26/33] reverted back to windows

---
 .github/workflows/build-on-pr.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 503c213..af3f11d 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -7,15 +7,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
       # Step 1: Checkout repository
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      # Step 2: Set up Visual Studio
-      - name: Set up Visual Studio
+      # Step 2: Set up MS Build
+      - name: Set up MS Build
         uses: microsoft/setup-msbuild@v1
 
       # Step 3: Build the project using the CI-specific configuration

From ad42daca2c9c0f57987cf61498d21819603fa3ee Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Mon, 16 Dec 2024 00:19:35 +0000
Subject: [PATCH 27/33] Updated artifact version

---
 .github/workflows/build-on-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index af3f11d..cd4072d 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -25,7 +25,7 @@ jobs:
 
       # Step 4: Upload build artifacts
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: HaloCEVR
           path: HaloCEVR.zip

From 4deff4d2781e35897644f2234a24a13ac40d7ccd Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Fri, 20 Dec 2024 11:09:10 +0000
Subject: [PATCH 28/33] Added Python prebuild step

---
 HaloCEVR.sln              | 12 ++++++------
 HaloCEVR/HaloCEVR.vcxproj | 31 +++++++++++++++++++------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/HaloCEVR.sln b/HaloCEVR.sln
index 9fe9283..9df7293 100644
--- a/HaloCEVR.sln
+++ b/HaloCEVR.sln
@@ -7,22 +7,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HaloCEVR", "HaloCEVR\HaloCE
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		CI_Release|x64 = CI_Release|x64
-		CI_Release|x86 = CI_Release|x86
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Package|x64 = Package|x64
+		Package|x86 = Package|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.CI_Release|x64.ActiveCfg = CI_Release|x64
-		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.CI_Release|x64.Build.0 = CI_Release|x64
-		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.CI_Release|x86.ActiveCfg = CI_Release|Win32
-		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.CI_Release|x86.Build.0 = CI_Release|Win32
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Debug|x64.ActiveCfg = Debug|x64
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Debug|x64.Build.0 = Debug|x64
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Debug|x86.ActiveCfg = Debug|Win32
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Debug|x86.Build.0 = Debug|Win32
+		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Package|x64.ActiveCfg = Package|x64
+		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Package|x64.Build.0 = Package|x64
+		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Package|x86.ActiveCfg = Package|Win32
+		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Package|x86.Build.0 = Package|Win32
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Release|x64.ActiveCfg = Release|x64
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Release|x64.Build.0 = Release|x64
 		{4EE74470-E365-48E4-9920-237AA8B6F6D0}.Release|x86.ActiveCfg = Release|Win32
diff --git a/HaloCEVR/HaloCEVR.vcxproj b/HaloCEVR/HaloCEVR.vcxproj
index d03f260..1a6d721 100644
--- a/HaloCEVR/HaloCEVR.vcxproj
+++ b/HaloCEVR/HaloCEVR.vcxproj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="CI_Release|Win32">
-      <Configuration>CI_Release</Configuration>
+    <ProjectConfiguration Include="Package|Win32">
+      <Configuration>Package</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="CI_Release|x64">
-      <Configuration>CI_Release</Configuration>
+    <ProjectConfiguration Include="Package|x64">
+      <Configuration>Package</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
@@ -47,7 +47,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Package|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
@@ -67,7 +67,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Package|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
@@ -85,7 +85,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Package|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -94,7 +94,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Package|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -108,11 +108,12 @@
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)ThirdParty\MinHook\lib;$(SolutionDir)ThirdParty\OpenVR\lib</LibraryPath>
     <TargetName>d3d9</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Package|Win32'">
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ThirdParty\MinHook\include</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)ThirdParty\MinHook\lib;$(SolutionDir)ThirdParty\OpenVR\lib</LibraryPath>
     <TargetName>d3d9</TargetName>
     <OutDir>$(SolutionDir)Release\</OutDir>
+    <IntDir>Release\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -163,7 +164,7 @@
       <Command>xcopy /D /Y "$(TargetDir)d3d9.dll" "C:\Games\Halo"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Package|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -187,9 +188,15 @@
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent>
-      <Command>cd "$(ProjectDir).."
+      <Command>cd "$(SolutionDir)Bindings"
+call "python manifest.py"
+cd "$(SolutionDir)"
 call "makerelease.bat"</Command>
     </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>cd "$(SolutionDir)Bindings"
+call "py" manifest.py</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -225,7 +232,7 @@ call "makerelease.bat"</Command>
       <EnableUAC>false</EnableUAC>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CI_Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Package|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>

From 5793d26f5fb58774277656d473d935cb3c33f5aa Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Fri, 20 Dec 2024 11:10:52 +0000
Subject: [PATCH 29/33] Updated pipeline Configuration

---
 .github/workflows/build-on-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index cd4072d..b1a8dcd 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -21,7 +21,7 @@ jobs:
       # Step 3: Build the project using the CI-specific configuration
       - name: Build HaloCEVR
         run: |
-          msbuild HaloCEVR.sln /p:Configuration=CI_Release /p:Platform=x86 /p:WholeProgramOptimization=false
+          msbuild HaloCEVR.sln /p:Configuration=Package /p:Platform=x86 /p:WholeProgramOptimization=false
 
       # Step 4: Upload build artifacts
       - name: Upload build artifacts

From 3158d31f0f0d445e812f66a8a2c55ac15805be40 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 22 Dec 2024 20:21:22 +0000
Subject: [PATCH 30/33] Ensure that Package will always be built

---
 HaloCEVR/HaloCEVR.vcxproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/HaloCEVR/HaloCEVR.vcxproj b/HaloCEVR/HaloCEVR.vcxproj
index 1a6d721..470d944 100644
--- a/HaloCEVR/HaloCEVR.vcxproj
+++ b/HaloCEVR/HaloCEVR.vcxproj
@@ -53,6 +53,7 @@
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>

From e0644564464b738061a938065afee78b10d15119 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 22 Dec 2024 20:30:12 +0000
Subject: [PATCH 31/33] Reverted accidental changes

---
 .github/workflows/build-on-pr.yml | 6 +++---
 .gitignore                        | 2 +-
 HaloCEVR/HaloCEVR.vcxproj         | 7 +++----
 HaloCEVR/HaloCEVR.vcxproj.filters | 1 -
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index b1a8dcd..f3d8e34 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -1,4 +1,4 @@
-name: Build on Pull Request
+name: Package Pull Request
 
 on:
   pull_request:
@@ -18,12 +18,12 @@ jobs:
       - name: Set up MS Build
         uses: microsoft/setup-msbuild@v1
 
-      # Step 3: Build the project using the CI-specific configuration
+      # Step 3: Build the project using the Package configuration
       - name: Build HaloCEVR
         run: |
           msbuild HaloCEVR.sln /p:Configuration=Package /p:Platform=x86 /p:WholeProgramOptimization=false
 
-      # Step 4: Upload build artifacts
+      # Step 4: Upload Zip file
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
diff --git a/.gitignore b/.gitignore
index 98e36c8..caeb188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ mono_crash.*
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
-CI_[Rr]elease/
+[Pp]ackage/
 [Rr]eleases/
 x64/
 x86/
diff --git a/HaloCEVR/HaloCEVR.vcxproj b/HaloCEVR/HaloCEVR.vcxproj
index aa850a1..88f9fc6 100644
--- a/HaloCEVR/HaloCEVR.vcxproj
+++ b/HaloCEVR/HaloCEVR.vcxproj
@@ -113,8 +113,8 @@
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ThirdParty\MinHook\include</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)ThirdParty\MinHook\lib;$(SolutionDir)ThirdParty\OpenVR\lib</LibraryPath>
     <TargetName>d3d9</TargetName>
-    <OutDir>$(SolutionDir)Release\</OutDir>
-    <IntDir>Release\</IntDir>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -162,7 +162,7 @@
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /D /Y "$(TargetDir)d3d9.dll" "C:\Games\Halo"</Command>
+      <Command>xcopy /D /Y "$(TargetDir)d3d9.dll" "E:\Halo"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Package|Win32'">
@@ -310,7 +310,6 @@ call "py" manifest.py</Command>
     <ClInclude Include="VR\VREmulator.h" />
     <ClInclude Include="VR\IVR.h" />
     <ClInclude Include="WeaponHandler.h" />
-    <ClInclude Include="WeaponHapticsConfig.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />
diff --git a/HaloCEVR/HaloCEVR.vcxproj.filters b/HaloCEVR/HaloCEVR.vcxproj.filters
index 95ef3a9..ef7da09 100644
--- a/HaloCEVR/HaloCEVR.vcxproj.filters
+++ b/HaloCEVR/HaloCEVR.vcxproj.filters
@@ -186,6 +186,5 @@
   <ItemGroup>
     <None Include="VR\actions.json" />
     <None Include="cpp.hint" />
-    <None Include="VR\actions.json" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From ab7b58b151de2389a6cce74ba17b3464919958a6 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 22 Dec 2024 21:01:18 +0000
Subject: [PATCH 32/33] Updated readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 610ff01..30716cc 100644
--- a/README.md
+++ b/README.md
@@ -202,4 +202,4 @@ This should be everything that needs to be done inside of the HaloCEVR project,
 4. Build the libMinHook project, the result of which should be a libMinHook.x86.lib file.
 5. Replace the file libMinHook.x86.lib in the HaloCEVR folder found at HaloCEVR-master\ThirdParty\MinHook\lib with this newly compiled libMinHook.x86.lib file
 
-You should now be able to build successfully, this will generate a d3d9.dll file, using the "makerelease" bat file we can create a zip containing the d3d9.dll and the VR folder. You will need to add openvr_api.dll yourself, either by adding to the release folder so the bat file can pickup copy and zip it, or by adding it directly into your halo CE installation directory.
+You should now be able to build successfully, this will generate a d3d9.dll file, using the "makerelease" bat file we can create a zip containing the d3d9.dll and the VR folder. Alternatively you can generate the zip by building the project using the Package Configuration. You will need to add openvr_api.dll yourself, either by adding to the release folder so the bat file can pickup copy and zip it, or by adding it directly into your halo CE installation directory.

From 2109ba6f5d88eddd64216a7c613e25327080b268 Mon Sep 17 00:00:00 2001
From: 97saundersj <jacques_s@hotmail.co.uk>
Date: Sun, 22 Dec 2024 21:05:52 +0000
Subject: [PATCH 33/33] Removed redunant Bindings Build in post build

---
 HaloCEVR/HaloCEVR.vcxproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/HaloCEVR/HaloCEVR.vcxproj b/HaloCEVR/HaloCEVR.vcxproj
index 88f9fc6..d3027d7 100644
--- a/HaloCEVR/HaloCEVR.vcxproj
+++ b/HaloCEVR/HaloCEVR.vcxproj
@@ -189,8 +189,7 @@
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent>
-      <Command>cd "$(SolutionDir)Bindings"
-call "python manifest.py"
+      <Command>
 cd "$(SolutionDir)"
 call "makerelease.bat"</Command>
     </PostBuildEvent>