From ddfac586e54b952bc612f1241e4ec8cc04e4e18a Mon Sep 17 00:00:00 2001 From: turrrbina <147263744+turrrbina@users.noreply.github.com> Date: Sun, 12 Apr 2026 14:46:46 +0200 Subject: [PATCH 1/7] Add launcher update instructions to getting started Added instructions for updating the launcher in the getting started guide. --- docs/en/game/getting-started.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/en/game/getting-started.md b/docs/en/game/getting-started.md index c838127..2823376 100644 --- a/docs/en/game/getting-started.md +++ b/docs/en/game/getting-started.md @@ -139,6 +139,15 @@ Note that this assumes you put the launcher's binary you compiled earlier into ` This can be done for example by adding the [Linux-port of the Windows Segoe-UI emoji font](https://github.com/mrbvrz/segoe-ui-linux) +### **2d. Updating the Launcher** + +If you already build the launcher and want to update it, enter the BeamMP-Launcher folder where the build process happened and run these: +```bash +git fetch --tags +git checkout 2.x.x +``` + + --- ## **3. Using BeamMP** From 832bf7dd7f445334e5cfb31b92ff5cc93b4298d7 Mon Sep 17 00:00:00 2001 From: turrrbina <147263744+turrrbina@users.noreply.github.com> Date: Sun, 12 Apr 2026 14:48:42 +0200 Subject: [PATCH 2/7] Revise launcher update instructions in getting-started.md Updated instructions for updating the launcher, including new cmake commands. --- docs/en/game/getting-started.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/en/game/getting-started.md b/docs/en/game/getting-started.md index 2823376..ce02e43 100644 --- a/docs/en/game/getting-started.md +++ b/docs/en/game/getting-started.md @@ -141,10 +141,15 @@ Note that this assumes you put the launcher's binary you compiled earlier into ` ### **2d. Updating the Launcher** -If you already build the launcher and want to update it, enter the BeamMP-Launcher folder where the build process happened and run these: +If you already built the launcher and want to update it, enter the BeamMP-Launcher folder where the build process happened and run these: ```bash git fetch --tags git checkout 2.x.x +cmake . -B bin -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-linux +cmake --build bin --parallel +cp bin/BeamMP-Launcher ~/beammp-launcher/ +cd ~/beammp-launcher +./BeamMP-Launcher ``` From 917000d7b3e8b2b2dce729129052194519e24e0e Mon Sep 17 00:00:00 2001 From: turrrbina <147263744+turrrbina@users.noreply.github.com> Date: Sun, 12 Apr 2026 14:50:09 +0200 Subject: [PATCH 3/7] Update getting-started.md --- docs/en/game/getting-started.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/game/getting-started.md b/docs/en/game/getting-started.md index ce02e43..6280b54 100644 --- a/docs/en/game/getting-started.md +++ b/docs/en/game/getting-started.md @@ -143,6 +143,7 @@ Note that this assumes you put the launcher's binary you compiled earlier into ` If you already built the launcher and want to update it, enter the BeamMP-Launcher folder where the build process happened and run these: ```bash +cd BeamMP-Launcher git fetch --tags git checkout 2.x.x cmake . -B bin -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-linux From e8192486d000b2d4b095ee792253e0693e420532 Mon Sep 17 00:00:00 2001 From: turrrbina <147263744+turrrbina@users.noreply.github.com> Date: Sun, 12 Apr 2026 14:51:31 +0200 Subject: [PATCH 4/7] Update launcher instructions in getting-started.md Clarified instructions for updating the launcher. --- docs/en/game/getting-started.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en/game/getting-started.md b/docs/en/game/getting-started.md index 6280b54..7c8946e 100644 --- a/docs/en/game/getting-started.md +++ b/docs/en/game/getting-started.md @@ -141,7 +141,8 @@ Note that this assumes you put the launcher's binary you compiled earlier into ` ### **2d. Updating the Launcher** -If you already built the launcher and want to update it, enter the BeamMP-Launcher folder where the build process happened and run these: +If you already built the launcher and want to update it: + ```bash cd BeamMP-Launcher git fetch --tags From c77d6d937088c392affe21edb6f0cdd113881b59 Mon Sep 17 00:00:00 2001 From: turrrbina <147263744+turrrbina@users.noreply.github.com> Date: Fri, 17 Apr 2026 07:20:24 +0200 Subject: [PATCH 5/7] Fixed Keymaster URL Updated Keymaster link to the correct URL in two places --- docs/en/server/create-a-server.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/server/create-a-server.md b/docs/en/server/create-a-server.md index bebc234..dec078b 100644 --- a/docs/en/server/create-a-server.md +++ b/docs/en/server/create-a-server.md @@ -82,7 +82,7 @@ You will need a [Discord](https://discord.com) account for this step. This is ne #### 2.1. Accessing the keys page -Login with Discord to the [Keymaster](https://beammp.com/keymaster). +Login with Discord to the [Keymaster](https://keymaster.beammp.com/). From the Keymaster homepage click on "Keys" on the left of the screen:
@@ -264,7 +264,7 @@ You have to give other users the public IP Address of your Server. However, be c To join your public server they can simply go to the server list, type the name of the server, and click connect. If you are unsure of what your server name is, it will be the name you put in the `ServerConfig.toml`. Make sure search filters are disabled and the Map set to "Any" if you can't find it. -You can also check the [Keymaster](https://beammp.com/keymaster) Website for the Servers IP Address. +You can also check the [Keymaster](https://keymaster.beammp.com/) Website for the Servers IP Address. Should you or your friends experience a "Connection Failed!" Error, check the Launcher Window for codes like 10060, 10061, 10030. This means you eihter have a CGNAT IPv4, or you have done something wrong during Step **1 Port Forwarding** or **1.1. Firewall**. From 93b14f3f27cbd54cafa46b31dda67a169f2b50ca Mon Sep 17 00:00:00 2001 From: turrrbina <147263744+turrrbina@users.noreply.github.com> Date: Sat, 18 Apr 2026 22:22:26 +0200 Subject: [PATCH 6/7] Update getting-started.md with release checkout info Added instructions for checking out the latest release tag. --- docs/en/game/getting-started.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en/game/getting-started.md b/docs/en/game/getting-started.md index 7c8946e..0fbd8d7 100644 --- a/docs/en/game/getting-started.md +++ b/docs/en/game/getting-started.md @@ -146,7 +146,8 @@ If you already built the launcher and want to update it: ```bash cd BeamMP-Launcher git fetch --tags -git checkout 2.x.x +``` +Checkout the tag that was used for the [latest release](https://github.com/BeamMP/BeamMP-Launcher/releases/latest). For example, if `v2.8.0` is used in the latest release, then do `git checkout v2.8.0` cmake . -B bin -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-linux cmake --build bin --parallel cp bin/BeamMP-Launcher ~/beammp-launcher/ From 00f04eb9cdb41c5e61c1f00f494d183770805dc5 Mon Sep 17 00:00:00 2001 From: turrrbina <147263744+turrrbina@users.noreply.github.com> Date: Sat, 18 Apr 2026 22:24:39 +0200 Subject: [PATCH 7/7] Update getting-started.md with build instructions forgot the backticks --- docs/en/game/getting-started.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/game/getting-started.md b/docs/en/game/getting-started.md index 0fbd8d7..933ce07 100644 --- a/docs/en/game/getting-started.md +++ b/docs/en/game/getting-started.md @@ -148,6 +148,7 @@ cd BeamMP-Launcher git fetch --tags ``` Checkout the tag that was used for the [latest release](https://github.com/BeamMP/BeamMP-Launcher/releases/latest). For example, if `v2.8.0` is used in the latest release, then do `git checkout v2.8.0` +``` cmake . -B bin -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-linux cmake --build bin --parallel cp bin/BeamMP-Launcher ~/beammp-launcher/