xonotic/xonotic.git
19 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'

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

19 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

20 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

20 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

20 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

20 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

20 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

20 months 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

20 months 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

21 months 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

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

23 months 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

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

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

23 months 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)

23 months 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

23 months 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

23 months 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

23 months 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

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

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

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

23 months 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

23 months 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

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

23 months 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

23 months 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

23 months 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)

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

23 months 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

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

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

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

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

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

23 months 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).

2 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

2 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

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

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

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

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

2 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

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

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

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

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

2 years agoStop using libd0_blind_id binaries on Linux x86_64 for ./all compile.
Rudolf Polzer [Fri, 6 Apr 2018 14:56:52 +0000 (10:56 -0400)]
Stop using libd0_blind_id binaries on Linux x86_64 for ./all compile.

2 years agomidichannels.pl: support indented commands
Rudolf Polzer [Thu, 22 Mar 2018 00:45:31 +0000 (17:45 -0700)]
midichannels.pl: support indented commands

2 years agomidichannels.pl: fix program or control change on more than one channel
Rudolf Polzer [Thu, 22 Mar 2018 00:15:46 +0000 (17:15 -0700)]
midichannels.pl: fix program or control change on more than one channel

The previous code emitted only a MIDI event for the first channel - but
we need one for all.

2 years agomidichannels.pl: document the save command (oops)
Rudolf Polzer [Thu, 22 Mar 2018 00:15:32 +0000 (17:15 -0700)]
midichannels.pl: document the save command (oops)

2 years agomidichannels.pl: Support overriding controller values too.
Rudolf Polzer [Thu, 22 Mar 2018 00:04:21 +0000 (17:04 -0700)]
midichannels.pl: Support overriding controller values too.

2 years agoUpdate cvar names used in some examples
terencehill [Wed, 21 Mar 2018 13:26:38 +0000 (14:26 +0100)]
Update cvar names used in some examples

2 years agoRestore the old value of 4 to skill in example server config
Mario [Wed, 7 Mar 2018 10:47:17 +0000 (20:47 +1000)]
Restore the old value of 4 to skill in example server config

2 years agoMerge branch 'marin-t/contributing' into 'master'
Mario [Wed, 7 Mar 2018 08:31:51 +0000 (08:31 +0000)]
Merge branch 'marin-t/contributing' into 'master'

Contributing in readme

See merge request xonotic/xonotic!28

2 years agoMerge branch 'martin-t/example-config' into 'master'
Mario [Wed, 7 Mar 2018 08:26:35 +0000 (08:26 +0000)]
Merge branch 'martin-t/example-config' into 'master'

Example config changes

See merge request xonotic/xonotic!35

2 years agolink to transifex 28/head
Martin Taibr [Mon, 26 Feb 2018 12:23:30 +0000 (13:23 +0100)]
link to transifex

2 years agonuke broken checksums
Martin Taibr [Mon, 26 Feb 2018 12:16:40 +0000 (13:16 +0100)]
nuke broken checksums

2 years agoMerge branch 'master' into marin-t/contributing
Martin Taibr [Mon, 26 Feb 2018 12:15:02 +0000 (13:15 +0100)]
Merge branch 'master' into marin-t/contributing

2 years agoMerge branch 'master' into martin-t/example-config 35/head
Martin Taibr [Fri, 23 Feb 2018 22:26:32 +0000 (23:26 +0100)]
Merge branch 'master' into martin-t/example-config

2 years agoMerge branch 'patch-1' into 'master'
Mirio [Thu, 22 Feb 2018 23:13:08 +0000 (23:13 +0000)]
Merge branch 'patch-1' into 'master'

Update server.cfg (spelling)

See merge request xonotic/xonotic!37

2 years agoUpdate server.cfg (spelling) 37/head
John Wayne [Thu, 22 Feb 2018 19:55:31 +0000 (19:55 +0000)]
Update server.cfg (spelling)

2 years agomake rcon_password more porminent
Martin Taibr [Thu, 22 Feb 2018 11:31:19 +0000 (12:31 +0100)]
make rcon_password more porminent

2 years ago.com -> .org
Martin Taibr [Wed, 21 Feb 2018 12:52:15 +0000 (13:52 +0100)]
.com -> .org

2 years agoMerge branch 'master' into martin-t/example-config
Martin Taibr [Wed, 21 Feb 2018 09:42:34 +0000 (10:42 +0100)]
Merge branch 'master' into martin-t/example-config

2 years agotypo
Martin Taibr [Wed, 21 Feb 2018 09:35:20 +0000 (10:35 +0100)]
typo

2 years agofix some links
Martin Taibr [Sun, 18 Feb 2018 19:01:01 +0000 (20:01 +0100)]
fix some links

2 years agomake sure they know it'S an example
Martin Taibr [Sun, 18 Feb 2018 18:54:53 +0000 (19:54 +0100)]
make sure they know it'S an example

2 years agoMerge branch 'martin-t/cfgs' into 'master'
Mario [Sat, 17 Feb 2018 17:38:47 +0000 (17:38 +0000)]
Merge branch 'martin-t/cfgs' into 'master'

Rename all the configs

See merge request xonotic/xonotic!36

2 years agorename all the configs 36/head
Martin Taibr [Sat, 17 Feb 2018 17:19:50 +0000 (18:19 +0100)]
rename all the configs

2 years agomore info
Martin Taibr [Sun, 11 Feb 2018 02:53:07 +0000 (03:53 +0100)]
more info

2 years agorephrase
Martin Taibr [Sun, 11 Feb 2018 02:49:14 +0000 (03:49 +0100)]
rephrase

