xonotic/xonotic.git
3 months agogmqcc: the usual branch now is main. master
Rudolf Polzer [Mon, 15 Jun 2020 23:33:37 +0000 (19:33 -0400)]
gmqcc: the usual branch now is main.

If your local checkout is offended (as in, broken) by this, run:

./all checkout

to bring everything in order again.

3 months agotransifex.cron: actually push new strings
Rudolf Polzer [Fri, 29 May 2020 21:59:46 +0000 (23:59 +0200)]
transifex.cron: actually push new strings

3 months agoAdd -nocrashdialog to scripts that automate a game session, to ensure they are not...
Mario [Tue, 26 May 2020 14:55:34 +0000 (00:55 +1000)]
Add -nocrashdialog to scripts that automate a game session, to ensure they are not stopped by a popup error message

3 months agoMerge branch 'bones_was_here/norelpk3' into 'master'
Mario [Tue, 26 May 2020 06:56:22 +0000 (06:56 +0000)]
Merge branch 'bones_was_here/norelpk3' into 'master'

Release builds: build the qcsrc with "make qc" instead of "make all"

Closes #223

See merge request xonotic/xonotic!68

3 months agoRelease builds: build the qcsrc with "make qc" instead of "all" 68/head
bones_was_here [Tue, 26 May 2020 06:14:12 +0000 (16:14 +1000)]
Release builds: build the qcsrc with "make qc" instead of "all"

3 months agoDon't create a top-level gmqcc directory since there are no prebuilt GMQCC binaries...
Mario [Sun, 24 May 2020 18:16:06 +0000 (04:16 +1000)]
Don't create a top-level gmqcc directory since there are no prebuilt GMQCC binaries to pull from, fixes #218

3 months agoDisable feature branches in the release script, since they no longer exist
Mario [Sun, 24 May 2020 17:51:49 +0000 (03:51 +1000)]
Disable feature branches in the release script, since they no longer exist

4 months agoMerge branch 'linux-desktop-prefer-non-default-gpu' into 'master'
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

4 months agoRequest the dedicated GPU when starting Xonotic from the `.desktop` file 66/head
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.

4 months agoWhen building a release, build only gmqcc, not all the other stuff.
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.

5 months agoMerge branch 'bones_was_here/improve-serverbench' into 'master'
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

5 months agoRemove temp dir at ^C, kill, terminal closed, broken pipe, segfault, etc as well... 62/head
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

5 months agoFix omission of user supplied args
bones_was_here [Sun, 12 Apr 2020 21:32:45 +0000 (07:32 +1000)]
Fix omission of user supplied args

5 months agoUse lowercase hidden temp dir for serverbench
bones_was_here [Sun, 12 Apr 2020 21:11:24 +0000 (07:11 +1000)]
Use lowercase hidden temp dir for serverbench

5 months agoMerge branch 'bones_was_here/gitignorewebsite' into 'master'
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

5 months agoAvoid untracked files issues when having xonotic.org repo enabled 65/head
bones_was_here [Tue, 7 Apr 2020 14:40:48 +0000 (00:40 +1000)]
Avoid untracked files issues when having xonotic.org repo enabled

6 months agoMerge branch 'bones_was_here/curlhttpsfix' into 'master'
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

6 months agoEnable http redirects for curl and request https for beta.xonotic.org 64/head
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

6 months agoMerge branch 'bones_was_here/autobuildlno' into 'master'
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

6 months agoInclude line numbers in autobuild/beta qc crashes
bones_was_here [Thu, 19 Mar 2020 21:31:06 +0000 (21:31 +0000)]
Include line numbers in autobuild/beta qc crashes

6 months agoUpdate sv_vote_commands in server.cfg to match current default
Mario [Sat, 14 Mar 2020 01:33:41 +0000 (11:33 +1000)]
Update sv_vote_commands in server.cfg to match current default

8 months agoFix netradiant compile to put the q3map2 binary in the path where the compile script...
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.

