]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Merge branch 'asciiwolf/xonotic-makefile-fix'
authorMario <mario@smbclan.net>
Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)
committerMario <mario@smbclan.net>
Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)
18 files changed:
Docs/faq.md
Makefile
misc/infrastructure/checkupdate.txt
misc/logos/xonotic-glx.desktop [deleted file]
misc/logos/xonotic-sdl.desktop
misc/tools/all/release.subr
misc/tools/all/xonotic.subr
misc/tools/all/zsh_autocompletion/all/_all
misc/tools/rsync-updater/update-to-autobuild.bat
misc/tools/rsync-updater/update-to-release.bat
misc/tools/testbuild.sh [deleted file]
misc/tools/xonotic-map-screenshot
release.cmake
server/help.cfg [deleted file]
server/server.cfg
xonotic-linux-dedicated.sh
xonotic-linux-glx.sh [deleted file]
xonotic-linux-sdl.sh [changed from symlink to file mode: 0755]

index e515db4c49b64cd4d447bab2496f3ceab93d8436..255a4099b845452ba1aa843631026ab2676de6d5 100644 (file)
@@ -3,7 +3,7 @@
 
 **There is no need to install Xonotic!** The zip file you downloaded from the homepage has everything. All binaries to run the game on Linux, Windows and macOS are inside of it. Just unzip the archive and run the appropriate executable for your OS.
 
-For example, on Windows or macOS you can start the game by double-clicking the Xonotic logo. On Linux you can run xonotic-linux-glx.sh or xonotic-linux-sdl.sh - whichever one works better on your hardware.
+For example, on Windows or macOS you can start the game by double-clicking the Xonotic logo. On Linux you can run xonotic-linux-sdl.sh.
 
 ## Is there a Debian package available?
 
