xonotic/xonotic.git
2 weeks agoMerge branch 'sev/xolonium4_2' into 'master' master 58/merge
Mario [Wed, 18 Nov 2020 20:12:03 +0000 (20:12 +0000)]
Merge branch 'sev/xolonium4_2' into 'master'

Update Xolonium fonts to version 4.2

See merge request xonotic/xonotic!72

2 weeks agoUpdate Xolonium fonts to version 4.2
Severin Meyer [Wed, 18 Nov 2020 19:52:41 +0000 (20:52 +0100)]
Update Xolonium fonts to version 4.2

3 weeks agoMerge branch 'bones_was_here/build.cron' into 'master'
Mario [Sun, 8 Nov 2020 16:14:14 +0000 (16:14 +0000)]
Merge branch 'bones_was_here/build.cron' into 'master'

Update xonotic-release-build.cron to the current version from srv03

See merge request xonotic/xonotic!71

3 weeks agoUpdate xonotic-release-build.cron to the current version from srv03
bones_was_here [Sun, 8 Nov 2020 16:08:11 +0000 (02:08 +1000)]
Update xonotic-release-build.cron to the current version from srv03

3 weeks agoDisable the German Git host of Xonotic until it can be repaired
Mario [Sun, 8 Nov 2020 04:59:51 +0000 (14:59 +1000)]
Disable the German Git host of Xonotic until it can be repaired

6 weeks agoMerge branch 'update-windows-dlls' into 'master'
Mario [Sat, 17 Oct 2020 00:27:25 +0000 (00:27 +0000)]
Merge branch 'update-windows-dlls' into 'master'

Update Windows DLLs

Closes #303 and #307

See merge request xonotic/xonotic!69

7 weeks agoAvoid using nested quotes in the map screenshot script
Mario [Wed, 14 Oct 2020 23:13:57 +0000 (09:13 +1000)]
Avoid using nested quotes in the map screenshot script

4 months agolibjpeg (libjpeg-turbo) 2.0.5
incognico [Tue, 7 Jul 2020 13:26:26 +0000 (15:26 +0200)]
libjpeg (libjpeg-turbo) 2.0.5

4 months agolibcurl 7.71.1
incognico [Tue, 7 Jul 2020 13:20:32 +0000 (15:20 +0200)]
libcurl 7.71.1

4 months agoMerge remote-tracking branch 'upstream/master' into update-windows-dlls
incognico [Tue, 7 Jul 2020 13:18:52 +0000 (15:18 +0200)]
Merge remote-tracking branch 'upstream/master' into update-windows-dlls

5 months agogmqcc: the usual branch now is main. amade/cleanup_includes
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.

5 months agoOops, add missing cygpopt-0.dll
incognico [Sat, 13 Jun 2020 17:28:52 +0000 (17:28 +0000)]
Oops, add missing cygpopt-0.dll

5 months agolibcurl-4.dll (7.70.0.0) with support for http2
incognico [Fri, 12 Jun 2020 16:21:28 +0000 (16:21 +0000)]
libcurl-4.dll (7.70.0.0) with support for http2

5 months agoUpdate rsync.exe, chmod.exe, and cygwin dlls too
incognico [Tue, 9 Jun 2020 08:37:43 +0000 (08:37 +0000)]
Update rsync.exe, chmod.exe, and cygwin dlls too

5 months agoRebuild with --enable-libccd
incognico [Tue, 9 Jun 2020 07:56:41 +0000 (07:56 +0000)]
Rebuild with --enable-libccd

5 months agoadd libode3 as optional, now it actually works and does not crash
incognico [Tue, 9 Jun 2020 07:30:14 +0000 (07:30 +0000)]
add libode3 as optional, now it actually works and does not crash

5 months agozlib1.dll - 1.2.11
incognico [Sun, 7 Jun 2020 21:58:34 +0000 (21:58 +0000)]
zlib1.dll - 1.2.11

5 months agoogg.dll -> libogg-0.dll
incognico [Sun, 7 Jun 2020 21:58:26 +0000 (21:58 +0000)]
ogg.dll -> libogg-0.dll

5 months agolibwinpthread-1.dll - 8.0.0.5906.c9a21571 (dependency of libgcc_s_dw2-1.dll)
incognico [Sun, 7 Jun 2020 21:57:51 +0000 (21:57 +0000)]
libwinpthread-1.dll - 8.0.0.5906.c9a21571 (dependency of libgcc_s_dw2-1.dll)