8 months agorename daemon to daemon-glue
Martin Taibr [Fri, 10 Jan 2020 16:45:23 +0000 (17:45 +0100)]
rename daemon to daemon-glue

8 months agoTurn off cl_movement on the screenshot server.
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.

8 months agolink to trranslation guide
Martin Taibr [Wed, 1 Jan 2020 11:33:44 +0000 (12:33 +0100)]
link to trranslation guide

8 months agoreban for faking activity
Martin Taibr [Fri, 27 Dec 2019 08:45:22 +0000 (09:45 +0100)]
reban for faking activity

8 months agoRemove some old banned IPs for the Xonotic 0.8.2 server, add a note about the system...
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

9 months agoAdd more information to fpsclassico ban reason (adds a spectator bot posing as a...
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)

9 months agoUpdate COPYING - user branch naming scheme is not enforced
Martin Taibr [Sun, 24 Nov 2019 00:09:02 +0000 (00:09 +0000)]
Update COPYING - user branch naming scheme is not enforced

10 months agoreban
Martin Taibr [Sat, 9 Nov 2019 21:55:10 +0000 (22:55 +0100)]
reban

10 months agodupe
Martin Taibr [Sat, 2 Nov 2019 20:16:18 +0000 (21:16 +0100)]
dupe

10 months agoreban
Martin Taibr [Sat, 2 Nov 2019 20:14:38 +0000 (21:14 +0100)]
reban

10 months agoreban
Martin Taibr [Sat, 2 Nov 2019 16:10:34 +0000 (17:10 +0100)]
reban

10 months agoreban server faking activity
Martin Taibr [Sat, 2 Nov 2019 13:46:08 +0000 (14:46 +0100)]
reban server faking activity

11 months agoMerge branch 'cmake-q3map2' into 'master'
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

11 months agoxonotic-map-compiler infrastructure script: allow running "from scratch".
Rudolf Polzer [Fri, 11 Oct 2019 16:41:47 +0000 (18:41 +0200)]
xonotic-map-compiler infrastructure script: allow running "from scratch".

11 months agoMake xonotic-map-compiler use cmake.
Rudolf Polzer [Fri, 11 Oct 2019 16:38:08 +0000 (18:38 +0200)]
Make xonotic-map-compiler use cmake.

11 months agoImprove serverbench command WRT #273 (fix)
bones_was_here [Sat, 5 Oct 2019 14:06:28 +0000 (00:06 +1000)]
Improve serverbench command WRT #273 (fix)

11 months agoImprove serverbench command WRT #273
bones_was_here [Wed, 2 Oct 2019 17:34:22 +0000 (03:34 +1000)]
Improve serverbench command WRT #273

11 months agoMerge branch 'nyov/wikiexporter' into 'master'
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

11 months agoMerge branch 'packer/cached-converter' into 'master'
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

11 months agoMerge branch 'translate_desktop' into 'master'
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

11 months agoMerge branch 'master' into 'translate_desktop' 57/head
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

11 months agofutureproof -r default
Martin Taibr [Fri, 27 Sep 2019 13:15:49 +0000 (15:15 +0200)]
futureproof -r default

11 months agoMerge branch 'all-default-to-release' into 'master'
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

11 months agoBuild an optimized release binary when using `./all compile` by default 60/head
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.

11 months agoMerge branch 'translate-desktop-appdata-french' into 'master'
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

11 months agoMerge branch 'martin-t/vbots' into 'master'
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

12 months agoTranslate desktop files and AppData to French 61/head
Hugo Locurcio [Fri, 20 Sep 2019 20:00:47 +0000 (22:00 +0200)]
Translate desktop files and AppData to French

12 months agomatch skill in example config to default 52/head
Martin Taibr [Wed, 11 Sep 2019 23:36:24 +0000 (01:36 +0200)]
match skill in example config to default

