]>
git.xonotic.org Git - xonotic/xonotic.git/log
Freddy [Tue, 20 Apr 2021 16:02:08 +0000 (18:02 +0200)]
mapping-helper.sh: put maps in "maps" directory
Freddy [Thu, 21 May 2020 14:24:41 +0000 (16:24 +0200)]
Simple script to help (standalone) map setup
Martin Taibr [Mon, 11 May 2020 00:34:21 +0000 (00:34 +0000)]
Merge branch 'linux-desktop-prefer-non-default-gpu' into 'master'
Request the dedicated GPU when starting Xonotic from the `.desktop` file
See <https://www.hadess.net/2020/05/dual-gpu-support-launch-on-discrete-gpu.html> for more information about this newly added `.desktop` entry property.
See merge request xonotic/xonotic!66
Hugo Locurcio [Wed, 6 May 2020 19:18:47 +0000 (21:18 +0200)]
Request the dedicated GPU when starting Xonotic from the `.desktop` file
See <https://www.hadess.net/2020/05/dual-gpu-support-launch-on-discrete-gpu.html>
for more information about this newly added `.desktop` entry property.
Rudolf Polzer [Fri, 24 Apr 2020 00:18:07 +0000 (20:18 -0400)]
When building a release, build only gmqcc, not all the other stuff.
Martin Taibr [Sun, 12 Apr 2020 22:52:54 +0000 (22:52 +0000)]
Merge branch 'bones_was_here/improve-serverbench' into 'master'
Improve serverbench command WRT #273
- Use a temporary directory for the files previously created in the repo with -nohome (eg lock, data/data/defaultSVQC.cfg). This is better than just deleting the files as it will still work if the files created change, and won't annoy a user who is running their normal server or client with -nohome.
- Gitignore the temp directory, so it won't get committed if the serverbench was interrupted.
- Use dedicated instead of requiring it as an argument, previously without args it would run in threaded server mode which is considered unstable and doesn't run properly in this useage.
Resolves #273
See merge request xonotic/xonotic!62
bones_was_here [Sun, 12 Apr 2020 22:02:24 +0000 (08:02 +1000)]
Remove temp dir at ^C, kill, terminal closed, broken pipe, segfault, etc as well as script exit
bones_was_here [Sun, 12 Apr 2020 21:32:45 +0000 (07:32 +1000)]
Fix omission of user supplied args
bones_was_here [Sun, 12 Apr 2020 21:11:24 +0000 (07:11 +1000)]
Use lowercase hidden temp dir for serverbench
Martin Taibr [Wed, 8 Apr 2020 01:10:38 +0000 (01:10 +0000)]
Merge branch 'bones_was_here/gitignorewebsite' into 'master'
Avoid untracked files issues when having xonotic.org repo enabled
See merge request xonotic/xonotic!65
bones_was_here [Tue, 7 Apr 2020 14:40:48 +0000 (00:40 +1000)]
Avoid untracked files issues when having xonotic.org repo enabled
Martin Taibr [Sat, 21 Mar 2020 06:11:57 +0000 (06:11 +0000)]
Merge branch 'bones_was_here/curlhttpsfix' into 'master'
Enable http redirects for curl and request https for beta.xonotic.org
Closes #301
See merge request xonotic/xonotic!64
bones_was_here [Sat, 21 Mar 2020 05:54:44 +0000 (15:54 +1000)]
Enable http redirects for curl and request https for beta.xonotic.org
Martin Taibr [Thu, 19 Mar 2020 21:31:06 +0000 (21:31 +0000)]
Merge branch 'bones_was_here/autobuildlno' into 'master'
Include line numbers in autobuild/beta qc crashes
Closes #300
See merge request xonotic/xonotic!63
bones_was_here [Thu, 19 Mar 2020 21:31:06 +0000 (21:31 +0000)]
Include line numbers in autobuild/beta qc crashes
Mario [Sat, 14 Mar 2020 01:33:41 +0000 (11:33 +1000)]
Update sv_vote_commands in server.cfg to match current default
Rudolf Polzer [Sun, 12 Jan 2020 04:19:58 +0000 (05:19 +0100)]
Fix netradiant compile to put the q3map2 binary in the path where the compile script expects it.
Martin Taibr [Fri, 10 Jan 2020 16:45:23 +0000 (17:45 +0100)]
rename daemon to daemon-glue
Rudolf Polzer [Tue, 7 Jan 2020 01:21:18 +0000 (02:21 +0100)]
Turn off cl_movement on the screenshot server.
It might be the cause of "all screenshots equal".
Impulses are run as part of player movement packet processing, but nextframe
uses StartFrame, and there's no 1:1 relation between the two. With cl_movement
0, there is.
Martin Taibr [Wed, 1 Jan 2020 11:33:44 +0000 (12:33 +0100)]
link to trranslation guide
Martin Taibr [Fri, 27 Dec 2019 08:45:22 +0000 (09:45 +0100)]
reban for faking activity
Mario [Wed, 25 Dec 2019 15:17:27 +0000 (01:17 +1000)]
Remove some old banned IPs for the Xonotic 0.8.2 server, add a note about the system supporting 16 servers
Mario [Tue, 26 Nov 2019 00:01:35 +0000 (10:01 +1000)]
Add more information to fpsclassico ban reason (adds a spectator bot posing as a client when empty)
Martin Taibr [Sun, 24 Nov 2019 00:09:02 +0000 (00:09 +0000)]
Update COPYING - user branch naming scheme is not enforced
Martin Taibr [Sat, 9 Nov 2019 21:55:10 +0000 (22:55 +0100)]
reban
Martin Taibr [Sat, 2 Nov 2019 20:16:18 +0000 (21:16 +0100)]
dupe
Martin Taibr [Sat, 2 Nov 2019 20:14:38 +0000 (21:14 +0100)]
reban
Martin Taibr [Sat, 2 Nov 2019 16:10:34 +0000 (17:10 +0100)]
reban
Martin Taibr [Sat, 2 Nov 2019 13:46:08 +0000 (14:46 +0100)]
reban server faking activity
Rudolf Polzer [Fri, 11 Oct 2019 16:43:37 +0000 (16:43 +0000)]
Merge branch 'cmake-q3map2' into 'master'
all: compile q3map2 using cmake
See merge request xonotic/xonotic!45
Rudolf Polzer [Fri, 11 Oct 2019 16:41:47 +0000 (18:41 +0200)]
xonotic-map-compiler infrastructure script: allow running "from scratch".
Rudolf Polzer [Fri, 11 Oct 2019 16:38:08 +0000 (18:38 +0200)]
Make xonotic-map-compiler use cmake.
bones_was_here [Sat, 5 Oct 2019 14:06:28 +0000 (00:06 +1000)]
Improve serverbench command WRT #273 (fix)
bones_was_here [Wed, 2 Oct 2019 17:34:22 +0000 (03:34 +1000)]
Improve serverbench command WRT #273
Mario [Mon, 30 Sep 2019 04:41:33 +0000 (04:41 +0000)]
Merge branch 'nyov/wikiexporter' into 'master'
redmine wiki crawler
See merge request xonotic/xonotic!3
Mario [Mon, 30 Sep 2019 04:38:37 +0000 (04:38 +0000)]
Merge branch 'packer/cached-converter' into 'master'
cached-converter: check file extensions correctly
Closes xonotic-data.pk3dir#2158
See merge request xonotic/xonotic!48
Mario [Sat, 28 Sep 2019 00:59:56 +0000 (00:59 +0000)]
Merge branch 'translate_desktop' into 'master'
Translate desktop files and AppData to German
See merge request xonotic/xonotic!57
Wuzzy [Fri, 27 Sep 2019 20:47:09 +0000 (20:47 +0000)]
Merge branch 'master' into 'translate_desktop'
# Conflicts:
# misc/logos/xonotic-glx.desktop
# misc/logos/xonotic.appdata.xml
# misc/logos/xonotic.desktop
Martin Taibr [Fri, 27 Sep 2019 13:15:49 +0000 (15:15 +0200)]
futureproof -r default
Mario [Fri, 27 Sep 2019 11:39:10 +0000 (11:39 +0000)]
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
Hugo Locurcio [Fri, 20 Sep 2019 18:14:19 +0000 (20:14 +0200)]
Build an optimized release binary when using `./all compile` by default
This prevents players who download the source code to build and play
from using an unoptimized debug build by forgetting to pass the `-r`
switch.
Compiling a debug build is now done by passing `-d`.
The `-r` flag is still supported for compatibility with existing
scripts.
Mario [Fri, 27 Sep 2019 00:02:15 +0000 (00:02 +0000)]
Merge branch 'translate-desktop-appdata-french' into 'master'
Translate desktop files and AppData to French
See merge request xonotic/xonotic!61
Mario [Wed, 25 Sep 2019 23:51:52 +0000 (23:51 +0000)]
Merge branch 'martin-t/vbots' into 'master'
Add bots, nobots, document new bot skill
See merge request xonotic/xonotic!52
Hugo Locurcio [Fri, 20 Sep 2019 20:00:47 +0000 (22:00 +0200)]
Translate desktop files and AppData to French
Martin Taibr [Wed, 11 Sep 2019 23:36:24 +0000 (01:36 +0200)]
match skill in example config to default
Mario [Tue, 3 Sep 2019 19:23:29 +0000 (05:23 +1000)]
Update "Xonotic 0.8.2 Server" IP in ban list
Mario [Mon, 26 Aug 2019 02:44:10 +0000 (12:44 +1000)]
Restore yet another weird path in SDL lib configs
Mario [Sun, 25 Aug 2019 01:25:24 +0000 (11:25 +1000)]
Restore weird paths in the SDL lib configs
Mario [Sat, 24 Aug 2019 06:13:16 +0000 (16:13 +1000)]
Fix a weird hardcoded references to a non-existent directory in sdl2-config causing MSYS2 builds to fail
Rudolf Polzer [Sat, 24 Aug 2019 00:04:31 +0000 (00:04 +0000)]
Merge branch 'Mario/sdl2_update' into 'master'
Update macOS and Windows SDL dependencies to 2.0.10
See merge request xonotic/xonotic!54
Mario [Sat, 24 Aug 2019 00:04:30 +0000 (00:04 +0000)]
Revert "Update Windows 32 bit SDL build dependency to 2.0.10"
This reverts commit
d2cdd999d3d7214b2da17099df63b3b409b0ae23 .
Wuzzy [Fri, 23 Aug 2019 14:02:45 +0000 (16:02 +0200)]
Translate desktop files and AppData to German
Martin Taibr [Wed, 21 Aug 2019 13:47:13 +0000 (15:47 +0200)]
don't suggest fullbright - is default already
Mario [Tue, 20 Aug 2019 03:34:53 +0000 (13:34 +1000)]
Include the extension when checking for the Windows dedicated binary in the icon script
Mario [Mon, 19 Aug 2019 12:56:26 +0000 (22:56 +1000)]
Update "Xonotic 0.8.2 Server" IP in the ban list
Mario [Mon, 19 Aug 2019 10:15:37 +0000 (10:15 +0000)]
Merge branch 'Mario/no_dedicated_win_icon' into 'master'
Merge branch Mario/no_dedicated_win_icon (XXS merge request)
Closes #216
See merge request xonotic/xonotic!56
Mario [Mon, 19 Aug 2019 10:09:30 +0000 (20:09 +1000)]
Don't add the Xonotic icon to the dedicated server Windows binaries, this will help reduce the confusion where players launch the wrong executable and are unable to play
Mario [Mon, 19 Aug 2019 10:01:47 +0000 (10:01 +0000)]
Merge branch 'Mario/release_nexcompat' into 'master'
Merge branch Mario/release_nexcompat (XS merge request)
Closes #219
See merge request xonotic/xonotic!55
Mario [Mon, 19 Aug 2019 09:52:41 +0000 (19:52 +1000)]
Include the nexcompat package in low and high release zips
Mario [Mon, 19 Aug 2019 08:39:56 +0000 (18:39 +1000)]
Update xonotic-glx.desktop to match the SDL file
Martin Taibr [Sun, 18 Aug 2019 16:49:03 +0000 (18:49 +0200)]
suggest editing bots command
Martin Taibr [Sun, 18 Aug 2019 16:47:11 +0000 (18:47 +0200)]
Merge branch 'master' into martin-t/vbots
Mario [Sun, 18 Aug 2019 08:10:48 +0000 (08:10 +0000)]
Merge branch 'Mario/glx_build' into 'master'
Merge branch Mario/glx_build (M merge request)
See merge request xonotic/xonotic!53
BuildTools [Sun, 18 Aug 2019 07:46:24 +0000 (17:46 +1000)]
Add the Linux scripts back as proper symlinks
Mario [Sun, 18 Aug 2019 07:37:00 +0000 (17:37 +1000)]
Remove broken symlinks
Mario [Sun, 18 Aug 2019 07:01:23 +0000 (17:01 +1000)]
Point xonotic-linux-dedicated.sh to the correct script
Mario [Sun, 18 Aug 2019 07:00:13 +0000 (17:00 +1000)]
Undo the inclusion of WGL binaries in the release script
Mario [Sun, 18 Aug 2019 06:58:31 +0000 (16:58 +1000)]
Update the binary names in the FAQ
Mario [Sun, 18 Aug 2019 06:53:12 +0000 (16:53 +1000)]
Restore the GLX binary on Linux systems
Martin Taibr [Thu, 1 Aug 2019 08:02:46 +0000 (10:02 +0200)]
add bots, nobots
Thomas Debesse [Sun, 14 Oct 2018 04:18:50 +0000 (06:18 +0200)]
all: compile q3map2 using cmake
Mario [Tue, 25 Jun 2019 09:46:20 +0000 (19:46 +1000)]
Ban the fpsclassico.de server for faking activity
Mario [Mon, 3 Jun 2019 21:18:06 +0000 (07:18 +1000)]
Hide the recommended servers category until a better system can be implemented
Mario [Thu, 23 May 2019 03:34:00 +0000 (03:34 +0000)]
Merge branch 'martin-t/ban-fakes' into 'master'
Ban the server faking activity yet again
See merge request xonotic/xonotic!51
Martin Taibr [Wed, 22 May 2019 21:36:46 +0000 (23:36 +0200)]
ban the server faking activity yet again
Martin Taibr [Sat, 13 Apr 2019 16:45:18 +0000 (18:45 +0200)]
explain alias name limit in example config
Mario [Sun, 31 Mar 2019 12:33:30 +0000 (22:33 +1000)]
Block the newly appearing Rexuiz servers
Martin Taibr [Fri, 15 Mar 2019 19:30:12 +0000 (20:30 +0100)]
treat .subr as shell in vscode
Mario [Tue, 12 Feb 2019 09:04:42 +0000 (19:04 +1000)]
Document minplayers_per_team in the example server.cfg
terencehill [Tue, 20 Nov 2018 13:32:30 +0000 (14:32 +0100)]
Document "all compile -1"
terencehill [Tue, 20 Nov 2018 13:31:04 +0000 (14:31 +0100)]
Fix "all run" trying to run a no longer supported executable (wgl or glx), it now runs the sdl one
packer [Tue, 13 Nov 2018 16:12:03 +0000 (17:12 +0100)]
$F contains file extension...
Mario [Mon, 22 Oct 2018 18:49:02 +0000 (18:49 +0000)]
Merge branch 'desktop-fix' into 'master'
Update desktop/AppData files
See merge request xonotic/xonotic!47
AsciiWolf [Mon, 22 Oct 2018 14:08:10 +0000 (16:08 +0200)]
Update desktop/AppData files
Mario [Fri, 19 Oct 2018 21:12:24 +0000 (07:12 +1000)]
Merge branch 'asciiwolf/xonotic-appdata'
Mario [Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)]
Merge branch 'asciiwolf/xonotic-makefile-fix'
Rudolf Polzer [Wed, 17 Oct 2018 16:28:19 +0000 (09:28 -0700)]
Remove support for the glx binary.
Fixes compile with DP from master.
Rudolf Polzer [Wed, 17 Oct 2018 16:14:19 +0000 (16:14 +0000)]
Merge branch 'patch-1' into 'master'
Update .desktop files to Freedesktop standards Issue #159
See merge request xonotic/xonotic!17
Mario [Tue, 2 Oct 2018 14:44:49 +0000 (14:44 +0000)]
Merge branch 'Mario/win64_v2' into 'master'
Merge branch Mario/win64_v2 (S merge request)
See merge request xonotic/xonotic!44
Mario [Mon, 1 Oct 2018 09:48:17 +0000 (19:48 +1000)]
Attempt to detect when X64 Windows is being used
Mario [Sun, 30 Sep 2018 05:52:47 +0000 (05:52 +0000)]
Merge branch 'martin-t/help' into 'master'
Move help to data repo
See merge request xonotic/xonotic!43
Martin Taibr [Sat, 29 Sep 2018 14:44:15 +0000 (16:44 +0200)]
document tips in example config
Martin Taibr [Sat, 29 Sep 2018 14:14:30 +0000 (16:14 +0200)]
move help.cfg to data repo
Mario [Tue, 11 Sep 2018 18:22:31 +0000 (04:22 +1000)]
Fix map autoscreenshot script taking all screenshots from the same position, and don't show waypoints in the screenshots, also don't use config.cfg
Mario [Sun, 9 Sep 2018 19:34:47 +0000 (05:34 +1000)]
Enable gametype voting by default in the example server config
Mario [Sun, 2 Sep 2018 16:12:44 +0000 (02:12 +1000)]
Ban "Linus Torvalds' Fan Server" again for faking activity
AsciiWolf [Sat, 21 Jul 2018 00:40:52 +0000 (02:40 +0200)]
Add AppData file
AsciiWolf [Sat, 21 Jul 2018 00:31:33 +0000 (02:31 +0200)]
Fix Makefile
Martin Taibr [Mon, 2 Jul 2018 07:19:59 +0000 (07:19 +0000)]
Merge branch 'northivanastan/docs-cvars' into 'master'
Another update to the documentation - add Halogene's Newbie Corner (fix #227 and #228)
Closes #227 and #228
See merge request xonotic/xonotic!39
Martin Taibr [Sat, 30 Jun 2018 21:52:22 +0000 (23:52 +0200)]
unix2dos