5 months agovorbisfile.dll -> libvorbisfile-3.dll
incognico [Sun, 7 Jun 2020 21:57:31 +0000 (21:57 +0000)]
vorbisfile.dll -> libvorbisfile-3.dll

5 months agovorbisenc.dll -> libvorbisenc-2.dll
incognico [Sun, 7 Jun 2020 21:57:14 +0000 (21:57 +0000)]
vorbisenc.dll -> libvorbisenc-2.dll

5 months agolibvorbisfile-3.dll - 1.3.6
incognico [Sun, 7 Jun 2020 21:56:54 +0000 (21:56 +0000)]
libvorbisfile-3.dll - 1.3.6

5 months agolibvorbisenc-2.dll - 1.3.6
incognico [Sun, 7 Jun 2020 21:56:43 +0000 (21:56 +0000)]
libvorbisenc-2.dll - 1.3.6

5 months agovorbis.dll -> libvorbis-0.dll
incognico [Sun, 7 Jun 2020 21:56:19 +0000 (21:56 +0000)]
vorbis.dll -> libvorbis-0.dll

5 months agolibvorbis-0.dll - 1.3.6
incognico [Sun, 7 Jun 2020 21:56:05 +0000 (21:56 +0000)]
libvorbis-0.dll - 1.3.6

5 months agolibtheora.dll -> libtheora-0.dll
incognico [Sun, 7 Jun 2020 21:55:48 +0000 (21:55 +0000)]
libtheora.dll -> libtheora-0.dll

5 months agolibtheora-0.dll 1.1.1
incognico [Sun, 7 Jun 2020 21:55:16 +0000 (21:55 +0000)]
libtheora-0.dll 1.1.1

5 months agolibpng16-16.dll - 1.6.37
incognico [Sun, 7 Jun 2020 21:54:47 +0000 (21:54 +0000)]
libpng16-16.dll - 1.6.37

5 months agolibogg-0.dll - 1.3.4
incognico [Sun, 7 Jun 2020 21:54:27 +0000 (21:54 +0000)]
libogg-0.dll - 1.3.4

5 months agolibjpeg.dll - 2.0.4 (jpeg-turbo)
incognico [Sun, 7 Jun 2020 21:54:10 +0000 (21:54 +0000)]
libjpeg.dll - 2.0.4 (jpeg-turbo)

5 months agolibgmp-10.dll - 6.2.0
incognico [Sun, 7 Jun 2020 21:53:58 +0000 (21:53 +0000)]
libgmp-10.dll - 6.2.0

5 months agolibgcc_s_dw2-1.dll - 10.1.0 (dependency)
incognico [Sun, 7 Jun 2020 21:52:04 +0000 (21:52 +0000)]
libgcc_s_dw2-1.dll - 10.1.0 (dependency)

5 months agolibfreetype-6.dll - 2.10.2
incognico [Sun, 7 Jun 2020 21:51:43 +0000 (21:51 +0000)]
libfreetype-6.dll - 2.10.2

5 months agolibcurl-4.dll - 7.70.0.0
incognico [Sun, 7 Jun 2020 21:51:31 +0000 (21:51 +0000)]
libcurl-4.dll - 7.70.0.0

5 months agolibpng15-15.dll -> libpng16-16.dll
incognico [Sun, 7 Jun 2020 21:50:36 +0000 (21:50 +0000)]
libpng15-15.dll -> libpng16-16.dll

5 months agochmod -x
incognico [Sun, 7 Jun 2020 21:50:20 +0000 (21:50 +0000)]
chmod -x

5 months agozlib1.dll - 1.2.11
incognico [Sun, 7 Jun 2020 21:48:46 +0000 (21:48 +0000)]
zlib1.dll - 1.2.11

5 months agolibpng16-16.dll - 1.6.37
incognico [Sun, 7 Jun 2020 21:48:30 +0000 (21:48 +0000)]
libpng16-16.dll - 1.6.37

5 months agolibvorbisenc.dll -> libvorbisenc-2.dll
incognico [Sun, 7 Jun 2020 21:48:11 +0000 (21:48 +0000)]
libvorbisenc.dll -> libvorbisenc-2.dll

5 months agolibvorbisfile.dll -> libvorbisfile-3.dll
incognico [Sun, 7 Jun 2020 21:46:58 +0000 (21:46 +0000)]
libvorbisfile.dll -> libvorbisfile-3.dll

