Skip to content

Commit

Permalink
Merge branch 'hotfix/v24.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
dgibbs64 committed Feb 4, 2024
2 parents c3349fc + 94849a1 commit 1e165ce
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/details-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Details Check
on:
workflow_dispatch:
push:
branches:
- develop

concurrency:
group: details-check-${{ github.ref_name }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/update-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Update Check
on:
workflow_dispatch:
push:
branches:
- develop

concurrency:
group: update-check-${{ github.ref_name }}
Expand Down
5 changes: 3 additions & 2 deletions lgsm/config-default/config-lgsm/pwserver/_default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
servername="LinuxGSM"

# Use game server config file to edit, used for port check script (workaround)
# For community servers (serverlist) you need to change these settings (publicip & publicport) in the gameserver config file aswell
port="8211"
steamport="27015"

## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
## Game Server Docs | https://tech.palworldgame.com/dedicated-server-guide#linux
startparameters="EpicApp=PalServer -useperfthreads -NoAsyncLoadingThread -UseMultithreadForDS -servername='${servername}'"
startparameters="EpicApp=PalServer -useperfthreads -NoAsyncLoadingThread -UseMultithreadForDS -servername='${servername}' -port='${port}' -queryport='${steamport}'"

#### LinuxGSM Settings ####

Expand Down
2 changes: 1 addition & 1 deletion lgsm/modules/core_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

modulesversion="v24.1.2"
modulesversion="v24.1.3"

# Core

Expand Down
6 changes: 3 additions & 3 deletions lgsm/modules/info_game.sh
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ fn_info_game_pvr() {
fn_info_game_pw() {
servername="${servername:-"NOT SET"}"
port="${port:-"0"}"
steamport="27015"
steamport="${steamport:-"0"}"
unknownport="1985"
}

Expand Down Expand Up @@ -1978,7 +1978,7 @@ fn_info_game_sdtd() {
# Config Type: Parameters (with an ini)
fn_info_game_sf() {
# Parameters
servername="${selfname:-"NOT SET"}"
servername="${servername:-"NOT SET"}"
port="${port:-"0"}"
queryport="${queryport:-"0"}"
beaconport="${beaconport:-"0"}"
Expand Down Expand Up @@ -2131,7 +2131,7 @@ fn_info_game_tw() {

# Config Type: Parameters
fn_info_game_unt() {
servername="${selfname:-"NOT SET"}"
servername="${servername:-"NOT SET"}"
port="${port:-"0"}"
queryport="${port}"
steamport="$((port + 1))"
Expand Down
8 changes: 7 additions & 1 deletion lgsm/modules/mods_list.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ steamworksscrapeurl="https://users.alliedmods.net/~kyles/builds/SteamWorks"
steamworkslatestfile=$(curl --connect-timeout 10 -sL ${steamworksscrapeurl} | grep -m 1 linux | cut -d '"' -f 4)
steamworksdownloadurl="${steamworksscrapeurl}/${steamworkslatestfile}"
steamworksurl="${steamworksdownloadurl}"
# Stripper:Source
stripperversion="1.2.2-git141"
stripperlatestfile="stripper-${stripperversion}-linux.tar.gz"
stripperdownloadurl="http://www.bailopan.net/stripper/snapshots/1.2/${stripperlatestfile}"
stripperurl="${stripperdownloadurl}"

# CS:GO Mods
get5lastbuild=$(curl --connect-timeout 10 -sL https://api.github.com/repos/splewis/get5/releases/latest | jq '.assets[] |select(.browser_download_url | endswith(".tar.gz"))')
get5latestfile=$(echo -e "${get5lastbuild}" | jq -r '.name')
Expand Down Expand Up @@ -149,7 +155,7 @@ mod_info_ts_amxx=(MOD "amxmodxts" "AMX Mod X: The Specialists" "${amxxtsurl}" "$
mod_info_metamodsource=(MOD "metamodsource" "Metamod: Source" "${metamodsourceurl}" "${metamodsourcelatestfile}" "0" "LowercaseOff" "${systemdir}" "addons/metamod/metaplugins.ini;" "source;" "GAMES" "NOTGAMES" "https://www.sourcemm.net" "Plugins Framework")
mod_info_sourcemod=(MOD "sourcemod" "SourceMod" "${sourcemodurl}" "${sourcemodlatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "source;" "GAMES" "NOTGAMES" "http://www.sourcemod.net" "Admin Features (requires Metamod: Source)")
mod_info_steamworks=(MOD "steamworks" "SteamWorks" "${steamworksurl}" "${steamworkslatestfile}" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/KyleSanderson/SteamWorks" "Exposing SteamWorks functions to SourcePawn")
mod_info_stripper=(MOD "stripper" "Stripper Source" "http://www.bailopan.net/stripper/snapshots/1.2/stripper-1.2.2-git129-linux.tar.gz" "stripper-1.2.2-git129-linux.tar.gz" "0" "LowercaseOff" "${systemdir}" "addons/stripper/maps;" "ENGINES" "Counter-Strike: Global Offensive;Counter-Strike: Source;Day of Defeat: Source;Half Life: Deathmatch;Half Life 2: Deathmatch;Insurgency;Left 4 Dead;Left 4 Dead 2;Nuclear Dawn;Team Fortress 2;" "NOTGAMES" "http://www.bailopan.net/stripper/" "Add or remove objects from map (requires MetaMod)")
mod_info_stripper=(MOD "stripper" "Stripper Source" "${stripperurl}" "${stripperlatestfile}" "0" "LowercaseOff" "${systemdir}" "addons/stripper/maps;" "ENGINES" "Counter-Strike: Global Offensive;Counter-Strike: Source;Day of Defeat: Source;Half Life: Deathmatch;Half Life 2: Deathmatch;Insurgency;Left 4 Dead;Left 4 Dead 2;Nuclear Dawn;Team Fortress 2;" "NOTGAMES" "http://www.bailopan.net/stripper/" "Add or remove objects from map (requires MetaMod)")

# CS:GO Mods
mod_info_gokz=(MOD "gokz" "GOKZ" "${gokzlatestlink}" "${gokzlatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter-Strike: Global Offensive;" "NOTGAMES" "https://github.com/KZGlobalTeam/gokz" "GOKZ ${gokzlatestversion} - Implements the KZ game mode (requires SourceMod and MetaMod)")
Expand Down
2 changes: 1 addition & 1 deletion linuxgsm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi

version="v24.1.2"
version="v24.1.3"
shortname="core"
gameservername="core"
commandname="CORE"
Expand Down

0 comments on commit 1e165ce

Please sign in to comment.