@@ -85,7 +85,7 @@ Use our [issue tracker](http://gitlab.com/xonotic/xonotic-data.pk3dir/issues) on
 
 If you want to investigate further:
 
-On Linux: In a xterm, cd into your Xonotic installation directory, start catchsegv ./xonotic-linux-686-sdl -condebug -developer > crash.txt 2>&1 and give the file crash.txt to the developers. Note that you can also use ./xonotic-linux-686-glx or if you have a 64bit system ./xonotic-linux-x86_64-sdl and ./xonotic-linux-x86_64-glx
+On Linux: In a xterm, cd into your Xonotic installation directory, start catchsegv ./xonotic-linux64-sdl -condebug -developer > crash.txt 2>&1 and give the file crash.txt to the developers. On a 32bit system you should instead use ./xonotic-linux32-sdl.
 
 On Windows: Click Start->Run, and enter drwtsn32, click Ok in the next window, run Xonotic and wait for the crash. Then go to C:\Documents and Settings\All Users\Application Data\Microsoft\Dr Watson there should be a file called "drwtsn32.log", give that file along with the engine's build date to the developers. You'll see that date when you open the ingame console (How do I open the console?). Note that some folders of that path may be hidden or have a translated name if you're using a non-english windows.
 
@@ -116,7 +116,7 @@ An extensive list of maps is at [xonotic.co](http://xonotic.co)
 
 ## How can I place a shortcut to Xonotic on my Linux desktop?
 
-Use the script xonotic-linux-sdl.sh or xonotic-linux-glx.sh instead of the binaries. The scripts will use the correct working directory, choose the right version (32 or 64 bit) and also allow you to start a extra X server.
+Use the script xonotic-linux-sdl.sh instead of the binaries. The scripts will use the correct working directory, choose the right version (32 or 64 bit) and also allow you to start a extra X server.
 
 ## How do I open the console?
 
index 2c77a91754b6306b5345d31beb4ba23b9a42255e..a9d6a22c5f5174c6bada743f6e317551399dda33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,31 +85,25 @@ install-engine: install-engine-$(SUFFIX)
 .PHONY: install-engine-git
 install-engine-git: all-git
        $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-       $(INSTALL) xonotic-linux-glx.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-glx.sh
        $(INSTALL) xonotic-linux-sdl.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-sdl.sh
        $(INSTALL) xonotic-linux-dedicated.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-dedicated.sh
        $(INSTALL) darkplaces/darkplaces-sdl $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-sdl
-       $(INSTALL) darkplaces/darkplaces-glx $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-glx
        $(INSTALL) darkplaces/darkplaces-dedicated $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-dedicated
 
 .PHONY: install-engine-zip-binary
 install-engine-zip-binary: all-zip-binary
        $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-       $(INSTALL) xonotic-linux-glx.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-glx.sh
        $(INSTALL) xonotic-linux-sdl.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-sdl.sh
        $(INSTALL) xonotic-linux-dedicated.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-dedicated.sh
        $(INSTALL) xonotic-$(ARCH)-sdl $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-sdl
-       $(INSTALL) xonotic-$(ARCH)-glx $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-glx
        $(INSTALL) xonotic-$(ARCH)-dedicated $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-dedicated
 
 .PHONY: install-engine-zip-source
 install-engine-zip-source: all-zip-source
        $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-       $(INSTALL) xonotic-linux-glx.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-glx.sh
        $(INSTALL) xonotic-linux-sdl.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-sdl.sh
        $(INSTALL) xonotic-linux-dedicated.sh $(DESTDIR)$(LIBDIR)/xonotic-linux-dedicated.sh
        $(INSTALL) source/darkplaces/darkplaces-sdl $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-sdl
-       $(INSTALL) source/darkplaces/darkplaces-glx $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-glx
        $(INSTALL) source/darkplaces/darkplaces-dedicated $(DESTDIR)$(LIBDIR)/xonotic-$(ARCH)-dedicated
 
 
@@ -117,7 +111,6 @@ install-engine-zip-source: all-zip-source
 install-links:
        $(INSTALL) -d $(BINDIR)
        $(LN) -snf $(LIBDIR)/xonotic-linux-sdl.sh $(DESTDIR)$(BINDIR)/xonotic-sdl
-       $(LN) -snf $(LIBDIR)/xonotic-linux-glx.sh $(DESTDIR)$(BINDIR)/xonotic-glx
        $(LN) -snf $(LIBDIR)/xonotic-linux-dedicated.sh $(DESTDIR)$(BINDIR)/xonotic-dedicated
 
 
index c79e6e8f8d2427846e5fc57931139e1448f8e757..1355dcdfd90fc475075591be8c7a435b7bc1e831 100644 (file)
@@ -31,6 +31,7 @@ B 51.15.46.239:
 B 163.172.104.191:
 B 89.163.144.198:
 B 51.38.113.134:
+B 85.114.138.57:
 
 # Emergency packs. Specify as:
 # E http://packurl/pack.pk3 file-in-pack.txt
diff --git a/misc/logos/xonotic-glx.desktop b/misc/logos/xonotic-glx.desktop
deleted file mode 100644 (file)
index 9f9e78c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Xonotic (GLX)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/xonotic.png
-Exec=/usr/bin/xonotic-glx
-Terminal=false
-StartupNotify=false
-Categories=Game;
index 32b37f2c55a7943e2232cc889855cf406a290ef3..521be64fd35aa45329b9e181c169de50c80d3777 100644 (file)
@@ -1,11 +1,10 @@
 [Desktop Entry]
 Type=Application
-Version=2.5
-Encoding=UTF-8
+Version=1.0
 Name=Xonotic (SDL)
 Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/xonotic.png
-Exec=/usr/bin/xonotic-sdl
+Icon=xonotic
+Exec=xonotic-sdl
 Terminal=false
 StartupNotify=false
 Categories=Game;
index 0b30a9bdc55fdc646d8860766abf82716425686e..4fd05e9ba3e941c7072b0c70c468eb1df1ab6aee 100644 (file)
@@ -169,7 +169,7 @@ case "$cmd" in
                        verbose date +%Y%m%d > Xonotic/stamp.txt
                        verbose date +%Y%m%d > Xonotic/pk3stamp.txt
                fi
-               release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
+               release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
                (
                        verbose cd Xonotic
                        verbose mkdir data gmqcc source source/darkplaces source/gmqcc source/d0_blind_id mapping
@@ -221,7 +221,6 @@ case "$cmd" in
                release_common
                good=true
                verbose "$SELF" release-getbinary Xonotic/xonotic-x86.exe || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x86-wgl.exe || good=false
                verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false
                $good
                ;;
@@ -229,7 +228,6 @@ case "$cmd" in
                release_common
                good=true
                verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-wgl.exe || good=false
                verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
                $good
                ;;
@@ -244,7 +242,6 @@ case "$cmd" in
                release_common
                good=true
                verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || good=false
                verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
                $good
                ;;
index 1c24f3bfb190121e0f65a8c1b966fb3bfb984cbb..9118c5054d6219e414be2692363a4028ae66ac3f 100644 (file)
@@ -83,11 +83,9 @@ case "$cmd" in
                        esac
                done
 
+               TARGETS="sv-$debug sdl-$debug"
                if [ x"`uname`" = x"Darwin" ]; then
-                       TARGETS="sv-$debug sdl-$debug"
                        export CC="$CC -fno-reorder-blocks"
-               else
-                       TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi
 
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -104,9 +102,6 @@ case "$cmd" in
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
                                                ;;
-                                       glx|wgl)
-                                               TARGETS="$TARGETS cl-$debug"
-                                               ;;
                                        dedicated)
                                                TARGETS="$TARGETS sv-$debug"
                                                ;;
@@ -139,7 +134,14 @@ case "$cmd" in
 
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        # win32: use SDL2
-                       MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config"
+                       case `uname -m` in
+                               x86_64)
+                                       MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win64/sdl/bin/sdl2-config"
+                                       ;;
+                               *)
+                                       MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config"
+                                       ;;
+                       esac
 
                        # win32: don't rely on jpeg includes
                        MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