12 months agoUpdate "Xonotic 0.8.2 Server" IP in ban list
Mario [Tue, 3 Sep 2019 19:23:29 +0000 (05:23 +1000)]
Update "Xonotic 0.8.2 Server" IP in ban list

12 months agoRestore yet another weird path in SDL lib configs
Mario [Mon, 26 Aug 2019 02:44:10 +0000 (12:44 +1000)]
Restore yet another weird path in SDL lib configs

12 months agoRestore weird paths in the SDL lib configs
Mario [Sun, 25 Aug 2019 01:25:24 +0000 (11:25 +1000)]
Restore weird paths in the SDL lib configs

12 months agoFix a weird hardcoded references to a non-existent directory in sdl2-config causing...
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

12 months agoMerge branch 'Mario/sdl2_update' into 'master'
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

12 months agoRevert "Update Windows 32 bit SDL build dependency to 2.0.10"
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.

12 months agoTranslate desktop files and AppData to German
Wuzzy [Fri, 23 Aug 2019 14:02:45 +0000 (16:02 +0200)]
Translate desktop files and AppData to German

13 months agodon't suggest fullbright - is default already
Martin Taibr [Wed, 21 Aug 2019 13:47:13 +0000 (15:47 +0200)]
don't suggest fullbright - is default already

13 months agoInclude the extension when checking for the Windows dedicated binary in the icon...
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

13 months agoUpdate "Xonotic 0.8.2 Server" IP in the ban list
Mario [Mon, 19 Aug 2019 12:56:26 +0000 (22:56 +1000)]
Update "Xonotic 0.8.2 Server" IP in the ban list

13 months agoMerge branch 'Mario/no_dedicated_win_icon' into 'master'
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

13 months agoDon't add the Xonotic icon to the dedicated server Windows binaries, this will help... 56/head
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

13 months agoMerge branch 'Mario/release_nexcompat' into 'master'
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

13 months agoInclude the nexcompat package in low and high release zips 55/head
Mario [Mon, 19 Aug 2019 09:52:41 +0000 (19:52 +1000)]
Include the nexcompat package in low and high release zips

13 months agoUpdate xonotic-glx.desktop to match the SDL file
Mario [Mon, 19 Aug 2019 08:39:56 +0000 (18:39 +1000)]
Update xonotic-glx.desktop to match the SDL file

13 months agosuggest editing bots command
Martin Taibr [Sun, 18 Aug 2019 16:49:03 +0000 (18:49 +0200)]
suggest editing bots command

13 months agoMerge branch 'master' into martin-t/vbots
Martin Taibr [Sun, 18 Aug 2019 16:47:11 +0000 (18:47 +0200)]
Merge branch 'master' into martin-t/vbots

13 months agoMerge branch 'Mario/glx_build' into 'master'
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

13 months agoAdd the Linux scripts back as proper symlinks 53/head
BuildTools [Sun, 18 Aug 2019 07:46:24 +0000 (17:46 +1000)]
Add the Linux scripts back as proper symlinks

13 months agoRemove broken symlinks
Mario [Sun, 18 Aug 2019 07:37:00 +0000 (17:37 +1000)]
Remove broken symlinks

13 months agoPoint xonotic-linux-dedicated.sh to the correct script
Mario [Sun, 18 Aug 2019 07:01:23 +0000 (17:01 +1000)]
Point xonotic-linux-dedicated.sh to the correct script

13 months agoUndo the inclusion of WGL binaries in the release script
Mario [Sun, 18 Aug 2019 07:00:13 +0000 (17:00 +1000)]
Undo the inclusion of WGL binaries in the release script

13 months agoUpdate the binary names in the FAQ
Mario [Sun, 18 Aug 2019 06:58:31 +0000 (16:58 +1000)]
Update the binary names in the FAQ

13 months agoRestore the GLX binary on Linux systems
Mario [Sun, 18 Aug 2019 06:53:12 +0000 (16:53 +1000)]
Restore the GLX binary on Linux systems