5 months agolibvorbisfile-3.dll - 1.3.6
incognico [Sun, 7 Jun 2020 21:46:44 +0000 (21:46 +0000)]
libvorbisfile-3.dll - 1.3.6

5 months agolibvorbisenc-2.dll - 1.3.6
incognico [Sun, 7 Jun 2020 21:46:27 +0000 (21:46 +0000)]
libvorbisenc-2.dll - 1.3.6

5 months agolibvorbis.dll -> libvorbis-0.dll
incognico [Sun, 7 Jun 2020 21:46:07 +0000 (21:46 +0000)]
libvorbis.dll -> libvorbis-0.dll

5 months agolibvorbis-0.dll - 1.3.6
incognico [Sun, 7 Jun 2020 21:45:41 +0000 (21:45 +0000)]
libvorbis-0.dll - 1.3.6

5 months agochmod -x
incognico [Sun, 7 Jun 2020 21:45:05 +0000 (21:45 +0000)]
chmod -x

5 months agolibtheora.dll -> libtheora-0.dll
incognico [Sun, 7 Jun 2020 21:44:19 +0000 (21:44 +0000)]
libtheora.dll -> libtheora-0.dll

5 months agolibtheora-0.dll 1.1.1
incognico [Sun, 7 Jun 2020 21:43:57 +0000 (21:43 +0000)]
libtheora-0.dll 1.1.1

5 months agolibpng15-15.dll -> libpng16-16.dll
incognico [Sun, 7 Jun 2020 21:43:39 +0000 (21:43 +0000)]
libpng15-15.dll -> libpng16-16.dll

5 months agolibogg.dll -> libogg-0.dll
incognico [Sun, 7 Jun 2020 21:42:38 +0000 (21:42 +0000)]
libogg.dll -> libogg-0.dll

5 months agolibogg-0.dll - 1.3.4
incognico [Sun, 7 Jun 2020 21:42:13 +0000 (21:42 +0000)]
libogg-0.dll - 1.3.4

5 months agolibjpeg.dll - 2.0.4 (jpeg-turbo)
incognico [Sun, 7 Jun 2020 21:41:57 +0000 (21:41 +0000)]
libjpeg.dll - 2.0.4 (jpeg-turbo)

5 months agolibgmp-10.dll - 6.2.0
incognico [Sun, 7 Jun 2020 21:41:42 +0000 (21:41 +0000)]
libgmp-10.dll - 6.2.0

5 months agolibfreetype-6.dll - 2.10.2
incognico [Sun, 7 Jun 2020 21:41:29 +0000 (21:41 +0000)]
libfreetype-6.dll - 2.10.2

5 months agolibcurl-4.dll - 7.70.0.0
incognico [Sun, 7 Jun 2020 21:40:16 +0000 (21:40 +0000)]
libcurl-4.dll - 7.70.0.0

5 months agoDelete libstdc++-6.dll, not required anymore
nico [Sun, 7 Jun 2020 21:36:17 +0000 (21:36 +0000)]
Delete libstdc++-6.dll, not required anymore

5 months agoDelete libgcc_s_sjlj-1.dll, it was required by the remove libode-3.dll
nico [Sun, 7 Jun 2020 21:30:20 +0000 (21:30 +0000)]
Delete libgcc_s_sjlj-1.dll, it was required by the remove libode-3.dll

5 months agoDelete libode-3.dll, it is not loaded by the client on Windows and if it is, the...
nico [Sun, 7 Jun 2020 21:29:41 +0000 (21:29 +0000)]
Delete libode-3.dll, it is not loaded by the client on Windows and if it is, the game will crash

5 months agoDelete libode-3.dll, it is not loaded by the client on Windows and if it is, the...
nico [Sun, 7 Jun 2020 21:29:12 +0000 (21:29 +0000)]
Delete libode-3.dll, it is not loaded by the client on Windows and if it is, the game will crash

6 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

6 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

6 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

6 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"

6 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

6 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

6 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

6 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.

7 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.

7 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

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

7 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

7 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

7 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

7 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

8 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

8 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

8 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

8 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

8 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

10 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.

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

10 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.

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

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

11 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

12 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)

12 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

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

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

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

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

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

13 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

13 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".

13 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.

13 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)

14 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

14 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

14 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

14 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

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