Commit Graph

1836 Commits

Author SHA1 Message Date
Martin Taibr
93b75e9be3 suggest editing bots command 2019-08-18 18:49:03 +02:00
Martin Taibr
5fd7b96ec2 Merge branch 'master' into martin-t/vbots 2019-08-18 18:47:11 +02:00
Mario
09e7fefb4a Merge branch 'Mario/glx_build' into 'master'
Merge branch Mario/glx_build (M merge request)

See merge request xonotic/xonotic!53
2019-08-18 08:10:48 +00:00
BuildTools
b2ca5b5bdc Add the Linux scripts back as proper symlinks 2019-08-18 17:46:24 +10:00
Mario
e42e0e9eaf Remove broken symlinks 2019-08-18 17:37:00 +10:00
Mario
8bf0993d34 Point xonotic-linux-dedicated.sh to the correct script 2019-08-18 17:01:23 +10:00
Mario
524db2b01a Undo the inclusion of WGL binaries in the release script 2019-08-18 17:00:13 +10:00
Mario
08624593ea Update the binary names in the FAQ 2019-08-18 16:58:31 +10:00
Mario
c633ec33a8 Restore the GLX binary on Linux systems 2019-08-18 16:53:12 +10:00
Martin Taibr
2495479366 add bots, nobots 2019-08-01 10:02:46 +02:00
Mario
e712295d34 Ban the fpsclassico.de server for faking activity 2019-06-25 19:46:20 +10:00
Mario
5ccead712c Hide the recommended servers category until a better system can be implemented 2019-06-04 07:18:06 +10:00
Mario
9c058f4c30 Merge branch 'martin-t/ban-fakes' into 'master'
Ban the server faking activity yet again

See merge request xonotic/xonotic!51
2019-05-23 03:34:00 +00:00
Martin Taibr
18673ba6e9 ban the server faking activity yet again 2019-05-22 23:36:46 +02:00
Martin Taibr
e2b4b85f20 explain alias name limit in example config 2019-04-13 18:45:18 +02:00
Mario
7389c784f8 Block the newly appearing Rexuiz servers 2019-03-31 22:33:30 +10:00
Martin Taibr
feb97d7c31 treat .subr as shell in vscode 2019-03-15 20:30:12 +01:00
Mario
6e840f8fc4 Document minplayers_per_team in the example server.cfg 2019-02-12 19:04:42 +10:00
terencehill
500377145c Document "all compile -1" 2018-11-20 14:32:30 +01:00
terencehill
a6ce9c4ba7 Fix "all run" trying to run a no longer supported executable (wgl or glx), it now runs the sdl one 2018-11-20 14:31:04 +01:00
Mario
f7994e0f09 Merge branch 'desktop-fix' into 'master'
Update desktop/AppData files

See merge request xonotic/xonotic!47
2018-10-22 18:49:02 +00:00
AsciiWolf
5c0ccd4e39 Update desktop/AppData files 2018-10-22 16:08:10 +02:00
Mario
db66da3c52 Merge branch 'asciiwolf/xonotic-appdata' 2018-10-20 07:12:24 +10:00
Mario
0360202b4d Merge branch 'asciiwolf/xonotic-makefile-fix' 2018-10-20 07:10:58 +10:00
Rudolf Polzer
4331b691c0 Remove support for the glx binary.
Fixes compile with DP from master.
2018-10-17 09:31:37 -07:00
Rudolf Polzer
cd7078f2f7 Merge branch 'patch-1' into 'master'
Update .desktop files to Freedesktop standards Issue #159

See merge request xonotic/xonotic!17
2018-10-17 16:14:19 +00:00
Mario
27e6c3d23f Merge branch 'Mario/win64_v2' into 'master'
Merge branch Mario/win64_v2 (S merge request)

See merge request xonotic/xonotic!44
2018-10-02 14:44:49 +00:00
Mario
916a92dcc9 Attempt to detect when X64 Windows is being used 2018-10-01 19:48:17 +10:00
Mario
4370079531 Merge branch 'martin-t/help' into 'master'
Move help to data repo

See merge request xonotic/xonotic!43
2018-09-30 05:52:47 +00:00
Martin Taibr
0319ac41e7 document tips in example config 2018-09-29 16:44:15 +02:00
Martin Taibr
2b105694bc move help.cfg to data repo 2018-09-29 16:14:30 +02:00
Mario
02da6dd703 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 2018-09-12 04:22:31 +10:00
Mario
71a37f1f91 Enable gametype voting by default in the example server config 2018-09-10 05:34:47 +10:00
Mario
464ee1d38a Ban "Linus Torvalds' Fan Server" again for faking activity 2018-09-03 02:13:47 +10:00
AsciiWolf
37e3d71e28 Add AppData file 2018-07-21 02:40:52 +02:00
AsciiWolf
7f2096727e Fix Makefile 2018-07-21 02:31:33 +02:00
Martin Taibr
04aad62372 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
2018-07-02 07:19:59 +00:00
Martin Taibr
c3850c3f77 unix2dos 2018-06-30 23:52:22 +02:00
Martin Taibr
2a99145488 i always hated that "tip" 2018-06-30 21:20:58 +02:00
Ivan Stanton
667ab073c0 Replace Unix line endings with Windows line endings (attempt 1) 2018-06-28 18:04:29 +00:00
Ivan Stanton
892369485d Remove cvar defaults from scorelog.txt 2018-06-28 17:19:25 +00:00
Ivan Stanton
a393773114 Remove cvar defaults from eventlog.txt 2018-06-28 17:17:51 +00:00
Ivan Stanton
72ae904ac3 Completely remove cvar defaults from mapdownload.txt 2018-06-28 17:16:30 +00:00
Ivan Stanton
d9c3280fa0 Revert "Since Halogene's Newbie Corner is now in the docs master, no need for…"
This reverts commit 4d77ee731b
2018-06-28 17:08:54 +00:00
Ivan Stanton
4d77ee731b Since Halogene's Newbie Corner is now in the docs master, no need for basics.aft, which was left uncompiled anyway. 2018-06-28 16:58:21 +00:00
Ivan Stanton
8cfed777d3 Add a simplified version of Halogene's Newbie Corner, with images removed for now. 2018-06-28 16:56:21 +00:00
Ivan Stanton
c9d3046d7e Update cvars in mapdownload.txt 2018-06-28 16:27:24 +00:00
Martin Taibr
883e2b54db 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
2018-06-28 02:38:38 +00:00
Ivan Stanton
3fad83a820 Remove another unnecessary html tag for now 2018-06-28 01:51:24 +00:00
Ivan Stanton
976a52bdb5 Since compile options are found in the maps pk3, no need for outdated compile settings. 2018-06-28 00:23:50 +00:00