RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-11 05:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,210 Commits 40 Branches 9 Tags 324 MiB
master
Commit Graph

2210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bones_was_here
c1a2a07e32 Merge "CONTRIBUTING.md updates" 
Source branch: 'drjaska/contributing'
Target branch: 'master'

Closes xonotic-data.pk3dir#2943

See merge request xonotic/xonotic!121
 2025-03-01 17:38:15 +00:00
bones_was_here
14acc6d492
Makefile: suppress an expected error message, further tweak help text 2025-03-02 03:34:51 +10:00
bones_was_here
b08314cc3f Merge "Slightly improve make help output" 
Source branch: 'drjaska/Makefile'
Target branch: 'master'

See merge request xonotic/xonotic!117
 2025-03-01 17:13:17 +00:00
Dr. Jaska
5c461ebce7 Slightly improve make help output 2025-03-01 17:13:17 +00:00
bones_was_here
1e98ee8f2e Merge "Update pom.xml to use 1.8" 
Source branch: 'nexdemorecorder'
Target branch: 'master'

See merge request xonotic/xonotic!114
 2025-03-01 17:12:45 +00:00
bones_was_here
1d5f2d5fc1
CONTRIBUTING: update maintainer section 2025-02-22 21:48:07 +10:00
bones_was_here
001f9f4ce5
CONTRIBUTING: brevity adjustments 2025-02-22 17:24:24 +10:00
bones_was_here
e60f34d2c2
CONTRIBUTING: update licensing section 2025-02-22 17:24:16 +10:00
drjaska
b104167f6a
CONTRIBUTING: grammar improvements 2025-02-22 06:25:56 +10:00
drjaska
afe587c91b
Add XONRELEASE TODO in style guide 
Closes https://gitlab.com/xonotic/xonotic-data.pk3dir/-/issues/2943
 2025-02-15 14:16:44 +02:00
Rudolf Polzer
0927a3c56f Don't prune kicked users. 2024-11-02 13:36:28 +01:00
Rudolf Polzer
8b59d42816 Reset score for kicked users. 2024-11-02 13:32:12 +01:00
Rudolf Polzer
db1f86fe38 Fix comment in powerbot. 2024-10-30 22:03:05 +01:00
terencehill
6c2c7e55ea Fix demotc-race-record-extractor.sh not detecting CTF records 
Bug introduced in !113
 2024-09-06 01:22:27 +02:00
bones_was_here
a9839e9fc6
Adjust autobuild retention again 2024-08-28 23:17:13 +10:00
bones_was_here
773a0b8978
Get DP version string from the correct repo... 2024-08-08 03:25:07 +10:00
bones_was_here
4a99cac7c2
Set DP version string 2024-08-08 02:25:48 +10:00
bones_was_here
f2ed524c51 Merge branch 'AppStream-fixes' into 'master' 
Modernize the AppStream metadata

See merge request xonotic/xonotic!118
 2024-08-06 13:09:49 +00:00
AsciiWolf
5615ec9865 Modernize the AppStream metadata 
- Switch to a rDNS app id format that is now required
- Various fixes to make the file adhere to modern standards
- Remove my copyright/update contact
 2024-08-04 16:00:08 +02:00
bones_was_here
1b7568eaea
Include all stormkeep files required by pipeline 2024-07-23 16:49:37 +10:00
Dr. Jaska
decf97abf6 Merge branch 'drjaska/script-cleanup' into 'master' 
Clean up misc/tools/tag-release.sh

See merge request xonotic/xonotic!116
 2024-07-22 20:42:02 +00:00
Dr. Jaska
3762c0124a Clean up misc/tools/tag-release.sh 2024-07-22 20:42:02 +00:00
terencehill
505f1afc69 demotc-race-record-extractor.sh: remove useless rc case (gametype name is always uppercase) 2024-04-30 09:20:30 +00:00
terencehill
77e98491e1 Merge branch 'ctsdemoextractor' into 'master' 
Fix demotc-race-record-extractor.sh not detecting CTS and CTF records

See merge request xonotic/xonotic!113
 2024-04-30 09:19:12 +00:00
MxCraven
b90f15b6f3 Update pom.xml to use 1.8 2024-04-22 14:21:17 +00:00
MxCraven
5171b39259 Update demotc-race-record-extractor.sh. Capitalised CTS and CTF to make pattern recognition work. Thank you Des <3 2024-04-22 14:17:39 +00:00
bones_was_here
a08d57602f
Fix macOS SDL2 framework permissions 2024-03-22 13:26:31 +10:00
Rudolf Polzer
df4b789353 Fix frameworks path. 
It works with this path too, and is more standard.
 2024-03-19 04:32:42 -07:00