13 months agoadd bots, nobots
Martin Taibr [Thu, 1 Aug 2019 08:02:46 +0000 (10:02 +0200)]
add bots, nobots

14 months agoall: compile q3map2 using cmake cmake-q3map2 45/head
Thomas Debesse [Sun, 14 Oct 2018 04:18:50 +0000 (06:18 +0200)]
all: compile q3map2 using cmake

14 months agoBan the fpsclassico.de server for faking activity
Mario [Tue, 25 Jun 2019 09:46:20 +0000 (19:46 +1000)]
Ban the fpsclassico.de server for faking activity

15 months agoHide the recommended servers category until a better system can be implemented
Mario [Mon, 3 Jun 2019 21:18:06 +0000 (07:18 +1000)]
Hide the recommended servers category until a better system can be implemented

16 months agoMerge branch 'martin-t/ban-fakes' into 'master'
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

16 months agoban the server faking activity yet again 51/head
Martin Taibr [Wed, 22 May 2019 21:36:46 +0000 (23:36 +0200)]
ban the server faking activity yet again

17 months agoexplain alias name limit in example config
Martin Taibr [Sat, 13 Apr 2019 16:45:18 +0000 (18:45 +0200)]
explain alias name limit in example config

17 months agoBlock the newly appearing Rexuiz servers
Mario [Sun, 31 Mar 2019 12:33:30 +0000 (22:33 +1000)]
Block the newly appearing Rexuiz servers

18 months agotreat .subr as shell in vscode
Martin Taibr [Fri, 15 Mar 2019 19:30:12 +0000 (20:30 +0100)]
treat .subr as shell in vscode

19 months agoDocument minplayers_per_team in the example server.cfg
Mario [Tue, 12 Feb 2019 09:04:42 +0000 (19:04 +1000)]
Document minplayers_per_team in the example server.cfg

22 months agoDocument "all compile -1"
terencehill [Tue, 20 Nov 2018 13:32:30 +0000 (14:32 +0100)]
Document "all compile -1"

22 months agoFix "all run" trying to run a no longer supported executable (wgl or glx), it now...
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

22 months ago$F contains file extension... 48/head
packer [Tue, 13 Nov 2018 16:12:03 +0000 (17:12 +0100)]
$F contains file extension...

23 months agoMerge branch 'desktop-fix' into 'master'
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

23 months agoUpdate desktop/AppData files 47/head
AsciiWolf [Mon, 22 Oct 2018 14:08:10 +0000 (16:08 +0200)]
Update desktop/AppData files

23 months agoMerge branch 'asciiwolf/xonotic-appdata'
Mario [Fri, 19 Oct 2018 21:12:24 +0000 (07:12 +1000)]
Merge branch 'asciiwolf/xonotic-appdata'

23 months agoMerge branch 'asciiwolf/xonotic-makefile-fix'
Mario [Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)]
Merge branch 'asciiwolf/xonotic-makefile-fix'

23 months agoRemove support for the glx binary.
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.

23 months agoMerge branch 'patch-1' into '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

23 months agoMerge branch 'Mario/win64_v2' into 'master'
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

23 months agoAttempt to detect when X64 Windows is being used 44/head
Mario [Mon, 1 Oct 2018 09:48:17 +0000 (19:48 +1000)]
Attempt to detect when X64 Windows is being used

23 months agoMerge branch 'martin-t/help' into 'master'
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

23 months agodocument tips in example config 43/head
Martin Taibr [Sat, 29 Sep 2018 14:44:15 +0000 (16:44 +0200)]
document tips in example config

23 months agomove help.cfg to data repo
Martin Taibr [Sat, 29 Sep 2018 14:14:30 +0000 (16:14 +0200)]
move help.cfg to data repo

2 years agoFix map autoscreenshot script taking all screenshots from the same position, and...
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

2 years agoEnable gametype voting by default in the example server config
Mario [Sun, 9 Sep 2018 19:34:47 +0000 (05:34 +1000)]
Enable gametype voting by default in the example server config