RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2024-12-17 20:34:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
558 Commits 36 Branches 9 Tags 258 MiB
e2734f595d
Commit Graph

558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rudolf Polzer
6ba3ca2cf0 also exclude models/sprites from DDS 2010-08-26 05:53:12 +02:00
Rudolf Polzer
1ae12fed4b add a missing default case 2010-08-25 07:56:00 +02:00
Rudolf Polzer
c4af07662d set push.default to current in these repos, to prevent accidental pushes 2010-08-25 07:02:39 +02:00
Rudolf Polzer
3a59f6382c disable div0-gittools, mediasource, data/xonotic-nexcompat.pk3 repository download by default. 
To disable them, just delete your checkout of them.
New users who want to enable them, create a .yes file of that name.
 2010-08-25 06:59:52 +02:00
merlijn
3dbc51d6d9 add curl as a backup for wget, needed on OSX 2010-08-24 19:32:59 +02:00
Rudolf Polzer
731e4a4f46 Merge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix' 2010-08-24 05:30:51 +02:00
Rudolf Polzer
35ed544229 more verbose output please 2010-08-23 12:54:48 +02:00
Rudolf Polzer
e75800ae0e normal2heightmap: more fixes 2010-08-23 11:26:24 +02:00
Rudolf Polzer
ffc605ed11 support a "reference" image that predefines height for the input textures at given locations 2010-08-23 10:46:29 +02:00
Rudolf Polzer
039e0560cf B, G, R, A 2010-08-22 19:47:25 +02:00
merlijn
3283e78f7f fix a few minor bugs 2010-08-22 19:45:10 +02:00
Rudolf Polzer
2e038533cc fix scale factors; allow nice parameters for two different normal algorithms 2010-08-22 19:43:18 +02:00
Rudolf Polzer
71e33d08cb also add normalmap to heightmap, but this way is bad :P better use gimp-normalmap plugin 2010-08-22 18:54:24 +02:00
Rudolf Polzer
c151bbe676 add a normalmap to heightmap tool by me 2010-08-22 17:59:41 +02:00
Rudolf Polzer
905a0767d6 -bouncegrid is nice 2010-08-22 14:18:48 +02:00
Rudolf Polzer
cf445ff6ef put osx dedicated binary into the right folder 2010-08-21 16:38:36 +02:00
Rudolf Polzer
45ea160704 also support --help 2010-08-21 15:44:52 +02:00
Rudolf Polzer
6cac5de987 allow the path to xonotic.brand to come from XONOTIC_BRANDFILE 2010-08-21 15:20:07 +02:00
Rudolf Polzer
35a0d303e7 split up OS X engine release target to also support agl without 64bit 2010-08-21 13:57:53 +02:00
Rudolf Polzer
85a76f687b no longer need to disable JPEG linking on osx 2010-08-21 13:47:55 +02:00
Rudolf Polzer
55aecf86d5 hopefully the last fix to that alpha channel stupidity... 2010-08-20 18:01:58 +02:00
Rudolf Polzer
f1091cc7a1 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-08-20 17:54:39 +02:00
Rudolf Polzer
33b9faedac fix generated alpha channel 2010-08-20 17:54:28 +02:00
Rudolf Polzer
c3b65641f6 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-08-20 14:23:07 +02:00
Rudolf Polzer
a675524294 ./all: support DP's new jpeg lib handling 2010-08-20 14:22:56 +02:00
Rudolf Polzer
79741c1f70 add a heightsource option so one can "regenerate" normalmaps 2010-08-20 07:11:32 +02:00
Rudolf Polzer
2ebe7a33ca disable DDS for foo_bump.tga as it won't work anyway 2010-08-20 06:59:27 +02:00
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