Merge branch 'all-default-to-release' into 'master'

Build an optimized release binary when using `./all compile` by default

See merge request xonotic/xonotic!60

diff --git a/misc/logos/xonotic-glx.desktop b/misc/logos/xonotic-glx.desktop
index bbfaaafa5717a5b3ea46540ebab08d86fcc0bd6d..9636bfee71ce7039ee52ccf8bbee20c480ba50dd 100644 (file)
--- a/misc/logos/xonotic-glx.desktop
+++ b/misc/logos/xonotic-glx.desktop
@@ -3,6 +3,7 @@ Type=Application
 Version=1.0
 Name=Xonotic (GLX)
 Comment=Multiplayer, deathmatch oriented first person shooter
+Comment[fr]=Jeu de tir à la première personne multijoueur
 Icon=xonotic
 Exec=xonotic-glx
 Terminal=false

diff --git a/misc/logos/xonotic.appdata.xml b/misc/logos/xonotic.appdata.xml
index 7c151b139d6affa500e9134c05a7f5f61b69dd2a..9ffe06f564c7b136a037f3d3b1c99c85f8e5e280 100644 (file)
--- a/misc/logos/xonotic.appdata.xml
+++ b/misc/logos/xonotic.appdata.xml
@@ -6,12 +6,17 @@
   <metadata_license>CC0-1.0</metadata_license>
   <name>Xonotic</name>
   <summary>Multiplayer, deathmatch oriented first person shooter</summary>
+  <summary xml:lang="fr">Jeu de tir à la première personne multijoueur</summary>
   <description>
     <p>
       Xonotic is a free and fast-paced first person shooter which combines
       addictive, arena-style gameplay with rapid movement and a wide array of
       weapons.
     </p>
+    <p xml:lang="fr">
+      Xonotic est un jeu de tir à la première personne gratuit, qui combine un
+      style de jeu en arène rapide et addictif avec une large sélection d'armes.
+    </p>
     <p>
       Xonotic is easy to learn, but hard to master! Besides thrilling action for
       the casual player, the game also provides e-sport opportunities for those
@@ -20,11 +25,24 @@
       Xonotic allows every e-sport enthusiast to participate in competitions
       hosted by its open-minded community.
     </p>
+    <p xml:lang="fr">
+      Xonotic est facile à apprendre, mais difficile à maîtriser ! Outre une
+      action intense pour les joueurs débutants, le jeu propose aussi des
+      opportunités e-sport pour ceux qui sont intéressés par l'aspect
+      compétitif.
+    </p>
     <p>
       Features such as simple items, fully customizable configs and servers, a
       functioning anticheat system, the spectator mode, and the opportunity to
       watch and record games makes Xonotic attractive to competitive players.
     </p>
+    <p xml:lang="fr">
+      Des fonctionnalités comme les items à apparence simplifiée, des
+      configurations et serveurs entièrement personnalisables, un système
+      anti-triche, un mode spectateur, ainsi que la possibilité d'enregistrer et
+      visionner des démos rendent Xonotic attrayant pour les joueurs
+      compétitifs.
+    </p>
   </description>
   <url type="homepage">https://www.xonotic.org</url>
   <screenshots>

diff --git a/misc/logos/xonotic.desktop b/misc/logos/xonotic.desktop
index 5cca71f6b82e698365e6eef8bcf1408ab1cef920..c196b341f6228b1afd241715a0989bbd543a2eba 100644 (file)
--- a/misc/logos/xonotic.desktop
+++ b/misc/logos/xonotic.desktop
@@ -3,6 +3,7 @@ Type=Application
 Version=1.0
 Name=Xonotic
 Comment=Multiplayer, deathmatch oriented first person shooter
+Comment[fr]=Jeu de tir à la première personne multijoueur
 Icon=xonotic
 Exec=xonotic-sdl
 Terminal=false

diff --git a/server/server.cfg b/server/server.cfg
index b7185fe549caacde38344a39389ce5350fb94d36..ab835ccddedb728e7e2b2311930e13f2f60d1a78 100644 (file)
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -77,9 +77,13 @@
 // Some settings you MIGHT want to change.  Again IF so remove the //
 // from the line start and change them to your liking.
 
-//skill 4      // the bots skill level
+//skill 8      // the bots skill level
+
+// if changing either of these two minplayers settigs, you should consider editing the `bots` alias so that the `bots` vote adds the right number of bots
 //minplayers 0 // add bots if less then that number of players playing
 //minplayers_per_team 0 // add bots to each team if less than that number of players playing
+//alias bots "minplayers 4; minplayers_per_team 2"
+
 //g_maxplayers 0 // above this player count, only allow spectators
 //bot_prefix [BOT]     // prepend this to all botnames
 //bot_suffix ""        // append this to all botnames
@@ -97,7 +101,7 @@ sv_vote_gametype 1           // set to 1 to enable voting for gametypes after every mat
 //set sv_vote_gametype_mycustom_description "This is my custom gametype"       // the description for the custom gametype
 // Custom icons for custom gametypes are supported and have to be located in a server pk3 as gfx/menu/default/gametype_mycustom
 
-//sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams"   // players can vote for those commands or use them if they are masters. You canm also add 'g_grappling_hook' for hook voting, and 'sv_fbskin_green sv_fbskin_red sv_fbskin_orange sv_fbskin_off' for fbskin voting.
+//sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams bots nobots"       // players can vote for those commands or use them if they are masters. You can also add 'g_grappling_hook' for hook voting, and 'sv_fbskin_green sv_fbskin_red sv_fbskin_orange sv_fbskin_off' for fbskin voting.
 //sv_vote_master_commands "movetored movetoblue movetoyellow movetopink"       // add commands masters can use if logged in or elected. You may want to put 'kickban' here, so masters can keep out punks. It may be good to also put "sv_status_privacy 0" then...
 //rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoauto movetored movetoblue movetoyellow movetopink"      // commands for the (stronger) rcon restricted
 //rcon_restricted_password ""  // put here the password for a "restricted" rcon user (see below)