@@ -195,10 +197,20 @@ case "$cmd" in
                        # use binaries then, if we can...
                        mkdir -p .libs
                        if [ -n "$WE_HATE_OUR_USERS" ]; then
-                               verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
-                               verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/
-                               verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
-                               compiled0=false
+                               case `uname -m` in
+                                       x86_64)
+                                               verbose cp "$d0/misc/buildfiles/win64/libd0_blind_id"-* .libs/
+                                               verbose cp "$d0/misc/buildfiles/win64/libd0_rijndael"-* .libs/
+                                               verbose cp "$d0/misc/buildfiles/win64/libgmp"-* .libs/
+                                               compiled0=false
+                                               ;;
+                                       *)
+                                               verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
+                                               verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/
+                                               verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
+                                               compiled0=false
+                                               ;;
+                               esac
                        else
                                case "`uname`" in
                                        Linux)
@@ -284,7 +296,14 @@ case "$cmd" in
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
-                       export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
+                       case `uname -m` in
+                               x86_64)
+                                       export PATH="$d0/misc/buildfiles/win64:$d0/d0_blind_id/.libs:$PATH"
+                                       ;;
+                               *)
+                                       export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
+                                       ;;
+                       esac
                elif [ x"`uname`" = x"Darwin" ]; then
                        export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS:$d0/d0_blind_id/.libs"
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
@@ -298,16 +317,11 @@ case "$cmd" in
                                client=-$1
                                shift
                                ;;
-                       sdl|glx)
+                       sdl)
                                USE_RLWRAP=no
                                client=-$1
                                shift
                                ;;
-                       wgl)
-                               USE_RLWRAP=no
-                               client=
-                               shift
-                               ;;
                esac
                if ! [ -x "darkplaces/darkplaces$client" ]; then
                        if [ -x "darkplaces/darkplaces$client.exe" ]; then
@@ -359,9 +373,9 @@ case "$cmd" in
                fi
                ;;
        help)
-               $ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
+               $ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|dedicated]"
                $ECHO "  $SELF update-maps"
-               $ECHO "  $SELF run [sdl|glx|wgl|dedicated] options..."
+               $ECHO "  $SELF run [sdl|dedicated] options..."
                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;
index e13619892357cb513397caee2d4b943a12070bc8..8c99c313922a5c2a4710aeac0ebc65f42d91d531 100644 (file)
@@ -44,12 +44,12 @@ case $state in
             # choose version and autocomplete cvars
             # possible TODO: check for OS and adapt to it
             _arguments \
-                '1:Version:(sdl glx dedicated)' && ret=0
+                '1:Version:(sdl dedicated)' && ret=0
             ;;
 
         compile)
             _arguments \
-                '1:Version:(sdl glx dedicated)' \
+                '1:Version:(sdl dedicated)' \
                 "-0[don't use precompiled d0_blind_id]" \
                 '-c[clean all before building]' \
                 '-qc[clean QuakeC binaries]' \
index 9d6cbf115648096d2c308252496aa2244b3e7bda..911628c84caab1ddcde74caef2c9c3976e4638a0 100644 (file)
@@ -89,7 +89,6 @@ if "%ProgramFiles(x86)%" == "" goto bit32
 :bit64\r
        if not "%XONOTIC_INCLUDE_32BIT%" == "" goto endbit\r
        set excludes=%excludes% --exclude=/xonotic-x86.exe\r
-       set excludes=%excludes% --exclude=/xonotic-x86-wgl.exe\r
        set excludes=%excludes% --exclude=/xonotic-x86-dedicated.exe\r
        set excludes=%excludes% --exclude=/gmqcc/gmqcc.exe\r
        set excludes=%excludes% --exclude=/bin32\r
@@ -97,7 +96,6 @@ if "%ProgramFiles(x86)%" == "" goto bit32
        goto endbit\r
 :bit32\r
        set excludes=%excludes% --exclude=/xonotic.exe\r
-       set excludes=%excludes% --exclude=/xonotic-wgl.exe\r
        set excludes=%excludes% --exclude=/xonotic-dedicated.exe\r
        set excludes=%excludes% --exclude=/gmqcc/gmqcc-x64.exe\r
        set excludes=%excludes% --exclude=/bin64\r
