Merged release/170128 into master

GameServerManagers · Jan 28, 2017 · 5732ed1 · 5732ed1
2 parents aac9bde + e16f1a8
commit 5732ed1
Show file tree

Hide file tree

Showing 103 changed files with 2,213 additions and 261 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: bash
-sudo: false
+sudo: required
 env:
 - DISTRO=ubuntu-trusty
 

diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -30,7 +30,6 @@ steampass='password'
 ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | http://7daystodie.gamepedia.com/Server
 fn_parms(){
 parms="-logfile ${gamelogdir}/output_log__`date +%Y-%m-%d__%H-%M-%S`.txt -quit -batchmode -nographics -dedicated -configfile=${servercfgfullpath}"
 }

diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -23,18 +23,15 @@ version="170110"
 #### Server Settings ####
 
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
-servername="ark-server"
-port="7778"
+port="7777"
 queryport="27015"
-rconport="32330"
-rconpassword="" # Set to enable rcon
-maxplayers="50"
+rconport="27020"
+maxplayers="70"
 ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care
 fn_parms(){
-parms="\"TheIsland?listen?MultiHome=${ip}?SessionName=${servername}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port}?ServerAdminPassword=${rconpassword}\""
+parms="\"TheIsland?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port}?\""
 }
 
 #### LinuxGSM Settings ####
@@ -82,7 +79,7 @@ githubbranch="master"
 
 ## LinuxGSM Server Details
 # Do not edit
-gamename="ARK: Survivial Evolved"
+gamename="ARK: Survival Evolved"
 engine="unreal4"
 
 ## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers

diff --git a/Arma3/arma3server b/Arma3/arma3server
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -46,7 +46,6 @@ servermods=""
 bepath=""
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care
 fn_parms(){
 parms="-netlog -ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
 }

diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server
@@ -14,15 +14,15 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
 ##########################
 
 #### Server Settings ####
 
-## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
+## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
 parms="+hostServer 1 +dedicated 1"
 }

diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -36,7 +36,6 @@ ip="0.0.0.0"
 gslt=""
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 parms="-game bms -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }

diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -35,7 +35,6 @@ clientport="27005"
 ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 parms="-autoupdate -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }

diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -39,7 +39,6 @@ ip="0.0.0.0"
 gslt=""
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 parms="-game brainbread2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,42 @@
+# How to contribute to LinuxGSM
+
+We are really glad you're reading this, because if you are then you have shown an interest in helping make LinuxGSM great.
+
+If you haven't already, come find us on [Discord](https://gameservermanagers.com/discord). From there you will have contact with other contributers of the project. We want you working on things you're excited about.
+
+Before working on a project we recommend that you create a issue in regards to the issue/feature. This will prevent duplicates while you work on the feature. If an issue already exists, make note that you are working on it so nobody else wastes their time working on the same project at the same time!
+
+Here are some important resources:
+
+  * [Issues Page](https://github.com/GameServerManagers/LinuxGSM/issues) provides a list of areas that could use some work,
+  * [Developing LGSM](https://github.com/GameServerManagers/LinuxGSM/wiki/Developing-LGSM) gives a detailed guide on developing LGSM,
+  * [LGSM Exit Codes](https://github.com/GameServerManagers/LinuxGSM/wiki/LGSM-Exit-Codes) describes and gives an explanation for exit codes,
+  * [gsquery](https://github.com/GameServerManagers/LinuxGSM/wiki/gsquery.py) describes the uses of the gsquery.py file, and
+  * [Branching](https://github.com/GameServerManagers/LinuxGSM/wiki/Branching) is our final guide to submitting changes.
+
+## Testing
+
+Please make sure all the code you write is working properly **before** you create a pull request. Information on debugging can be found in the following document:
+[Developer Commands](https://github.com/GameServerManagers/LinuxGSM/wiki/Developer-Commands)
+[Debugging your code](https://github.com/GameServerManagers/LinuxGSM/wiki/Developing-LGSM#testing-and-debugging-your-code)
+
+## Submitting changes
+
+Please send a [GitHub Pull Request to LinuxGSM](https://github.com/GameServerManagers/LinuxGSM/pull/new/develop) with a clear list of what you've done (read more about [pull requests](https://help.github.com/articles/about-pull-requests/)). Please follow our coding conventions (below) and make sure all of your commits are atomic (one feature per commit).
+
+Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this:
+
+    $ git commit -m "A brief summary of the commit
+    > 
+    > A paragraph describing what changed and its impact."
+This will help us in understanding your code and determining where problems may arise.
+
+## Coding conventions
+
+Start reading our code and you'll get the hang of it. Explore how functions are organized and you'll see how we strive for readable code.
+
+Please give the following document a read and adjust your code according to its specifications.
+[Syntax & Coding Conventions](https://github.com/GameServerManagers/LinuxGSM/wiki/Syntax-&-Conventions)
+
+
+
diff --git a/CallOfDuty/codserver b/CallOfDuty/codserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########

diff --git a/CallOfDuty2/cod2server b/CallOfDuty2/cod2server
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -23,7 +23,6 @@ version="170110"
 #### Server Settings ####
 
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
-
 defaultmap="mp_leningrad"
 maxclients="20"
 port="28960"

diff --git a/CallOfDuty4/cod4server b/CallOfDuty4/cod4server
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -23,7 +23,6 @@ version="170110"
 #### Server Settings ####
 
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
-
 defaultmap="mp_crossfire"
 maxclients="32"
 port="28960"

diff --git a/CallOfDutyUnitedOffensive/coduoserver b/CallOfDutyUnitedOffensive/coduoserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -23,7 +23,6 @@ version="170110"
 #### Server Settings ####
 
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
-
 defaultmap="mp_cassino"
 maxclients="20"
 port="28960"

diff --git a/CallOfDutyWorldAtWar/codwawserver b/CallOfDutyWorldAtWar/codwawserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -23,7 +23,6 @@ version="170110"
 #### Server Settings ####
 
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
-
 defaultmap="mp_castle"
 maxclients="20"
 port="28960"

diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver
@@ -14,12 +14,14 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
 ##########################
 
+#### Server Settings ####
+
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
 defaultmap="cbe_bunker"
 maxplayers="6"
@@ -29,7 +31,6 @@ clientport="27005"
 ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 parms="-game cure -insecure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }

diff --git a/CounterStrike/csserver b/CounterStrike/csserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -30,7 +30,6 @@ clientport="27005"
 ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
 parms="-game cstrike -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }

diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -30,7 +30,6 @@ clientport="27005"
 ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
 parms="-game czero -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }

diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -54,7 +54,6 @@ gslt=""
 # ws_start_map=""
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 parms="-game csgo -usercon -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} +host_workshop_collection ${ws_collection_id} +workshop_start_map ${ws_start_map} -authkey ${authkey}"
 }

diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -37,7 +37,6 @@ updateonstart="off"
 gslt=""
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 parms="-game cstrike -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }

diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -31,7 +31,6 @@ ip="0.0.0.0"
 updateonstart="off"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
 parms="-game dod -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}"
 }

diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver
@@ -14,7 +14,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170110"
+version="170128"
 
 ##########################
 ######## Settings ########
@@ -31,7 +31,6 @@ clientport="27005"
 ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
-# Edit with care | ttps://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
 parms="-game dod -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }