]>
git.rm.cloudns.org Git - xonotic/xonotic.git/log
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
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
Martin Taibr [Mon, 26 Feb 2018 12:23:30 +0000 (13:23 +0100)]
link to transifex
Martin Taibr [Mon, 26 Feb 2018 12:16:40 +0000 (13:16 +0100)]
nuke broken checksums
Martin Taibr [Mon, 26 Feb 2018 12:15:02 +0000 (13:15 +0100)]
Merge branch 'master' into marin-t/contributing
Martin Taibr [Fri, 23 Feb 2018 22:26:32 +0000 (23:26 +0100)]
Merge branch 'master' into martin-t/example-config
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
John Wayne [Thu, 22 Feb 2018 19:55:31 +0000 (19:55 +0000)]
Update server.cfg (spelling)
Martin Taibr [Thu, 22 Feb 2018 11:31:19 +0000 (12:31 +0100)]
make rcon_password more porminent
Martin Taibr [Wed, 21 Feb 2018 12:52:15 +0000 (13:52 +0100)]
.com -> .org
Martin Taibr [Wed, 21 Feb 2018 09:42:34 +0000 (10:42 +0100)]
Merge branch 'master' into martin-t/example-config
Martin Taibr [Wed, 21 Feb 2018 09:35:20 +0000 (10:35 +0100)]
typo
Martin Taibr [Sun, 18 Feb 2018 19:01:01 +0000 (20:01 +0100)]
fix some links
Martin Taibr [Sun, 18 Feb 2018 18:54:53 +0000 (19:54 +0100)]
make sure they know it'S an example
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
Martin Taibr [Sat, 17 Feb 2018 17:19:50 +0000 (18:19 +0100)]
rename all the configs
Martin Taibr [Sun, 11 Feb 2018 02:53:07 +0000 (03:53 +0100)]
more info
Martin Taibr [Sun, 11 Feb 2018 02:49:14 +0000 (03:49 +0100)]
rephrase
Martin Taibr [Sun, 11 Feb 2018 02:31:53 +0000 (03:31 +0100)]
move rcon up
Martin Taibr [Sat, 10 Feb 2018 23:56:15 +0000 (00:56 +0100)]
clarify more stuff
Martin Taibr [Sat, 10 Feb 2018 22:37:01 +0000 (23:37 +0100)]
default skill
Martin Taibr [Sat, 10 Feb 2018 22:36:12 +0000 (23:36 +0100)]
misleading
Martin Taibr [Sat, 10 Feb 2018 22:13:36 +0000 (23:13 +0100)]
fix default
Martin Taibr [Sat, 10 Feb 2018 20:46:52 +0000 (21:46 +0100)]
rephrase beginning, fix typo, remove bot_number because minplayers is better
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
Mario [Sat, 3 Feb 2018 02:15:27 +0000 (12:15 +1000)]
Allow cloning and updating via GitLab
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
Mirio [Tue, 9 Jan 2018 23:11:26 +0000 (23:11 +0000)]
Add recommended servers
Freddy [Sat, 6 Jan 2018 14:36:51 +0000 (15:36 +0100)]
Improve zsh autocomplete descriptions
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
packer [Tue, 2 Jan 2018 14:59:24 +0000 (15:59 +0100)]
get rid of quotation marks
Freddy [Tue, 2 Jan 2018 14:05:28 +0000 (15:05 +0100)]
Add zsh autocompletion for the all script
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.
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
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
Martin Taibr [Wed, 13 Sep 2017 02:48:07 +0000 (04:48 +0200)]
reword
Martin Taibr [Wed, 13 Sep 2017 02:41:51 +0000 (04:41 +0200)]
reword
Martin Taibr [Wed, 13 Sep 2017 02:37:34 +0000 (04:37 +0200)]
explain autobuild/git, mention PR
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
packer [Tue, 29 Aug 2017 09:52:00 +0000 (11:52 +0200)]
use https, update urls (use the ones available at xonotic.org)
Martin Taibr [Sun, 13 Aug 2017 16:27:53 +0000 (18:27 +0200)]
be less specific
TimePath [Thu, 3 Aug 2017 12:08:51 +0000 (22:08 +1000)]
nix: only install final qcc output, and install it into bin
TimePath [Wed, 2 Aug 2017 12:38:07 +0000 (22:38 +1000)]
Update CMakeLists.txt
TimePath [Wed, 2 Aug 2017 11:29:06 +0000 (21:29 +1000)]
nix: create a composed shell derivation
TimePath [Tue, 1 Aug 2017 11:38:19 +0000 (21:38 +1000)]
nix: update netradiant derivation
Martin Taibr [Fri, 28 Jul 2017 22:48:57 +0000 (00:48 +0200)]
s/version/revision
Mario [Fri, 28 Jul 2017 22:48:16 +0000 (22:48 +0000)]
Merge branch 'martin-t/tutlink' into 'master'
Use shortlink for Halogene's tutorial in tips
See merge request !27
Martin Taibr [Fri, 28 Jul 2017 22:34:11 +0000 (00:34 +0200)]
add sha sums from download page
Martin Taibr [Fri, 28 Jul 2017 22:32:03 +0000 (00:32 +0200)]
first shot as a contributing section in readme
TimePath [Sat, 22 Jul 2017 14:26:54 +0000 (00:26 +1000)]
nix: add netradiant minizip dependency
TimePath [Sat, 22 Jul 2017 11:54:54 +0000 (21:54 +1000)]
nix: support compiler override
TimePath [Sun, 16 Jul 2017 10:37:56 +0000 (20:37 +1000)]
Update the netradiant nix env
TimePath [Sun, 16 Jul 2017 09:59:09 +0000 (19:59 +1000)]
Add netradiant nix env
TimePath [Sun, 16 Jul 2017 04:54:54 +0000 (14:54 +1000)]
Add nix-shell environment
Mario [Fri, 14 Jul 2017 23:51:47 +0000 (23:51 +0000)]
Merge branch 'detrate/feature/encode-demos' into 'master'
Added command to convert video to gif to encode-demos.sh
See merge request !26
Martin Taibr [Wed, 5 Jul 2017 18:08:11 +0000 (20:08 +0200)]
use shortlink for Halogene's tutorial in tips
terencehill [Tue, 13 Jun 2017 14:39:44 +0000 (16:39 +0200)]
Suppress a wrong error message for Windows users
Mario [Thu, 25 May 2017 00:58:56 +0000 (10:58 +1000)]
Update readme to list latest version
Rudolf Polzer [Mon, 10 Apr 2017 15:08:35 +0000 (11:08 -0400)]
Fix all "export" commands. Fixes some issues with weird shells.
Mario [Fri, 7 Apr 2017 14:20:51 +0000 (00:20 +1000)]
Blacklist another "Best" server
Mirio [Mon, 3 Apr 2017 14:23:02 +0000 (16:23 +0200)]
Make the benchmark script using correct executables
Mario [Sat, 1 Apr 2017 18:16:29 +0000 (04:16 +1000)]
Update to 0.8.2 in update checker
z [Sat, 1 Apr 2017 16:46:06 +0000 (12:46 -0400)]
added command to convert video to gif
Rudolf Polzer [Thu, 30 Mar 2017 19:23:09 +0000 (21:23 +0200)]
Add the stupid Transifex cronjob here, for reference.
Mirio [Wed, 15 Mar 2017 23:16:21 +0000 (00:16 +0100)]
Update maplist in server.cfg
Mario [Wed, 15 Mar 2017 21:03:40 +0000 (21:03 +0000)]
Merge branch 'martin-t/overkill' into 'master'
Mention overkill in server.cfg
See merge request !24
Martin Taibr [Wed, 15 Mar 2017 19:57:17 +0000 (20:57 +0100)]
mention overkill in server.cfg
Rudolf Polzer [Wed, 8 Mar 2017 21:31:55 +0000 (22:31 +0100)]
Add a script to rebuild SDL for easier future upgrading.
Rudolf Polzer [Wed, 8 Mar 2017 21:29:36 +0000 (22:29 +0100)]
Upgrade to SDL 2.0.5.
Mirio [Tue, 7 Mar 2017 16:16:55 +0000 (17:16 +0100)]
Add missing maps to server.cfg
Mario [Tue, 7 Mar 2017 13:14:01 +0000 (23:14 +1000)]
Update server.cfg to include most of the new maps
Mirio [Tue, 28 Feb 2017 17:18:32 +0000 (17:18 +0000)]
Merge branch 't0uYK8Ne/map-compiler-order' into 'master'
Scale the map after the lightmap has been rendered
See merge request !23
t0uYK8Ne [Mon, 27 Feb 2017 16:17:06 +0000 (08:17 -0800)]
Scale the map after the lightmap has been rendered
Fixes dark patches on maps that are scaled down.
Mario [Sun, 26 Feb 2017 14:35:52 +0000 (14:35 +0000)]
Merge branch 'detrate/feature/encode-demos' into 'master'
encode-demos.sh, headless parallel encoding
See merge request !22
z [Sun, 26 Feb 2017 14:18:23 +0000 (09:18 -0500)]
automatic discovery of XONOTIC_DIR with optional override
z [Sat, 25 Feb 2017 02:44:53 +0000 (21:44 -0500)]
encode-demos.sh, headless parallel encoding
terencehill [Wed, 1 Feb 2017 22:00:57 +0000 (23:00 +0100)]
demotc-race-record-extractor.sh: update race record marker recognition and add support for cts and ctf records
Mario [Fri, 6 Jan 2017 00:29:36 +0000 (00:29 +0000)]
Merge branch 'martin-t/server.cfg' into 'master'
Mention apropos and cacs in server.cfg
See merge request !20
Mario [Sat, 24 Dec 2016 21:27:41 +0000 (07:27 +1000)]
Fix reference to Nexuiz playermodel
Martin Taibr [Sat, 24 Dec 2016 03:12:33 +0000 (04:12 +0100)]
recommend search instead of apropos
Mario [Sat, 24 Dec 2016 01:58:26 +0000 (01:58 +0000)]
Merge branch 'detrate/feature/README' into 'master'
Added a README.md to provide quick info about the game and community.
See merge request !21
z [Fri, 23 Dec 2016 15:02:25 +0000 (10:02 -0500)]
Added a README.md to provide quick info about the game and community.
TimePath [Sat, 10 Dec 2016 05:33:23 +0000 (16:33 +1100)]
Honor LD_LIBRARY_PATH
Martin Taibr [Fri, 25 Nov 2016 00:21:31 +0000 (01:21 +0100)]
mention apropos and cacs in server.cfg
Mario [Thu, 24 Nov 2016 12:51:29 +0000 (22:51 +1000)]
Add xonotic.org to the repo list
Mario [Wed, 9 Nov 2016 17:32:16 +0000 (03:32 +1000)]
Block new Akimbo IP
Mario [Sat, 5 Nov 2016 02:02:31 +0000 (02:02 +0000)]
Merge branch 'DefaultUser/serverCFG_sv_vote_gametype' into 'master'
Document sv_vote_gametype in server.cfg
Fixes Issue #179
See merge request !19
TimePath [Fri, 4 Nov 2016 21:33:25 +0000 (21:33 +0000)]
Merge branch 'devnexen/bsd' into 'master'
possiblity to compile the project using BSD with GNUmake
modified: misc/tools/all/xonotic.subr
See merge request !16
Freddy [Fri, 4 Nov 2016 14:14:47 +0000 (15:14 +0100)]
Document sv_vote_gametype in server.cfg
Rudolf Polzer [Mon, 24 Oct 2016 17:53:51 +0000 (13:53 -0400)]
Instead of "cd .." hackery, find the path of ./all by looking at $0.
This only supports invoking ./all directly (not via $PATH or symlinks),
but should already be a lot better than before.
Mario [Fri, 14 Oct 2016 16:20:07 +0000 (16:20 +0000)]
Merge branch 'sev/xolonium4' into 'master'
Update Xolonium fonts to version 4.0
The new version features revised proportions to improve legibility.
Most notably, the middle bars are lowered, the glyphs in general
are slightly narrower, and the digits in particular are less stretched.
![x3-x4](/uploads/
68d6894b2dac14971f2f334d91ca9e66 /x3-x4.png)
See merge request !18
Severin Meyer [Sat, 8 Oct 2016 13:26:01 +0000 (15:26 +0200)]
Update Xolonium fonts to version 4.0
David Carlier [Sun, 24 Jul 2016 06:04:39 +0000 (07:04 +0100)]
bring back correct version
David Carlier [Sun, 17 Jul 2016 18:23:38 +0000 (19:23 +0100)]
possiblity to compile the project using BSD with GNUmake
modified: misc/tools/all/xonotic.subr
Mario [Sat, 16 Jul 2016 12:32:58 +0000 (22:32 +1000)]
Block another "best" server
Mario [Mon, 27 Jun 2016 22:56:47 +0000 (08:56 +1000)]
Block some Nexuiz servers from the list
TimePath [Sun, 19 Jun 2016 06:11:31 +0000 (16:11 +1000)]
CMake: add d0_blind_id
TimePath [Thu, 14 Apr 2016 12:39:17 +0000 (22:39 +1000)]
Update gitignore
TimePath [Thu, 14 Apr 2016 04:21:46 +0000 (14:21 +1000)]
Merge branch 'TimePath/cmake'
TimePath [Thu, 14 Apr 2016 04:16:06 +0000 (14:16 +1000)]
CMake: make everything optional