]> git.xonotic.org Git - xonotic/xonotic.git/log
xonotic/xonotic.git
4 years agoImprove serverbench command WRT #273
bones_was_here [Wed, 2 Oct 2019 17:34:22 +0000 (03:34 +1000)]
Improve serverbench command WRT #273

4 years 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

4 years 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

4 years 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

4 years 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

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

4 years 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

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

4 years 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

4 years 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

4 years 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

4 years agomatch skill in example config to default
Martin Taibr [Wed, 11 Sep 2019 23:36:24 +0000 (01:36 +0200)]
match skill in example config to default

4 years 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

4 years 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

4 years 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

4 years 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

4 years 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

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

4 years 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

4 years 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

4 years 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

4 years 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

4 years 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

4 years 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

4 years 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

4 years 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

4 years 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

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

4 years 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

4 years 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

4 years 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

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

4 years 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

4 years 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

4 years 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

4 years 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

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

4 years 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

4 years 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

4 years 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

4 years 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

5 years 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

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

5 years 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

5 years 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

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

5 years 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

5 years ago$F contains file extension...
packer [Tue, 13 Nov 2018 16:12:03 +0000 (17:12 +0100)]
$F contains file extension...

5 years 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

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

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

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

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

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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

5 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

5 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

5 years agoBan "Linus Torvalds' Fan Server" again for faking activity
Mario [Sun, 2 Sep 2018 16:12:44 +0000 (02:12 +1000)]
Ban "Linus Torvalds' Fan Server" again for faking activity

5 years agoAdd AppData file
AsciiWolf [Sat, 21 Jul 2018 00:40:52 +0000 (02:40 +0200)]
Add AppData file

5 years agoFix Makefile
AsciiWolf [Sat, 21 Jul 2018 00:31:33 +0000 (02:31 +0200)]
Fix Makefile

5 years agoMerge branch 'northivanastan/docs-cvars' into 'master'
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

5 years agounix2dos 39/head
Martin Taibr [Sat, 30 Jun 2018 21:52:22 +0000 (23:52 +0200)]
unix2dos

5 years agoi always hated that "tip"
Martin Taibr [Sat, 30 Jun 2018 19:20:58 +0000 (21:20 +0200)]
i always hated that "tip"

5 years agoReplace Unix line endings with Windows line endings (attempt 1)
Ivan Stanton [Thu, 28 Jun 2018 18:04:29 +0000 (18:04 +0000)]
Replace Unix line endings with Windows line endings (attempt 1)

5 years agoRemove cvar defaults from scorelog.txt
Ivan Stanton [Thu, 28 Jun 2018 17:19:25 +0000 (17:19 +0000)]
Remove cvar defaults from scorelog.txt

5 years agoRemove cvar defaults from eventlog.txt
Ivan Stanton [Thu, 28 Jun 2018 17:17:51 +0000 (17:17 +0000)]
Remove cvar defaults from eventlog.txt

5 years agoCompletely remove cvar defaults from mapdownload.txt
Ivan Stanton [Thu, 28 Jun 2018 17:16:30 +0000 (17:16 +0000)]
Completely remove cvar defaults from mapdownload.txt

5 years agoRevert "Since Halogene's Newbie Corner is now in the docs master, no need for…"
Ivan Stanton [Thu, 28 Jun 2018 17:08:54 +0000 (17:08 +0000)]
Revert "Since Halogene's Newbie Corner is now in the docs master, no need for…"

This reverts commit 4d77ee731bf4e0286dd81da2006a83fdd6fe31a3

5 years agoSince Halogene's Newbie Corner is now in the docs master, no need for basics.aft...
Ivan Stanton [Thu, 28 Jun 2018 16:58:21 +0000 (16:58 +0000)]
Since Halogene's Newbie Corner is now in the docs master, no need for basics.aft, which was left uncompiled anyway.

5 years agoAdd a simplified version of Halogene's Newbie Corner, with images removed for now.
Ivan Stanton [Thu, 28 Jun 2018 16:56:21 +0000 (16:56 +0000)]
Add a simplified version of Halogene's Newbie Corner, with images removed for now.

5 years agoUpdate cvars in mapdownload.txt
Ivan Stanton [Thu, 28 Jun 2018 16:27:24 +0000 (16:27 +0000)]
Update cvars in mapdownload.txt

5 years agoMerge branch 'northivanastan/documentation' into 'master'
Martin Taibr [Thu, 28 Jun 2018 02:38:38 +0000 (02:38 +0000)]
Merge branch 'northivanastan/documentation' into 'master'

Update the documentation and replace faq.html with a Markdown copy of the website FAQ

Closes #220

See merge request xonotic/xonotic!38

5 years agoRemove another unnecessary html tag for now 38/head
Ivan Stanton [Thu, 28 Jun 2018 01:51:24 +0000 (01:51 +0000)]
Remove another unnecessary html tag for now

