From 90657559e5b1f417e914ca60c107f0287b79e7af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 20:10:32 -0600 Subject: [PATCH 1/5] Bump deps/curl from `b4d73e6` to `fb711b5` (#404) Bumps [deps/curl](https://github.com/curl/curl) from `b4d73e6` to `fb711b5`. - [Release notes](https://github.com/curl/curl/releases) - [Commits](https://github.com/curl/curl/compare/b4d73e67dc7e4ec0a62e24075fe865c75c777464...fb711b50981e86c9dcdd6c2ba468b5d32edbcfce) --- updated-dependencies: - dependency-name: deps/curl dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- deps/curl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/curl b/deps/curl index b4d73e6..fb711b5 160000 --- a/deps/curl +++ b/deps/curl @@ -1 +1 @@ -Subproject commit b4d73e67dc7e4ec0a62e24075fe865c75c777464 +Subproject commit fb711b50981e86c9dcdd6c2ba468b5d32edbcfce From ec18b138493e7e2c2a5d1ff8e79dfc2340a2230f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:25:21 -0600 Subject: [PATCH 2/5] Bump deps/lua from `c31d677` to `f743911` (#430) [skip ci] Bumps [deps/lua](https://github.com/lua/lua) from `c31d677` to `f743911`. - [Release notes](https://github.com/lua/lua/releases) - [Commits](https://github.com/lua/lua/compare/c31d6774ac7db4cfbc548ce507ae65ab6036f873...f7439112a5469078ac4f444106242cf1c1d3fe8a) --- updated-dependencies: - dependency-name: deps/lua dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- deps/lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/lua b/deps/lua index c31d677..f743911 160000 --- a/deps/lua +++ b/deps/lua @@ -1 +1 @@ -Subproject commit c31d6774ac7db4cfbc548ce507ae65ab6036f873 +Subproject commit f7439112a5469078ac4f444106242cf1c1d3fe8a From 3284dc7d88dfeeb419be4677828b73ba90501b66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:25:50 -0600 Subject: [PATCH 3/5] Bump deps/minhook from `4a45552` to `c1a7c38` (#298) [skip ci] Bumps [deps/minhook](https://github.com/TsudaKageyu/minhook) from `4a45552` to `c1a7c38`. - [Release notes](https://github.com/TsudaKageyu/minhook/releases) - [Commits](https://github.com/TsudaKageyu/minhook/compare/4a455528f61b5a375b1f9d44e7d296d47f18bb18...c1a7c3843bd1a5fe3eb779b64c0d823bca3dc339) --- updated-dependencies: - dependency-name: deps/minhook dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- deps/minhook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/minhook b/deps/minhook index 4a45552..c1a7c38 160000 --- a/deps/minhook +++ b/deps/minhook @@ -1 +1 @@ -Subproject commit 4a455528f61b5a375b1f9d44e7d296d47f18bb18 +Subproject commit c1a7c3843bd1a5fe3eb779b64c0d823bca3dc339 From 4ff922a4853b56b40019a48d087c9fccda7fc58d Mon Sep 17 00:00:00 2001 From: quaK Date: Tue, 18 Feb 2025 18:08:09 +0200 Subject: [PATCH 4/5] Update build.yml --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f88e748..6888ca6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - Release steps: - name: Check out files - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 @@ -42,7 +42,7 @@ jobs: run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=x64 build/iw7-mod.sln - name: Upload ${{matrix.configuration}} binaries - uses: actions/upload-artifact@v3.1.0 + uses: actions/upload-artifact@v4 with: name: ${{matrix.configuration}} binaries path: | @@ -50,7 +50,7 @@ jobs: build/bin/x64/${{matrix.configuration}}/iw7-mod.pdb - name: Upload ${{matrix.configuration}} data artifacts - uses: actions/upload-artifact@v3.1.0 + uses: actions/upload-artifact@v4 with: name: ${{matrix.configuration}} data artifacts path: | @@ -70,12 +70,12 @@ jobs: run: echo "AURORA_MASTER_PATH=${{ secrets.AURORA_MASTER_SSH_PATH_DEV }}" >> $GITHUB_ENV - name: Download Release binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: Release binaries - name: Download Release data artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: Release data artifacts path: data From 3fff0f5c07443db65a7257c4a4849f43c6c8e0a8 Mon Sep 17 00:00:00 2001 From: m Date: Sat, 8 Mar 2025 14:05:28 -0600 Subject: [PATCH 5/5] fix clients on same network infinite loading --- src/client/component/network.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/component/network.cpp b/src/client/component/network.cpp index 48e467f..da0717c 100644 --- a/src/client/component/network.cpp +++ b/src/client/component/network.cpp @@ -222,7 +222,7 @@ namespace network return PROTOCOL; } - void reconnect_migratated_client(void*, game::netadr_s* from, const int, const int, const char*, + void reconnect_migrated_client(void*, game::netadr_s* from, const int, const int, const char*, const char*, bool) { // This happens when a client tries to rejoin after being recently disconnected, OR by a duplicated guid @@ -317,7 +317,7 @@ namespace network utils::hook::nop(0x140C55EC7, 6); utils::hook::jump(game::NET_CompareAdr, net_compare_address); - utils::hook::jump(game::NET_CompareBaseAdr, net_compare_base_address); + utils::hook::jump(game::NET_CompareBaseAdr, net_compare_address); // don't establish secure conenction utils::hook::set(0x1409DBFDD, 0xEB); @@ -353,7 +353,7 @@ namespace network utils::hook::set(0x140CE6E60, 0xC301B0); // don't try to reconnect client - utils::hook::call(0x140C4F05F, reconnect_migratated_client); + utils::hook::call(0x140C4F05F, reconnect_migrated_client); utils::hook::nop(0x140C4F03C, 4); // this crashes when reconnecting for some reason // increase allowed packet size