RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-03 09:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,872 Commits 40 Branches 9 Tags 324 MiB
5179dcf51d
Commit Graph

1872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Taibr
5179dcf51d dupe 2019-11-02 21:16:18 +01:00
Martin Taibr
df19af404c reban 2019-11-02 21:14:38 +01:00
Martin Taibr
0a0711d96d reban 2019-11-02 17:10:34 +01:00
Martin Taibr
d95ee83f3b reban server faking activity 2019-11-02 14:46:08 +01:00
Rudolf Polzer
b21867380b Merge branch 'cmake-q3map2' into 'master' 
all: compile q3map2 using cmake

See merge request xonotic/xonotic!45
 2019-10-11 16:43:37 +00:00
Rudolf Polzer
d1c4747210 xonotic-map-compiler infrastructure script: allow running "from scratch". 2019-10-11 18:41:47 +02:00
Rudolf Polzer
33aa8d8b57 Make xonotic-map-compiler use cmake. 2019-10-11 18:38:31 +02:00
Mario
3125fa3054 Merge branch 'nyov/wikiexporter' into 'master' 
redmine wiki crawler

See merge request xonotic/xonotic!3
 2019-09-30 04:41:33 +00:00
Mario
b1001612ef Merge branch 'packer/cached-converter' into 'master' 
cached-converter: check file extensions correctly

Closes xonotic-data.pk3dir#2158

See merge request xonotic/xonotic!48
 2019-09-30 04:38:37 +00:00
Mario
4027658f3d Merge branch 'translate_desktop' into 'master' 
Translate desktop files and AppData to German

See merge request xonotic/xonotic!57
 2019-09-28 00:59:56 +00:00
Wuzzy
12e4ebadb5 Merge branch 'master' into 'translate_desktop' 
# Conflicts:
#   misc/logos/xonotic-glx.desktop
#   misc/logos/xonotic.appdata.xml
#   misc/logos/xonotic.desktop
 2019-09-27 20:47:09 +00:00
Martin Taibr
f68b642333 futureproof -r default 2019-09-27 15:15:49 +02:00
Mario
7533f624e9 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
 2019-09-27 11:39:10 +00:00
Hugo Locurcio
76b9444fed
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.
 2019-09-27 13:34:48 +02:00
Mario
8fd5135b8d Merge branch 'translate-desktop-appdata-french' into 'master' 
Translate desktop files and AppData to French

See merge request xonotic/xonotic!61
 2019-09-27 00:02:15 +00:00
Mario
7e91a2c46d Merge branch 'martin-t/vbots' into 'master' 
Add bots, nobots, document new bot skill

See merge request xonotic/xonotic!52
 2019-09-25 23:51:52 +00:00
Hugo Locurcio
e206afdbac
Translate desktop files and AppData to French 2019-09-20 22:00:47 +02:00
Martin Taibr
1d61c51312 match skill in example config to default 2019-09-12 01:36:24 +02:00
Mario
9d6e4bb3b9 Update "Xonotic 0.8.2 Server" IP in ban list 2019-09-04 05:23:29 +10:00
Mario
c6297696ed Restore yet another weird path in SDL lib configs 2019-08-26 12:44:10 +10:00
Mario
558561f576 Restore weird paths in the SDL lib configs 2019-08-25 11:25:24 +10:00
Mario
99517f09db Fix a weird hardcoded references to a non-existent directory in sdl2-config causing MSYS2 builds to fail 2019-08-24 16:13:16 +10:00
Rudolf Polzer
a3ad712adb Merge branch 'Mario/sdl2_update' into 'master' 
Update macOS and Windows SDL dependencies to 2.0.10

See merge request xonotic/xonotic!54
 2019-08-24 00:04:31 +00:00
Mario
1e434bee7a Revert "Update Windows 32 bit SDL build dependency to 2.0.10" 
This reverts commit d2cdd999d3d7214b2da17099df63b3b409b0ae23.
 2019-08-24 00:04:30 +00:00
Wuzzy
04b89372a0 Translate desktop files and AppData to German 2019-08-23 16:02:45 +02:00
Martin Taibr
c404482854 don't suggest fullbright - is default already 2019-08-21 15:47:13 +02:00
Mario
bbf23c93cf Include the extension when checking for the Windows dedicated binary in the icon script 2019-08-20 13:34:53 +10:00
Mario
c297287c73 Update "Xonotic 0.8.2 Server" IP in the ban list 2019-08-19 22:56:26 +10:00
Mario
12c178c621 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
 2019-08-19 10:15:37 +00:00
Mario
33e3b90bcf 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 2019-08-19 20:09:30 +10:00
Mario
af56060eae Merge branch 'Mario/release_nexcompat' into 'master' 
Merge branch Mario/release_nexcompat (XS merge request)

Closes #219

See merge request xonotic/xonotic!55
 2019-08-19 10:01:47 +00:00
Mario
c303237ecf Include the nexcompat package in low and high release zips 2019-08-19 19:52:41 +10:00
Mario
578365efd9 Update xonotic-glx.desktop to match the SDL file 2019-08-19 18:39:56 +10:00
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
Thomas Debesse
4a6dfe1198 all: compile q3map2 using cmake 2019-07-05 04:09:11 +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