Преглед изворни кода

Merge branch 'release/171216' into develop

Daniel Gibbs пре 8 година
родитељ
комит
db0e1c432f

+ 3 - 3
lgsm/config-default/config-lgsm/csgoserver/_default.cfg

@@ -11,12 +11,12 @@
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
 # https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
 # [Game Modes]			gametype	gamemode
+# Arms Race				1			0
 # Classic Casual		0			0
 # Classic Competitive	0			1
-# Arms Race				1			0
-# Demolition			1			1
-# Deathmatch			1			2
 # Custom				3			0
+# Deathmatch			1			2
+# Demolition			1			1
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"

+ 1 - 1
lgsm/config-default/config-lgsm/gmodserver/_default.cfg

@@ -24,7 +24,7 @@ workshopcollectionid=""
 
 ## Custom Start Parameters
 # Default +r_hunkalloclightmaps 0, fixes a start issue on maps with many lights
-# Default -disableluarefresh, disables autorefresh which should only be used when developing to avoid unwanted behavior
+# Default -disableluarefresh, disables lua autorefresh reducing server lag. Auto refresh only useful for developers.
 customparms="+r_hunkalloclightmaps 0 -disableluarefresh"
 
 ## Optional: Game Server Login Token

+ 3 - 3
lgsm/functions/check_deps.sh

@@ -177,7 +177,7 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then
 	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
-	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
+	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]||[ "${gamename}" == "Zombie Panic! Source" ]; then
 		if [ "${arch}" == "x86_64" ]; then
 			array_deps_required+=( lib32tinfo5 )
 		else
@@ -255,7 +255,7 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 
 	# All servers except ts3,mumble,multitheftauto and minecraft servers require glibc.i686 and libstdc++.i686
 	if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${engine}" != "lwjgl2" ]&&[ "${engine}" != "renderware" ]; then
-		if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then		
+		if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then
             		array_deps_required+=( glibc.i686 libstdc++64.i686 )
         	else
 			array_deps_required+=( glibc.i686 libstdc++.i686 )
@@ -274,7 +274,7 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
-	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
+	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]||[ "${gamename}" == "Zombie Panic! Source" ]; then
 		array_deps_required+=( ncurses-libs.i686 )
 	# Brainbread 2, Don't Starve Together & Team Fortress 2
 	elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]||[ "${gamename}" == "Team Fortress 2" ]; then

+ 1 - 1
lgsm/functions/command_postdetails.sh

@@ -62,7 +62,7 @@ else
 		fn_info_message_script
 		fn_info_message_backup
 		# Some game servers do not have parms.
-		if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche2.0" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
+		if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche2.0" ]&&[ "${engine}" != "avalanche3.0" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
 			fn_parms
 			fn_info_message_commandlineparms
 		fi

+ 1 - 1
lgsm/functions/core_dl.sh

@@ -105,7 +105,7 @@ fn_fetch_file(){
 	forcedl="${6:-0}"
 	md5="${7:-0}"
 
-	# download file if missing or download forced
+	# Download file if missing or download forced
 	if [ ! -f "${local_filedir}/${local_filename}" ]||[ "${forcedl}" == "forcedl" ]; then
 		if [ ! -d "${local_filedir}" ]; then
 			mkdir -p "${local_filedir}"

+ 3 - 0
lgsm/functions/info_glibc.sh

@@ -179,6 +179,9 @@ elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then
 elif [ "${gamename}" == "Multi Theft Auto" ]; then
 	glibcrequired="2.7"
 	glibcfix="no"
+elif [ "${gamename}" == "Zombie Panic! Source" ]; then
+	glibcrequired="2.15"
+	glibcfix="yes"
 else
 	glibcrequired="UNKNOWN"
 	glibcfix="no"

+ 1 - 1
linuxgsm.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="171014"
+version="171216"
 shortname="core"
 gameservername="core"
 rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"