Rudolf Polzer
6a41ed0bd5 autobuild: add SDL2.framework to Xonotic.app 
Oopsie...
 2024-03-18 21:34:56 -04:00
bones_was_here
61a1840205
Adjust autobuild retention 
Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
 2024-02-26 08:00:20 +10:00
bones_was_here
334905e8f9 Merge branch 'bones_was_here/CONTRIBUTING.md' into 'master' 
Add a CONTRIBUTING.md

See merge request xonotic/xonotic!106
 2024-02-25 13:17:01 +00:00
bones_was_here
65f0135b04
Add a CONTRIBUTING.md 
This is based on wiki pages and DP's CONTRIBUTING.md and it adds some
policies that previously were expected but not documented.

This is intended to replace policy and licensing sections of the wiki,
partly to collate these and partly because only the Team should be able
to push updates to them.

Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
 2024-02-12 20:05:46 +10:00
bones_was_here
bf87255a4f
Remove execute bit from Windows rsync update scripts 
Nicer tab completion on Linux. Windows doesn't support the execute bit
anyway.
 2024-01-04 05:52:58 +10:00
bones_was_here
9dda8bc6cf
Only (re)generate the libd0 Makefile when necessary in dev/git builds 
Also fixes the `distclean` case: that target deletes the Makefile so we
need to generate it again before we can build.
 2023-12-31 22:43:50 +10:00
bones_was_here
0d3146cb2c
Remove buildfiles: second copy of SDL for Mac specific to dev/git builds, and related workarounds for old DP 
Mac users will need a newer version which can be installed from homebrew
as mentioned in https://gitlab.com/xonotic/darkplaces/-/blob/master/README.md#macos
 2023-12-28 00:09:08 +10:00
bones_was_here
99b6a58dea
Use default (shared linking) instead of dlopen for libjpeg in Windows dev/git builds 2023-12-27 23:48:49 +10:00
bones_was_here
95067d7eb2
Explicitly specify linking of all autobuild engine libs 2023-12-26 21:59:05 +10:00
bones_was_here
cd91b50fc4
Parallel build fixes and minor cleanups 
Fixes parallel builds which were broken in
584edbe3c5 by insufficient RTFM.

Enables parallel schroot builds.
 2023-12-26 21:58:26 +10:00
bones_was_here
42baa315f4
Fix Windows autobuild 
...but why did it work when tested without hacks?
Previously this was hacked differently in the sdl2-config in the repo.
 2023-12-26 04:23:29 +10:00
bones_was_here
8a229bebed
Fix Linux autobuild 2023-12-26 04:02:21 +10:00
bones_was_here
8b937b4d9e
Fix libd0 autobuild 2023-12-26 02:05:47 +10:00
bones_was_here
6bc6c49d27
Merge branch 'libcleanup' into 'master' 
Remove precompiled libraries

See merge request https://gitlab.com/xonotic/xonotic/-/merge_requests/110
 2023-12-26 01:50:41 +10:00
bones_was_here
bfce280fd7
Remove builddeps: osx/sdl 
This is now fetched from upstream in autobuilds, people compiling from
git can install it from homebrew.
 2023-12-26 01:48:24 +10:00
bones_was_here
ca9d9d86b9
Remove buildfiles: win32/*.dll win64/*.dll 
We're autobuilding these from maintained sources.
 2023-12-26 01:48:24 +10:00
bones_was_here
5020424401
Remove builddeps: win32/dx win64/dx win32/zlib win64/zlib 
We're autobuilding zlib and developers can install it from MSYS2 pacman,
dx is obsolete.
 2023-12-26 01:48:24 +10:00
bones_was_here
e74832499f
Remove builddeps: linux64/d0_blind_id linux64/gmp linux64/ode 
We're building libd0, obtaining libgmp from the system, and will build
and ship libode if people want it.
 2023-12-26 01:48:23 +10:00
drjaska
83309556c8
Remove builddeps: win32/gmp win64/gmp win32/sdl win64/sdl 2023-12-26 01:48:23 +10:00
bones_was_here
69ecfed370
Remove builddeps: linux32/* 
These files have been unused for years.
 2023-12-26 01:48:19 +10:00
bones_was_here
f9a25f7c49
Merge branch 'bones_was_here/libs' into 'master' 
Autobuild libd0 for Linux, always build libd0 in dev/git builds, fetch SDL2 for Mac, fixes & cleanup

See merge request https://gitlab.com/xonotic/xonotic/-/merge_requests/111
 2023-12-26 01:34:28 +10:00
bones_was_here
8eb3964e92
Increase minimum Mac OS X version to 10.7 
This is the minimum for building with SDL 2.28.5

Even so,
ld: warning: dylib (../../../.deps/SDL2.framework/SDL2) was built for newer macOS version (10.11) than being linked (10.7)
 2023-12-26 01:20:23 +10:00