index 9d6cbf115648096d2c308252496aa2244b3e7bda..911628c84caab1ddcde74caef2c9c3976e4638a0 100644 (file)
@@ -89,7 +89,6 @@ if "%ProgramFiles(x86)%" == "" goto bit32
 :bit64\r
        if not "%XONOTIC_INCLUDE_32BIT%" == "" goto endbit\r
        set excludes=%excludes% --exclude=/xonotic-x86.exe\r
-       set excludes=%excludes% --exclude=/xonotic-x86-wgl.exe\r
        set excludes=%excludes% --exclude=/xonotic-x86-dedicated.exe\r
        set excludes=%excludes% --exclude=/gmqcc/gmqcc.exe\r
        set excludes=%excludes% --exclude=/bin32\r
@@ -97,7 +96,6 @@ if "%ProgramFiles(x86)%" == "" goto bit32
        goto endbit\r
 :bit32\r
        set excludes=%excludes% --exclude=/xonotic.exe\r
-       set excludes=%excludes% --exclude=/xonotic-wgl.exe\r
        set excludes=%excludes% --exclude=/xonotic-dedicated.exe\r
        set excludes=%excludes% --exclude=/gmqcc/gmqcc-x64.exe\r
        set excludes=%excludes% --exclude=/bin64\r
diff --git a/misc/tools/testbuild.sh b/misc/tools/testbuild.sh
deleted file mode 100755 (executable)
index 51a07e0..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd nexuiz
-../darkplaces/nexuiz-glx "$@"
index 867fd7dbbeba17f126b94ea63259ab41ad8391d2..ce00dbc7729539208601680a86dd6b77e4c0bcd8 100755 (executable)
@@ -10,12 +10,14 @@ count=`yes x | head -n "$count" | tr -cd x`
 
 ./all run \
        -nosound \
+       -noconfig \
        +'locksession 0' \
        +'scr_screenshot_timestamp 0' \
        +'vid_fullscreen 0' \
        +'exec effects-ultra.cfg' \
        "$@" \
        +'sv_precacheplayermodels 0' \
+       +'cl_hidewaypoints 1' \
        +'r_motionblur 0' \
        +'r_damageblur 0' \
        +'r_letterbox -1' \
@@ -33,7 +35,7 @@ count=`yes x | head -n "$count" | tr -cd x`
        +'alias EGAD "noclip; NARF POIT"' \
        +'alias POIT "$catchme; set catchme \"${catchme}x\"; impulse 911; NARF TROZ"' \
        +'alias TROZ "screenshot; NARF POIT"' \
-       +'alias cl_hook_gamestart_all "cmd join; defer 2 ZORT"' \
+       +'alias cl_hook_gamestart_all "defer 1.1 \"cmd join\"; defer 2 ZORT"' \
        +"defer \"$watchdog\" quit" \
        +"map \"$map\"" \
        +'timelimit 0' \
index 44b16eb861c0a17f7436ccc7bb04a061e16a76d0..8e40ad2cc4f3db14654686fba4f0fff10be9d3b5 100644 (file)
@@ -58,17 +58,14 @@ if (0)
     message(STATUS "Downloading Darkplaces")
 
     getbinary(Xonotic/xonotic-x86.exe)
-    getbinary(Xonotic/xonotic-x86-wgl.exe)
     getbinary(Xonotic/xonotic-x86-dedicated.exe)
     getbinary(Xonotic/xonotic.exe)
-    getbinary(Xonotic/xonotic-wgl.exe)
     getbinary(Xonotic/xonotic-dedicated.exe)
 
     getbinary(Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin) # +x
     getbinary(Xonotic/xonotic-osx-dedicated) # +x
 
     getbinary(Xonotic/xonotic-linux64-sdl) # +x
-    getbinary(Xonotic/xonotic-linux64-glx) # +x
     getbinary(Xonotic/xonotic-linux64-dedicated) # +x
 endif ()
 
