Browse code

nettoyage du fichier game.params.ori

onimaro authored on 04/02/2019 12:40:07
Showing 1 changed files
... ...
@@ -1,15 +1,3 @@
1
-<<<<<<< HEAD
2
-GAME_STEAMID=376030
3
-GAME_PATH=~/jeux/server_${GAME_NAME}
4
-LOG_PATH=~/logs/${GAME_NAME}
5
-GAME_BIN=${GAME_PATH}/ShooterGame/Binaries/Linux/ShooterGameServer
6
-SERVER_NAME=PATATE_Onimaro
7
-#GAME_PORT will be the specified port and the following (here 7779 and 7780)
8
-GAME_PORT=7779
9
-#QUERY_PORT is the port used by steam to connect players to your server
10
-QUERY_PORT=27015
11
-GAME_PARAMS="TheIsland?listen?Port=${GAME_PORT}?QueryPort=${QUERY_PORT}?SessionName=${SERVER_NAME}?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log -noBattlEye"
12
-=======
13 1
 export GAME_STEAMID=376030
14 2
 export GAME_PATH=~/jeux/server_${GAME_NAME}
15 3
 export LOG_PATH=~/logs/${GAME_NAME}
... ...
@@ -20,4 +8,3 @@ export GAME_PORT=7779
20 20
 export #QUERY_PORT is the port used by steam to connect players to your server
21 21
 export QUERY_PORT=27015
22 22
 export GAME_PARAMS="TheIsland?listen?Port=${GAME_PORT}?QueryPort=${QUERY_PORT}?SessionName=${SERVER_NAME}?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log"
23
->>>>>>> 4f0f0b6cb15091e3cb2eeba5038af48f1798b31b