]>
git.rm.cloudns.org Git - xonotic/xonotic.git/log
David Knapp [Sun, 1 Dec 2019 22:03:42 +0000 (17:03 -0500)]
Preliminary support for the build.sh script; run and compile work
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)
Martin Taibr [Sun, 24 Nov 2019 00:09:02 +0000 (00:09 +0000)]
Update COPYING - user branch naming scheme is not enforced
Martin Taibr [Sat, 9 Nov 2019 21:55:10 +0000 (22:55 +0100)]
reban
Martin Taibr [Sat, 2 Nov 2019 20:16:18 +0000 (21:16 +0100)]
dupe
Martin Taibr [Sat, 2 Nov 2019 20:14:38 +0000 (21:14 +0100)]
reban
Martin Taibr [Sat, 2 Nov 2019 16:10:34 +0000 (17:10 +0100)]
reban
Martin Taibr [Sat, 2 Nov 2019 13:46:08 +0000 (14:46 +0100)]
reban server faking activity
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
Rudolf Polzer [Fri, 11 Oct 2019 16:41:47 +0000 (18:41 +0200)]
xonotic-map-compiler infrastructure script: allow running "from scratch".
Rudolf Polzer [Fri, 11 Oct 2019 16:38:08 +0000 (18:38 +0200)]
Make xonotic-map-compiler use cmake.
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
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
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
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
Martin Taibr [Fri, 27 Sep 2019 13:15:49 +0000 (15:15 +0200)]
futureproof -r default
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
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.
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
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
Hugo Locurcio [Fri, 20 Sep 2019 20:00:47 +0000 (22:00 +0200)]
Translate desktop files and AppData to French
Martin Taibr [Wed, 11 Sep 2019 23:36:24 +0000 (01:36 +0200)]
match skill in example config to default
Mario [Tue, 3 Sep 2019 19:23:29 +0000 (05:23 +1000)]
Update "Xonotic 0.8.2 Server" IP in ban list
Mario [Mon, 26 Aug 2019 02:44:10 +0000 (12:44 +1000)]
Restore yet another weird path in SDL lib configs
Mario [Sun, 25 Aug 2019 01:25:24 +0000 (11:25 +1000)]
Restore weird paths in the SDL lib configs
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
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
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 .
Wuzzy [Fri, 23 Aug 2019 14:02:45 +0000 (16:02 +0200)]
Translate desktop files and AppData to German
Martin Taibr [Wed, 21 Aug 2019 13:47:13 +0000 (15:47 +0200)]
don't suggest fullbright - is default already
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
Mario [Mon, 19 Aug 2019 12:56:26 +0000 (22:56 +1000)]
Update "Xonotic 0.8.2 Server" IP in the ban list
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
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
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
Mario [Mon, 19 Aug 2019 09:52:41 +0000 (19:52 +1000)]
Include the nexcompat package in low and high release zips
Mario [Mon, 19 Aug 2019 08:39:56 +0000 (18:39 +1000)]
Update xonotic-glx.desktop to match the SDL file
Martin Taibr [Sun, 18 Aug 2019 16:49:03 +0000 (18:49 +0200)]
suggest editing bots command
Martin Taibr [Sun, 18 Aug 2019 16:47:11 +0000 (18:47 +0200)]
Merge branch 'master' into martin-t/vbots
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
BuildTools [Sun, 18 Aug 2019 07:46:24 +0000 (17:46 +1000)]
Add the Linux scripts back as proper symlinks
Mario [Sun, 18 Aug 2019 07:37:00 +0000 (17:37 +1000)]
Remove broken symlinks
Mario [Sun, 18 Aug 2019 07:01:23 +0000 (17:01 +1000)]
Point xonotic-linux-dedicated.sh to the correct script
Mario [Sun, 18 Aug 2019 07:00:13 +0000 (17:00 +1000)]
Undo the inclusion of WGL binaries in the release script
Mario [Sun, 18 Aug 2019 06:58:31 +0000 (16:58 +1000)]
Update the binary names in the FAQ
Mario [Sun, 18 Aug 2019 06:53:12 +0000 (16:53 +1000)]
Restore the GLX binary on Linux systems
Martin Taibr [Thu, 1 Aug 2019 08:02:46 +0000 (10:02 +0200)]
add bots, nobots
Thomas Debesse [Sun, 14 Oct 2018 04:18:50 +0000 (06:18 +0200)]
all: compile q3map2 using cmake
Mario [Tue, 25 Jun 2019 09:46:20 +0000 (19:46 +1000)]
Ban the fpsclassico.de server for faking activity
Mario [Mon, 3 Jun 2019 21:18:06 +0000 (07:18 +1000)]
Hide the recommended servers category until a better system can be implemented
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
Martin Taibr [Wed, 22 May 2019 21:36:46 +0000 (23:36 +0200)]
ban the server faking activity yet again
Martin Taibr [Sat, 13 Apr 2019 16:45:18 +0000 (18:45 +0200)]
explain alias name limit in example config
Mario [Sun, 31 Mar 2019 12:33:30 +0000 (22:33 +1000)]
Block the newly appearing Rexuiz servers
Martin Taibr [Fri, 15 Mar 2019 19:30:12 +0000 (20:30 +0100)]
treat .subr as shell in vscode
Mario [Tue, 12 Feb 2019 09:04:42 +0000 (19:04 +1000)]
Document minplayers_per_team in the example server.cfg
terencehill [Tue, 20 Nov 2018 13:32:30 +0000 (14:32 +0100)]
Document "all compile -1"
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
packer [Tue, 13 Nov 2018 16:12:03 +0000 (17:12 +0100)]
$F contains file extension...
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
AsciiWolf [Mon, 22 Oct 2018 14:08:10 +0000 (16:08 +0200)]
Update desktop/AppData files
Mario [Fri, 19 Oct 2018 21:12:24 +0000 (07:12 +1000)]
Merge branch 'asciiwolf/xonotic-appdata'
Mario [Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)]
Merge branch 'asciiwolf/xonotic-makefile-fix'
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.
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
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
Mario [Mon, 1 Oct 2018 09:48:17 +0000 (19:48 +1000)]
Attempt to detect when X64 Windows is being used
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
Martin Taibr [Sat, 29 Sep 2018 14:44:15 +0000 (16:44 +0200)]
document tips in example config
Martin Taibr [Sat, 29 Sep 2018 14:14:30 +0000 (16:14 +0200)]
move help.cfg to data repo
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
Mario [Sun, 9 Sep 2018 19:34:47 +0000 (05:34 +1000)]
Enable gametype voting by default in the example server config
Mario [Sun, 2 Sep 2018 16:12:44 +0000 (02:12 +1000)]
Ban "Linus Torvalds' Fan Server" again for faking activity
AsciiWolf [Sat, 21 Jul 2018 00:40:52 +0000 (02:40 +0200)]
Add AppData file
AsciiWolf [Sat, 21 Jul 2018 00:31:33 +0000 (02:31 +0200)]
Fix Makefile
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
Martin Taibr [Sat, 30 Jun 2018 21:52:22 +0000 (23:52 +0200)]
unix2dos
Martin Taibr [Sat, 30 Jun 2018 19:20:58 +0000 (21:20 +0200)]
i always hated that "tip"
Ivan Stanton [Thu, 28 Jun 2018 18:04:29 +0000 (18:04 +0000)]
Replace Unix line endings with Windows line endings (attempt 1)
Ivan Stanton [Thu, 28 Jun 2018 17:19:25 +0000 (17:19 +0000)]
Remove cvar defaults from scorelog.txt
Ivan Stanton [Thu, 28 Jun 2018 17:17:51 +0000 (17:17 +0000)]
Remove cvar defaults from eventlog.txt
Ivan Stanton [Thu, 28 Jun 2018 17:16:30 +0000 (17:16 +0000)]
Completely remove cvar defaults from mapdownload.txt
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
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.
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.
Ivan Stanton [Thu, 28 Jun 2018 16:27:24 +0000 (16:27 +0000)]
Update cvars in mapdownload.txt
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
Ivan Stanton [Thu, 28 Jun 2018 01:51:24 +0000 (01:51 +0000)]
Remove another unnecessary html tag for now
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.
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
Ivan Stanton [Wed, 27 Jun 2018 22:31:39 +0000 (22:31 +0000)]
Update weapon names in eventlog.txt
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)
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.
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
Ivan Stanton [Wed, 27 Jun 2018 21:54:21 +0000 (21:54 +0000)]
Mirror the Xonotic FAQ from the website.
Martin Taibr [Sun, 24 Jun 2018 19:47:07 +0000 (21:47 +0200)]
fix help messages
Rudolf Polzer [Fri, 15 Jun 2018 18:46:49 +0000 (20:46 +0200)]
Typo: pkg -> pk3
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.
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.
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).