diff --git a/server/help.cfg b/server/help.cfg
deleted file mode 100644 (file)
index 9b3d614..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-// Simple help message system
-// It prints messages with the configured name and interval to all connected users
-// Exec this file and start the help system with the command help_loop
-// You can adjust those two settings and change the messages and their count
-// help_cfg_time is the time between two messages in seconds
-// help_cfg_prefix is prepended to each message, useful to color the nick and message differently
-// help_msg_count is from 0 to last message, thus one more then the last message number you want
-// the messages need to be starting from 0 and be consecutive
-// for manual use: help_inc switches to the next message, help_doit will print the current message, help_next will do both together
-
-// settings
-set help_cfg_nick "^2Help System^3"
-set help_cfg_time 300
-set help_cfg_prefix "^2"
-
-// help messages
-set help_msg_count 58
-set help_msg_0 "Big Admin is watching you, so please be friendly or feel their almighty ban-hammer!"
-set help_msg_1 "If you want to learn more about Xonotic, read ^1'Halogene's Newbie Corner' (https://xonotic.org/guide) ${help_cfg_prefix}as it contains lots of useful tips and tricks, explains all the weapons and helps to improve your gameplay."
-set help_msg_2 "Please watch out for balanced teams and change by pressing F5 (teammenu) or F6 (auto join 'best' team)."
-set help_msg_3 "When trying to bunny-hop you can ^1hold the jump button ${help_cfg_prefix}while you are still in the air, this will make those jumps VERY easy to time and work more reliable."
-set help_msg_4 "When a vote is called you can accept it via F1 or reject it via F2 (default keys)."
-set help_msg_5 "Spectating other (good) players helps to learn new tricks. To spectate press F3 and then Mouse1 to switch between the players you want to spectate. F5, F6 or jump will get you back into the game (default keys)."
-set help_msg_6 "Being a beginner is great! You can learn so many new tricks and improve quickly. Watch others, ask for advice and use your common sense effectively."
-set help_msg_7 "If others are better than you, it does not mean they cheat. Save such complaints for when you have more experience and know what kind of funky stuff is possible."
-set help_msg_8 "In CTF, it's good to move around and get involved in the action. You get fragged quite a bit but you are also most helpful to your team."
-set help_msg_9 "Use the radar to see where your teammates are. Pressing zoom will expand the radar image to give you a better overview."
-set help_msg_10 "Most teammessages display waypoints by default. Use those to guide your teammates. You can also see them and the flagcarrier in the radar."
-set help_msg_11 "Protect your flagcarrier at all cost! Also save health and armor for him, he might need them more than you!"
-set help_msg_12 "You can use the Blaster and most explosive weapons to jump around. Just look 'at your feet' and press fire. If you also jump at the same time, you get even higher."
-set help_msg_13 "Be friendly and helpful to other players! Being angry at others' mistakes is understandable, but nobody is perfect. Try to use calm words when telling them how to correct their mistake."
-set help_msg_14 "You can use the zoom key with all guns, only the Vortex has it as a extra function on Mouse2 (default key)."
-set help_msg_15 "Notice what is happening around you! If your base is empty in CTF, then STAY and defend the flag! Make sure someone defends the flagcarrier or assist him yourself."
-set help_msg_16 "You can drop the weapon you currently have with Backspace (default key). You can help your unarmed teammates this way."
-set help_msg_17 "Learn to use the team messages! You find them in the Setting/Input menu. Try changing them to keys you can press easier than the defaults."
-set help_msg_18 "Gaming should be fun! Try to have a nice time, be helpful, mindful and treat others like you want to be treated."
-set help_msg_19 "Visit the official forum on ^1https://forums.xonotic.org/ ${help_cfg_prefix}and feel free to open a thread if you have questions."
-set help_msg_20 "If you already have a good weapon, it's a great idea to let your teammates get something better than the Shotgun too!"
-set help_msg_21 "Press T to chat with others, press Y for messages to your team only, press TAB to see the scores and U for the chat history (default keys)."
-set help_msg_22 "You can use ^1'suggestmap PART_OF_NAME' ${help_cfg_prefix}to make a map come up at the vote screen after a map was played."
-set help_msg_23 "The console is accessible through the ~ key or by pressing Shift+ESC. It has many more advanced features, use 'cmdlist' and 'cvarlist' to get a full list of available commands/settings."
-set help_msg_24 "The Blaster is a useful tool for gaining speed and jumping around, but it does little damage."
-set help_msg_25 "The Shotgun's primary firemode has spread and is more useful at a closer distance, use secondary for the melee attack and slap into other players faces!"
-set help_msg_26 "The Machine Gun secondary has a burst fire mode and less spread than the primary mode."
-set help_msg_27 "The Mortar is a good all around gun but takes some practice to aim it, because of the projectile's curve."
-set help_msg_28 "The Electro has a combo attack. Fire the primary mode at the balls from the secondary mode for a huge and powerful explosion."
-set help_msg_29 "The Crylink's primary fire bounces. Both firemodes pull your enemies, making it a great tool to stop a flag carrier."
-set help_msg_30 "The Vortex is a powerful sniper gun. Aim carefully!"
-set help_msg_31 "The Hagar is underestimated, but very powerful if you aim right. The secondary mode charges up to four rockets and causes devasting damage if you release them."
-set help_msg_32 "The Devastator is powerful but slow. Keep Mouse1 pressed to guide the rockets. Secondary firemode makes the rocket(s) explode."
-set help_msg_33 "The Arc is a strong lighting beam, which bends slighty if you move your mouse. The secondary firemode is very strong but short. Both firemodes also heal teammates if you shoot at them."
-set help_msg_34 "By default, explosions go through walls. Be careful when hiding behind walls!"
-set help_msg_35 "Get on IRC to chat with fellow players. Take a look at ^1https://xonotic.org/chat/${help_cfg_prefix}."
-set help_msg_36 "Don't drink and frag."
-set help_msg_37 "Don't shoot at players who are typing/chatting. You recognize those players by the keyboard symbols above their head."
-set help_msg_38 "'gg' is shorthand for 'Good Game', 'gl' means 'Good luck' and 'hf' 'Have fun'."
-set help_msg_39 "Players with the prefix '$bot_prefix${help_cfg_prefix}' in their nick are bots on this server. There is also a clan named [BOT]."
-set help_msg_40 "You spawn with ^1two ${help_cfg_prefix}weapons. Use the Blaster for much faster movement."
-set help_msg_41 "Visit the stats page at ^1https://stats.xonotic.org/ ${help_cfg_prefix}and check out how you are doing in the rankings!"
-set help_msg_42 "Start playing 1on1 if you want to learn fast"
-set help_msg_43 "Visit ^1https://xonotic.org/pickup/ ${help_cfg_prefix}to get in touch with the experienced players, ask them stuff and play with them!"
-set help_msg_44 "Look for servers that have a good ping for you. You can't play this game well with a ping > 100. If there are no servers close enough to you, cooperate with your friends to setup one."
-set help_msg_45 "If you want to play the next map you can cast a vote via 'vcall endmatch' in the console. Other players can vote using F1 and F2 (default keys)."
-set help_msg_46 "Always watch your back. Do not just run away, fight back as you retreat. Otherwise, you could be shot in the back."
-set help_msg_47 "Try to get as much armor and health as you can, but remember your teammates need armor and health too."
-set help_msg_48 "Do not attack if you have neither a good weapon, nor health, nor armor."
-set help_msg_49 "Standing still makes you an easy target. You can move around the map faster by bunny hopping."
-set help_msg_50 "You can use the Blaster to climb up walls. Before trying this, become familiar with the basics of Blaster movement."
-set help_msg_51 "You can control your movement in air. Use it to prevent yourself from falling off the map when somebody starts pushing you around."
-set help_msg_52 "Use the Blaster, Mortar or Devastator in space maps to push other players off the map. They will enjoy it."
-set help_msg_53 "You can turn off automatic weapon changing in the Player menu. If you configure your key bindings, manually switching weapons can be faster and easier."
-set help_msg_54 "Choose the right weapon for the job, not just the one that the game automatically puts in your hand."
-set help_msg_55 "Enter ^1'lsmaps' ${help_cfg_prefix}in the console to get a list of maps configured on the server."
-set help_msg_56 "While you are in the air, release the forward key, press one of the left/right keys and move your mouse in the same direction. This will bend your fly/jump path."
-set help_msg_57 "Hold the jump key to keep on jumping (called ^1'bunny-hopping'${help_cfg_prefix}) which will accelerate your speed."
-
-// aliases making up the actual helpsystem
-set help_tmp_index 0
-alias help_say "set help_tmp_oldnick \"$sv_adminnick\"; set sv_adminnick \"$help_cfg_nick\"; say \"$*\"; help_say2"
-alias help_say2 "set sv_adminnick \"$help_tmp_oldnick\""
-alias help_doit "sv_cmd rpn /help_tmp_msg help_msg_$help_tmp_index def; help_doit2"
-alias help_doit2 "help_say $help_cfg_prefix$help_tmp_msg"
-alias help_inc "sv_cmd rpn /help_tmp_index help_tmp_index 1 add $help_msg_count mod def"
-alias help_next "help_inc; help_doit"
-alias help_loop "help_next; defer $help_cfg_time help_loop"
index a42f7ea78e06cf81b1cdae70d771c4a9a8a23f05..bcc6e524a52e8ead946318dca2cbc9d901558a4d 100644 (file)
@@ -68,6 +68,8 @@
 // possible values: dm (deathmatch), tdm (team deathmatch), ctf (capture the flag), ca (clan arena), ft (freeze tag), kh (keyhunt), as (assault), dom (domination), lms (last man standing), ka (keepaway), inv (invasion), ons (onslaught), rc (race), cts (complete the stage), nb (nexball)
 //gametype dm  // default gamemode
 
