From: bones_was_here Date: Tue, 18 Jul 2023 13:24:25 +0000 (+1000) Subject: Upgrade DarkPlaces Engine X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=26e308d30e6af149c1b2ba48698f2c79163c7510;p=xonotic%2Fxonotic.git Upgrade DarkPlaces Engine --- diff --git a/Docs/faq.md b/Docs/faq.md index 5c2a3ce8..1b55203a 100644 --- a/Docs/faq.md +++ b/Docs/faq.md @@ -14,7 +14,7 @@ aliases: **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? @@ -42,7 +42,7 @@ Another aspect of the logo is the center ring, which has some similarities to th The most likely reason Xonotic won't start is that you've accidentally launched the dedicated server (e.g. `xonotic-linux64-dedicated`) which runs silently in the background. It shares a lockfile (`~/.xonotic/lock`) with the normal executable and prevents it from launching. Kill any processes which have xonotic in the name (you might also need to remove the lockfile manually) and try again. -Use the executables with sdl or glx in their name to launch Xonotic. +Use the executable or script with "sdl" in the name to launch Xonotic. ## I can't launch Xonotic on macOS Sierra or later @@ -87,14 +87,12 @@ If none of that helps, you can try compiling Xonotic from [source](http://gitlab ## The sound is broken, it crackles and stutters -Try run xonotic-wgl.exe instead of xonotic.exe (on Windows). Adding the command line options -sndspeed 48000 and/or -sndstereo can also help on some systems (on Linux, Mac, Windows). +Adding the command line options -sndspeed 48000 and/or -sndstereo may help on some systems (on Linux, Mac, Windows). -## Mouse is too slow and sensitivity is at top (on Mac / Linux) +## Mouse is too slow and sensitivity is at top on Mac Mac: The default mouse acceleration on Mac is very high and strange. The Xonotic defaults work fine with it but some mouse drivers seem to 'correct' the mouse acceleration and conflict with the Xonotic defaults. Try to **disable the option Disable system mouse acceleration** in the Settings->Input menu. Or the same via console: `apple_mouse_noaccel 0; vid_restart` ([How do I open the console?]({{< relref "#how-do-i-open-the-console" >}})) -Linux: A similar problem can arise on Linux. It's also Disable system mouse acceleration in the Settings->Input menu but the console command is different (and only available in the glx executable): `vid_dga 0; vid_restart` ([How do I open the console?]({{< relref "#how-do-i-open-the-console" >}})) - ## I can't switch to 32 bit color depth (on Windows) Check if your desktop color depth is set to 32 bits per pixel. If it's just set to 16, Xonotic can't switch to 32 bit mode. @@ -105,7 +103,7 @@ Use our [issue tracker](http://gitlab.com/xonotic/xonotic-data.pk3dir/issues) on If you want to investigate crashes further: -On Linux: In a terminal, `cd` into your Xonotic installation directory, execute `catchsegv ./xonotic-linux64-sdl -condebug -developer > crash.txt 2>&1` and give the file crash.txt to the developers. Note that you can also use `./xonotic-linux64-glx`. +On Linux: In a terminal, `cd` into your Xonotic installation directory, execute `catchsegv ./xonotic-linux64-sdl -condebug -developer > crash.txt 2>&1` and give the file crash.txt to the developers. 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. @@ -139,7 +137,7 @@ There are multiple [unofficial map repositories](https://gitlab.com/xonotic/xono ## 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 script will use the correct working directory, and if applicable, select the correct engine binary for your platform. ## How do I open the console? diff --git a/misc/logos/xonotic-glx.desktop b/misc/logos/xonotic-glx.desktop deleted file mode 100644 index e8873c88..00000000 --- a/misc/logos/xonotic-glx.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Xonotic (GLX) -Comment=Multiplayer, deathmatch oriented first person shooter -Comment[de]=Deathmatch- und Mehrspieler-orientierter Ego-Shooter -Comment[fr]=Jeu de tir à la première personne multijoueur -Icon=xonotic -Exec=xonotic-glx -Terminal=false -PrefersNonDefaultGPU=true -StartupNotify=false -Categories=Game;ActionGame; diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr index 95b97385..68f092a2 100644 --- a/misc/tools/all/config.subr +++ b/misc/tools/all/config.subr @@ -8,7 +8,7 @@ allrepos() "$@" data/xonotic-music.pk3dir xonotic-music.pk3dir.git master "" "$@" data/xonotic-nexcompat.pk3dir xonotic-nexcompat.pk3dir.git master "no" "$@" data/xonotic-xoncompat.pk3dir xonotic-xoncompat.pk3dir.git main "no" - "$@" darkplaces darkplaces.git div0-stable "svn" + "$@" darkplaces darkplaces.git master "" "$@" netradiant netradiant.git master "" "$@" div0-gittools div0-gittools.git master "no" "$@" d0_blind_id d0_blind_id.git master "" diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index a00566fb..4b85e2eb 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -174,7 +174,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/buildfiles/osx misc/logos misc/tools server xonotic-linux-glx.sh xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile key_0.d0pk COPYING GPL-2 GPL-3 + release_git_extract_dir "." "Xonotic" Docs misc/buildfiles/osx misc/logos misc/tools server xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile key_0.d0pk COPYING GPL-2 GPL-3 ( verbose cd Xonotic verbose mkdir data source source/darkplaces source/gmqcc source/d0_blind_id mapping @@ -311,8 +311,8 @@ case "$cmd" in #verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false #$good verbose "$SELF" release-compile win32 \ - 'D3D=1 DP_MAKE_TARGET=mingw WIN32RELEASE=1 CC="i686-w64-mingw32-gcc -static -flto=auto -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" WINDRES="i686-w64-mingw32-windres" SDL_CONFIG="../../../.deps/bin/sdl2-config" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=dlopen' \ - release 'darkplaces.exe:Xonotic/xonotic-x86-wgl.exe darkplaces-sdl.exe:Xonotic/xonotic-x86.exe darkplaces-dedicated.exe:Xonotic/xonotic-x86-dedicated.exe' + 'DP_MAKE_TARGET=mingw WIN32RELEASE=1 CC="i686-w64-mingw32-gcc -static -flto=auto -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib" WINDRES="i686-w64-mingw32-windres" SDL_CONFIG="../../../.deps/bin/sdl2-config" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=dlopen' \ + release 'darkplaces-sdl.exe:Xonotic/xonotic-x86.exe darkplaces-dedicated.exe:Xonotic/xonotic-x86-dedicated.exe' ;; release-engine-win64) release_common @@ -321,8 +321,8 @@ case "$cmd" in #verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false #$good verbose "$SELF" release-compile win64 \ - 'D3D=1 DP_MAKE_TARGET=mingw WIN64RELEASE=1 CC="x86_64-w64-mingw32-gcc -static -flto=auto -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG="../../../.deps/bin/sdl2-config" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=dlopen' \ - release 'darkplaces.exe:Xonotic/xonotic-wgl.exe darkplaces-sdl.exe:Xonotic/xonotic.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe' + 'DP_MAKE_TARGET=mingw WIN64RELEASE=1 CC="x86_64-w64-mingw32-gcc -static -flto=auto -Wl,--dynamicbase -Wl,--nxcompat -I../../../.deps/include -L../../../.deps/lib" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG="../../../.deps/bin/sdl2-config" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=dlopen' \ + release 'darkplaces-sdl.exe:Xonotic/xonotic.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe' ;; release-engine-osx) release_common @@ -333,7 +333,7 @@ case "$cmd" in # Note: travis build script also had SDLCONFIG_MACOSX* flags; need to check if they're still needed with osxcross. # Note: Mac bins cannot be stripped by the standard tool. verbose "$SELF" release-compile osx \ - 'STRIP=: DP_MAKE_TARGET=macosx PATH="$HOME/osxcross/out/bin:$PATH" CC="$HOME/osxcross/out/bin/o64-clang -flto -arch x86_64 -mmacosx-version-min=10.6 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" SDLCONFIG_MACOSXCFLAGS="-I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXSTATICLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=shared' \ + 'STRIP=: DP_MAKE_TARGET=macosx PATH="$HOME/osxcross/out/bin:$PATH" CC="$HOME/osxcross/out/bin/o64-clang -flto -arch x86_64 -mmacosx-version-min=10.6 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../.deps/include -L../../../.deps/lib" SDLCONFIG_MACOSXCFLAGS="-I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXSTATICLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=shared' \ release 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' ;; release-engine-linux64) @@ -344,8 +344,8 @@ case "$cmd" in #verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false #$good verbose "$SELF" release-compile linux64 \ - 'CC="gcc -m64 -flto=auto -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" DP_LINK_CRYPTO=shared LIB_CRYPTO="../../../.deps/lib/libd0_blind_id.a ../../../.deps/lib/libgmp.a" DP_LINK_CRYPTO_RIJNDAEL=shared DP_LINK_JPEG=shared LIB_JPEG=/usr/lib/x86_64-linux-gnu/libjpeg.a DP_LINK_ODE=shared CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" LIB_ODE="../../../.deps/lib/libode.a -lstdc++ -pthread" DP_LINK_ZLIB=shared' \ - release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' + 'CC="gcc -m64 -flto=auto -I../../../.deps/include -L../../../.deps/lib" DP_LINK_CRYPTO=shared LIB_CRYPTO="../../../.deps/lib/libd0_blind_id.a ../../../.deps/lib/libgmp.a" DP_LINK_CRYPTO_RIJNDAEL=shared DP_LINK_JPEG=shared LIB_JPEG=/usr/lib/x86_64-linux-gnu/libjpeg.a DP_LINK_ODE=shared CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" LIB_ODE="../../../.deps/lib/libode.a -lstdc++ -pthread" DP_LINK_ZLIB=shared' \ + release 'darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' ;; release-engine) release_common diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 0f65ac26..63f7fa71 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -32,7 +32,6 @@ case "$cmd" in if [ -z "$CC" ]; then export CC="gcc" fi - export CC="$CC -DSUPPORTIPV6" while :; do case "$1" in -0) diff --git a/xonotic-linux-glx.sh b/xonotic-linux-glx.sh deleted file mode 120000 index f516fa9b..00000000 --- a/xonotic-linux-glx.sh +++ /dev/null @@ -1 +0,0 @@ -xonotic-linux-sdl.sh \ No newline at end of file diff --git a/xonotic-linux-sdl.sh b/xonotic-linux-sdl.sh index bec83477..be8feddf 100755 --- a/xonotic-linux-sdl.sh +++ b/xonotic-linux-sdl.sh @@ -8,7 +8,6 @@ cd "${path}" || exit 1 case "${0##*/}" in *dedicated*) mode="dedicated" ;; - *glx*) mode="glx" ;; *) mode="sdl" ;; esac