5 years agoSince compile options are found in the maps pk3, no need for outdated compile settings.
Ivan Stanton [Thu, 28 Jun 2018 00:23:50 +0000 (00:23 +0000)]
Since compile options are found in the maps pk3, no need for outdated compile settings.

5 years agoSince we are using Markdown, there is no need for outdated HTML copy
Ivan Stanton [Wed, 27 Jun 2018 22:32:45 +0000 (22:32 +0000)]
Since we are using Markdown, there is no need for outdated HTML copy

5 years agoUpdate weapon names in eventlog.txt
Ivan Stanton [Wed, 27 Jun 2018 22:31:39 +0000 (22:31 +0000)]
Update weapon names in eventlog.txt

5 years agoAt least two of these no longer exist in Xonotic. Not sure what to do with final_rage...
Ivan Stanton [Wed, 27 Jun 2018 22:30:09 +0000 (22:30 +0000)]
At least two of these no longer exist in Xonotic. Not sure what to do with final_rage (different id) and reslimed (remade as afterslime)

5 years agoSince the documentation is now in markdown format, there is no need to keep the old...
Ivan Stanton [Wed, 27 Jun 2018 22:21:52 +0000 (22:21 +0000)]
Since the documentation is now in markdown format, there is no need to keep the old AFT docs.

5 years agoSimplify faq.markdown, removing references to other pages on xonotic.org for now...
Ivan Stanton [Wed, 27 Jun 2018 22:20:21 +0000 (22:20 +0000)]
Simplify faq.markdown, removing references to other pages on xonotic.org for now and moving to the main directory

5 years agoMirror the Xonotic FAQ from the website.
Ivan Stanton [Wed, 27 Jun 2018 21:54:21 +0000 (21:54 +0000)]
Mirror the Xonotic FAQ from the website.

5 years agofix help messages
Martin Taibr [Sun, 24 Jun 2018 19:47:07 +0000 (21:47 +0200)]
fix help messages

5 years agoTypo: pkg -> pk3
Rudolf Polzer [Fri, 15 Jun 2018 18:46:49 +0000 (20:46 +0200)]
Typo: pkg -> pk3

5 years agoMap screenshot server: also already screenshot maps in a branch that's incomplete.
Rudolf Polzer [Fri, 15 Jun 2018 18:35:05 +0000 (20:35 +0200)]
Map screenshot server: also already screenshot maps in a branch that's incomplete.

The branch then will be retried until complete, and skipped in the future only then.

5 years agoMap screenshot server: when downloading maps for a branch fails, still try screenshot...
Rudolf Polzer [Fri, 15 Jun 2018 18:26:46 +0000 (20:26 +0200)]
Map screenshot server: when downloading maps for a branch fails, still try screenshotting other branches.

5 years agoAdd a way to not compile d0_blind_id (./all compile -1).
Rudolf Polzer [Wed, 13 Jun 2018 20:01:44 +0000 (22:01 +0200)]
Add a way to not compile d0_blind_id (./all compile -1).

5 years agoRemove references to arena gamemode in the mapping Docs
Mario [Tue, 15 May 2018 04:13:00 +0000 (14:13 +1000)]
Remove references to arena gamemode in the mapping Docs

5 years agoBlock fake jeff servers, hosted by Best servers
Mirio [Wed, 9 May 2018 20:23:58 +0000 (22:23 +0200)]
Block fake jeff servers, hosted by Best servers

5 years agonix: build csprogs pk3
TimePath [Sat, 5 May 2018 13:25:06 +0000 (23:25 +1000)]
nix: build csprogs pk3

5 years agonix: fix crypto
TimePath [Sat, 5 May 2018 09:11:12 +0000 (19:11 +1000)]
nix: fix crypto

5 years agonix: fix `--argstr cc $compiler`
TimePath [Sat, 5 May 2018 09:09:08 +0000 (19:09 +1000)]
nix: fix `--argstr cc $compiler`

5 years agoBlock it by IP instead (key support currently missing)
Mario [Tue, 1 May 2018 12:11:15 +0000 (22:11 +1000)]
Block it by IP instead (key support currently missing)

5 years agoBlock Xonotic 0.8.2 - Deathmatch Server for faking activity
Mario [Tue, 1 May 2018 12:07:01 +0000 (22:07 +1000)]
Block  Xonotic 0.8.2 - Deathmatch Server for faking activity

5 years agonix: fix dedicated servers
TimePath [Sun, 22 Apr 2018 04:19:10 +0000 (14:19 +1000)]
nix: fix dedicated servers

5 years agonix: build docker images
TimePath [Sat, 21 Apr 2018 12:30:26 +0000 (22:30 +1000)]
nix: build docker images

5 years agonix: invert isCode condition
TimePath [Sat, 21 Apr 2018 07:15:02 +0000 (17:15 +1000)]
nix: invert isCode condition

5 years agoUpdate nix build
TimePath [Sat, 21 Apr 2018 05:12:41 +0000 (15:12 +1000)]
Update nix build