+// TIPS: uncomment this if you want help messages on your server - one per match 20 seconds after the map loads
+//alias sv_hook_gamestart_all "defer 20 help_next"
 
 
 
 //g_maplist_votable_abstain 0  // when 1, people get a "don't care" selection in the vote screen
 //g_maplist_votable_nodetail 1 // when 1, people can't see how many voted for what (to thwart abusive "influential" first votes)
 
-//sv_vote_gametype 1           // set to 1 to enable voting for gametypes after every match
-//sv_vote_gametype_options "dm kh dom jb mygametype"   // the gametypes to vote for, custom gametypes are supported
-//sv_vote_gametype_mygametype_name "My Mode"   // Name displayed for the custom gametype "mygametype" (replace "mygametype" with the name you set in sv_vote_gametype_options)
-//sv_vote_gametype_mygametype_type "ft"        // the basetype that the custom gametype is derived from
-//sv_vote_gametype_mygametype_description "This is my custom gametype" // the description for the custom gametype
+sv_vote_gametype 1     // set to 1 to enable voting for gametypes after every match
+//sv_vote_gametype_options "dm kh dom tdm mygametype"  // the gametypes to vote for, custom gametypes are supported
+//set sv_vote_gametype_mygametype_name "My Mode"       // Name displayed for the custom gametype "mygametype" (replace "mygametype" with the name you set in sv_vote_gametype_options)
+//set sv_vote_gametype_mygametype_type "ft"    // the basetype that the custom gametype is derived from
+//set sv_vote_gametype_mygametype_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_mygametype
 
 //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.
 // No information about your server will be published - all published data sets
 // will include data from multiple servers.
 //
