RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2024-12-16 11:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
531 Commits 36 Branches 9 Tags 258 MiB
4bb12ab808
Commit Graph

531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rudolf Polzer
e6024ca05d add a shell script to run the gimp-normalmap filter 2010-08-20 06:57:53 +02:00
Rudolf Polzer
1432395f15 admin-merge: fix merge conflict detection 2010-08-19 06:17:10 +02:00
Rudolf Polzer
19b34c1c8a Merge remote branch 'refs/remotes/origin/parasti/import-pk3' 2010-08-19 05:57:06 +02:00
Rudolf Polzer
9f16090cb3 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-08-17 22:04:31 +02:00
Rudolf Polzer
b7bea76937 nexcompat update script 2010-08-17 22:04:03 +02:00
Rudolf Polzer
bac383da44 remove win64 DLLs from PATH, as this does not work 2010-08-17 11:48:36 +02:00
Jānis Rūcis
5307fd743b Add a script for merging master to a map branch in a bare repo 2010-08-16 20:10:20 +03:00
Jānis Rūcis
4de26d55ac s/import-pk3/pk3-import/ 2010-08-16 20:02:34 +03:00
Jānis Rūcis
59e9149f75 import-pk3: force reading of .gitignore from index 2010-08-16 17:33:53 +03:00
Jānis Rūcis
5fc7e504ce import-pk3: use a separate index file 2010-08-16 15:37:22 +03:00
Jānis Rūcis
d02bc3355f import-pk3: init index with merge base, not always master 
Otherwise the commit history gets lost.
 2010-08-16 15:37:18 +03:00
Jānis Rūcis
508096a685 Add a script for importing a PK3 into a bare repo 2010-08-16 13:02:02 +03:00
Rudolf Polzer
baed2e805f new FT 2010-08-15 22:32:27 +02:00
Rudolf Polzer
3376e87101 win64: no WSPIAPI 2010-08-15 22:32:09 +02:00
Rudolf Polzer
a16e49898f try enabling win64 again 2010-08-15 21:08:35 +02:00
Rudolf Polzer
a0577f3b44 add win64 builds of libraries made by Willis 2010-08-15 21:04:24 +02:00
Rudolf Polzer
d0ad59f5d0 preserve vorbis comments when downsampling 2010-08-14 22:00:27 +02:00
Rudolf Polzer
344cbae797 remove -nexcompat pk3 from Xonotic-low.zip and Xonotic-lowdds.zip (useless baggage in these) 2010-08-14 21:54:59 +02:00
Rudolf Polzer
a4d69b979c also checkout -f here 2010-08-14 02:47:43 +02:00
Rudolf Polzer
6832c25d27 checkout -f 2010-08-14 02:46:07 +02:00
Rudolf Polzer
2d7a35e2b2 wtf, but I had fixed this bug before 2010-08-13 14:55:00 +02:00
Rudolf Polzer
10899a62b9 -mmacosx-version-min=10.4 2010-08-11 09:17:59 +02:00
Rudolf Polzer
e78c56a21d this way to use the OSX frameworks does not work 2010-08-11 08:47:07 +02:00
Rudolf Polzer
730c21b90d quote error 2010-08-11 07:45:45 +02:00
Rudolf Polzer
96899d108f add -fno-reorder-blocks to OSX compile to fix gcc hang 2010-08-11 07:42:23 +02:00
Rudolf Polzer
ae243f12c5 add back missing -g option 2010-08-11 06:43:02 +02:00
Rudolf Polzer
12caa26f83 rebranding: skip OSX icon if there is no Resources dir 2010-08-11 06:41:59 +02:00
Rudolf Polzer
bd767b4ed0 rsync calls: remove options that OSX rsync does not support 2010-08-11 06:41:02 +02:00
Rudolf Polzer
6d3df10f5b enable osx and win64 build 2010-08-11 06:36:32 +02:00
Rudolf Polzer
f8ee1d30e3 improve naming of win64 binareis 2010-08-09 15:23:19 +02:00
Rudolf Polzer
18e65af1be properly remove the tempdir at the end 2010-08-09 14:09:15 +02:00
Rudolf Polzer
8f160b8829 use wine paths relative to c: 2010-08-09 14:03:34 +02:00
Rudolf Polzer
50397e1d8f be more verbose 2010-08-09 14:01:51 +02:00
Rudolf Polzer
816c025b12 ./all clean -f 2010-08-09 14:01:18 +02:00
Rudolf Polzer
29bfed504a ./all clean 2010-08-09 13:59:42 +02:00
Rudolf Polzer
ad8756be00 rebranding: use no tempfiles other than in a special temp dir 2010-08-09 13:55:28 +02:00
Rudolf Polzer
acba3d2b57 rebranding: enable icon changing again, using ResEdit.exe 2010-08-09 13:46:23 +02:00
Rudolf Polzer
65d4aac3df name xonotic download zip files properly too 2010-08-09 10:10:25 +02:00
Rudolf Polzer
bcd1ea2c98 Merge remote branch 'refs/remotes/origin/merlijn/osx-logo' 2010-08-08 21:32:46 +02:00
Merlijn Hofstra
9f6736f928 Update logos for OSX with higher resolution icns and fix the buildfiles 2010-08-08 20:57:11 +02:00
Rudolf Polzer
247f1d6e69 xonotic-map-compiler: forbid "evil" dirs too 2010-08-07 17:40:47 +02:00
Rudolf Polzer
6cbc3a19b8 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-08-06 22:47:18 +02:00
Rudolf Polzer
57ec0aef32 do NOT use Win32::Exe to exchange icon for now, the EXE it writes does not run any more 2010-08-06 22:46:58 +02:00
Rudolf Polzer
b28f4b26d4 filter out lightmaps and model previews from DDS 2010-08-06 17:31:40 +02:00
Rudolf Polzer
324e8f3f9b we no longer need this dds_load workaround, as menuqc will fix it 2010-08-06 16:48:09 +02:00
Rudolf Polzer
1dc9da72f6 fix launcher for now (but do we want to keep it?) 2010-08-06 14:24:24 +02:00
Rudolf Polzer
b417eac15b fix the rebranding script option to specify the userdir name 2010-08-06 14:11:45 +02:00
Rudolf Polzer
9d67fdb532 get progs.dat from the right place 2010-08-06 12:19:30 +02:00
Rudolf Polzer
bf6b1f4370 set XON_BUILDSYSTEM 2010-08-06 12:00:40 +02:00
Rudolf Polzer
ffe894651b check RELEASETYPE var 2010-08-06 11:49:18 +02:00