2 years agomove rcon up
Martin Taibr [Sun, 11 Feb 2018 02:31:53 +0000 (03:31 +0100)]
move rcon up

2 years agoclarify more stuff
Martin Taibr [Sat, 10 Feb 2018 23:56:15 +0000 (00:56 +0100)]
clarify more stuff

2 years agodefault skill
Martin Taibr [Sat, 10 Feb 2018 22:37:01 +0000 (23:37 +0100)]
default skill

2 years agomisleading
Martin Taibr [Sat, 10 Feb 2018 22:36:12 +0000 (23:36 +0100)]
misleading

2 years agofix default
Martin Taibr [Sat, 10 Feb 2018 22:13:36 +0000 (23:13 +0100)]
fix default

2 years agorephrase beginning, fix typo, remove bot_number because minplayers is better
Martin Taibr [Sat, 10 Feb 2018 20:46:52 +0000 (21:46 +0100)]
rephrase beginning, fix typo, remove bot_number because minplayers is better

2 years agoMerge branch 'DefaultUser/zsh_autocomplete' into 'master'
Martin Taibr [Sat, 10 Feb 2018 02:40:56 +0000 (02:40 +0000)]
Merge branch 'DefaultUser/zsh_autocomplete' into 'master'

Add zsh autocompletion for the all script

See merge request xonotic/xonotic!33

2 years agoAllow cloning and updating via GitLab
Mario [Sat, 3 Feb 2018 02:15:27 +0000 (12:15 +1000)]
Allow cloning and updating via GitLab

2 years agoMerge branch 'packer/readme-fix' into 'master'
Martin Taibr [Thu, 25 Jan 2018 08:49:05 +0000 (08:49 +0000)]
Merge branch 'packer/readme-fix' into 'master'

README must either link to COPYING or the COPYING file must be renamed to LICENSE.

See merge request xonotic/xonotic!31

2 years agoAdd recommended servers
Mirio [Tue, 9 Jan 2018 23:11:26 +0000 (23:11 +0000)]
Add recommended servers

2 years agoImprove zsh autocomplete descriptions 33/head
Freddy [Sat, 6 Jan 2018 14:36:51 +0000 (15:36 +0100)]
Improve zsh autocomplete descriptions

2 years agoMerge branch 'packer/help' into 'master'
Mirio [Tue, 2 Jan 2018 15:17:22 +0000 (15:17 +0000)]
Merge branch 'packer/help' into 'master'

get rid of quotation marks

See merge request xonotic/xonotic!34

2 years agoget rid of quotation marks 34/head
packer [Tue, 2 Jan 2018 14:59:24 +0000 (15:59 +0100)]
get rid of quotation marks

2 years agoAdd zsh autocompletion for the all script
Freddy [Tue, 2 Jan 2018 14:05:28 +0000 (15:05 +0100)]
Add zsh autocompletion for the all script

2 years agoMust either link to COPYING or the COPYING file must be renamed to LICENSE. 31/head
packer- [Thu, 19 Oct 2017 18:19:17 +0000 (18:19 +0000)]
Must either link to COPYING or the COPYING file must be renamed to LICENSE.

2 years agoChange license to GPL-3 for all code (essentially this means we now can accept contri...
Rudolf Polzer [Tue, 17 Oct 2017 00:48:28 +0000 (20:48 -0400)]
Change license to GPL-3 for all code (essentially this means we now can accept contributions that do not allow GPL2 but only GPL3 or later).

Reference: http://xonpickbot.designxenon.com:27500/poll/362

2 years agoRemove linux 32bit binary support.
Rudolf Polzer [Tue, 17 Oct 2017 00:34:23 +0000 (20:34 -0400)]
Remove linux 32bit binary support.

Linux 32bit users can still compile using ./all but releases will no
longer include these builds.

Reference: http://xonpickbot.designxenon.com:27500/poll/364

2 years agoreword
Martin Taibr [Wed, 13 Sep 2017 02:48:07 +0000 (04:48 +0200)]
reword

2 years agoreword
Martin Taibr [Wed, 13 Sep 2017 02:41:51 +0000 (04:41 +0200)]
reword

2 years agoexplain autobuild/git, mention PR
Martin Taibr [Wed, 13 Sep 2017 02:37:34 +0000 (04:37 +0200)]
explain autobuild/git, mention PR

2 years agoMerge branch 'packer/help' into 'master'
Mirio [Tue, 29 Aug 2017 13:12:34 +0000 (13:12 +0000)]
Merge branch 'packer/help' into 'master'

use https, update urls (use the ones available at xonotic.org)

See merge request !30

2 years agouse https, update urls (use the ones available at xonotic.org) 29/head 30/head
packer [Tue, 29 Aug 2017 09:52:00 +0000 (11:52 +0200)]
use https, update urls (use the ones available at xonotic.org)

2 years agobe less specific
Martin Taibr [Sun, 13 Aug 2017 16:27:53 +0000 (18:27 +0200)]
be less specific

2 years agonix: only install final qcc output, and install it into bin
TimePath [Thu, 3 Aug 2017 12:08:51 +0000 (22:08 +1000)]
nix: only install final qcc output, and install it into bin

2 years agoUpdate CMakeLists.txt
TimePath [Wed, 2 Aug 2017 12:38:07 +0000 (22:38 +1000)]
Update CMakeLists.txt

2 years agonix: create a composed shell derivation
TimePath [Wed, 2 Aug 2017 11:29:06 +0000 (21:29 +1000)]
nix: create a composed shell derivation

2 years agonix: update netradiant derivation
TimePath [Tue, 1 Aug 2017 11:38:19 +0000 (21:38 +1000)]
nix: update netradiant derivation