-sv_weaponstats_file http://www.xonotic.org/weaponbalance/
+sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 
 
 
index 41f63aaf29e202697fa3e99cc13967cac2a069c9..f516fa9bfe5c89b6d52144b2ae9f0e8147566f86 120000 (symlink)
@@ -1 +1 @@
-xonotic-linux-glx.sh
\ No newline at end of file
+xonotic-linux-sdl.sh
\ No newline at end of file
diff --git a/xonotic-linux-glx.sh b/xonotic-linux-glx.sh
deleted file mode 100755 (executable)
index 137fc4e..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-path=`dirname "${0}"`
-link=`readlink -f "${0}"`
-
-[ -n "${link}" ] && path=`dirname "${link}"`
-cd "${path}"
-
-case "${0##*/}" in
-  *dedicated*) mode="dedicated" ;;
-  *sdl*)       mode="sdl" ;;
-  *)           mode="glx" ;;
-esac
-
-case "$(uname -m)" in
-  i?86)        arch="linux32" ;;  # Not supported anymore but you can build your own.
-  *)   arch="linux64" ;;
-esac
-
-xonotic="xonotic-${arch}-${mode}"
-
-set -- ./${xonotic} "${@}"
-
-xserver=
-xlayout=
-
-setdisplay()
-{
-       VALUE=$1
-       VALUE=${VALUE#\"}
-       VALUE=${VALUE%\"}
-       case "$VALUE" in
-               :*)
-                       ;;
-               *)
-                       VALUE=:$VALUE
-                       ;;
-       esac
-       VALUE="$VALUE/"
-       xserver="${VALUE%%/*}"
-       xserver=${xserver#:}
-       xlayout=${VALUE#*/}
-       xlayout=${xlayout%/}
-}
-
-# now how do we execute it?
-if [ -r ~/.xonotic/data/config.cfg ]; then
-       while read -r CMD KEY VALUE; do
-               case "$CMD:$KEY" in
-                       seta:vid_x11_display)
-                               setdisplay "$VALUE"
-                               ;;
-               esac
-       done < ~/.xonotic/data/config.cfg
-fi
-
-m=0
-for X in "$@"; do
-       case "$m:$X" in
-               0:+vid_x11_display)
-                       m=1
-                       ;;
-               0:+vid_x11_display\ *)
-                       setdisplay "${X#+vid_x11_display }"
-                       ;;
-               1:*)
-                       setdisplay "$X"
-                       m=0
-                       ;;
-               *)
-                       ;;
-       esac
-done
-
-case "$xserver" in
-       '')
-               ;;
-       *[!0-9]*)
-               echo "Not using display ':$xserver': evil characters"
-               ;;
-       *)
-               msg=
-               lf='
-'
-               prefix=
-
-               # check for a listening X server on that socket
-               if netstat -nl | grep -F " /tmp/.X11-unix/X$xserver" >/dev/null; then
-                       # X server already exists
-                       export DISPLAY=:$xserver
-                       prefix="DISPLAY=:$xserver "
-                       msg=$msg$lf"- Running Xonotic on already existing display :$xserver"
-               else
-                       set -- startx "$@" -fullscreen -- ":$xserver"
-                       msg=$msg$lf"- Running Xonotic on a newly created X server :$xserver."
-                       case "$xlayout" in
-                               '')
-                                       ;;
-                               *[!A-Za-z0-9]*)
-                                       echo >&2 "Not using layout '$xlayout': evil characters"
-                                       xlayout=
-                                       ;;
-                               *)
-                                       set -- "$@" -layout "$xlayout"
-                                       msg=$msg$lf"- Using the ServerLayout section named $xlayout."
-                                       ;;
-                       esac
-               fi
-
-               echo "X SERVER OVERRIDES IN EFFECT:$msg"
-               echo
-               echo "Resulting command line:"
-               echo "  $prefix$*"
-               echo
-               echo "To undo these overrides, edit ~/.xonotic/data/config.cfg and remove the line"
-               echo "starting with 'seta vid_x11_display'."
-               echo
-               echo
-               ;;
-esac
-
-# if pulseaudio
-if [ -z "$SDL_AUDIODRIVER" ]; then
-       if ps -C pulseaudio >/dev/null; then
-               if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
-                       export SDL_AUDIODRIVER=pulse
-               fi
-       fi
-fi
-
-exec "$@"
deleted file mode 120000 (symlink)
index 41f63aaf29e202697fa3e99cc13967cac2a069c9..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-xonotic-linux-glx.sh
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..e2213715be0e9c320b9ec39beba23072d1ca4d44
--- /dev/null
@@ -0,0 +1,130 @@
+#!/bin/sh
+
+path=`dirname "${0}"`
+link=`readlink -f "${0}"`
+
+[ -n "${link}" ] && path=`dirname "${link}"`
+cd "${path}"
+
+case "${0##*/}" in
+  *dedicated*) mode="dedicated" ;;
+  *)           mode="sdl" ;;
+esac
+
+case "$(uname -m)" in
+  i?86)        arch="linux32" ;;  # Not supported anymore but you can build your own.
+  *)   arch="linux64" ;;
+esac
+
+xonotic="xonotic-${arch}-${mode}"
+
+set -- ./${xonotic} "${@}"
+
+xserver=
+xlayout=
+
+setdisplay()
+{
+       VALUE=$1
+       VALUE=${VALUE#\"}
+       VALUE=${VALUE%\"}
+       case "$VALUE" in
+               :*)
+                       ;;
+               *)
+                       VALUE=:$VALUE
+                       ;;
+       esac
+       VALUE="$VALUE/"
+       xserver="${VALUE%%/*}"
+       xserver=${xserver#:}
+       xlayout=${VALUE#*/}
+       xlayout=${xlayout%/}
+}
+
+# now how do we execute it?
+if [ -r ~/.xonotic/data/config.cfg ]; then
+       while read -r CMD KEY VALUE; do
+               case "$CMD:$KEY" in
+                       seta:vid_x11_display)
+                               setdisplay "$VALUE"
+                               ;;
+               esac
+       done < ~/.xonotic/data/config.cfg
+fi
+
+m=0
+for X in "$@"; do
+       case "$m:$X" in
+               0:+vid_x11_display)
+                       m=1
+                       ;;
+               0:+vid_x11_display\ *)
+                       setdisplay "${X#+vid_x11_display }"
+                       ;;
+               1:*)
+                       setdisplay "$X"
+                       m=0
+                       ;;
+               *)
+                       ;;
+       esac
+done
+
+case "$xserver" in
+       '')
+               ;;
+       *[!0-9]*)
+               echo "Not using display ':$xserver': evil characters"
+               ;;
+       *)
+               msg=
+               lf='
+'
+               prefix=
+
+               # check for a listening X server on that socket
+               if netstat -nl | grep -F " /tmp/.X11-unix/X$xserver" >/dev/null; then
+                       # X server already exists
+                       export DISPLAY=:$xserver
+                       prefix="DISPLAY=:$xserver "
+                       msg=$msg$lf"- Running Xonotic on already existing display :$xserver"
+               else
+                       set -- startx "$@" -fullscreen -- ":$xserver"
+                       msg=$msg$lf"- Running Xonotic on a newly created X server :$xserver."
+                       case "$xlayout" in
+                               '')
+                                       ;;
+                               *[!A-Za-z0-9]*)
+                                       echo >&2 "Not using layout '$xlayout': evil characters"
+                                       xlayout=
+                                       ;;
+                               *)
+                                       set -- "$@" -layout "$xlayout"
+                                       msg=$msg$lf"- Using the ServerLayout section named $xlayout."
+                                       ;;
+                       esac
+               fi
+
+               echo "X SERVER OVERRIDES IN EFFECT:$msg"
+               echo
+               echo "Resulting command line:"
+               echo "  $prefix$*"
+               echo
+               echo "To undo these overrides, edit ~/.xonotic/data/config.cfg and remove the line"
+               echo "starting with 'seta vid_x11_display'."
+               echo
+               echo
+               ;;
+esac
+
+# if pulseaudio
+if [ -z "$SDL_AUDIODRIVER" ]; then
+       if ps -C pulseaudio >/dev/null; then
+               if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
+                       export SDL_AUDIODRIVER=pulse
+               fi
+       fi
+fi
+
+exec "$@"