Rudolf Polzer
|
03f8693e90
|
oops, forgot libgmp here
|
2010-08-27 12:34:34 +02:00 |
|
Rudolf Polzer
|
0183f87e4e
|
fix paths
|
2010-08-27 11:43:14 +02:00 |
|
Rudolf Polzer
|
3f0b4d1fa0
|
update my lib
|
2010-08-27 10:45:00 +02:00 |
|
Rudolf Polzer
|
12fe42d7f5
|
Merge branch 'master' into divVerent/crypto2
|
2010-08-27 10:35:06 +02:00 |
|
Rudolf Polzer
|
93b2b35708
|
update blind_id lib
|
2010-08-27 10:34:44 +02:00 |
|
Rudolf Polzer
|
8fa0fcb4cb
|
./all clean: also back out of merge conflicts
|
2010-08-27 09:44:58 +02:00 |
|
Rudolf Polzer
|
1ed9707eaf
|
rebrand: also add TGA icons (possibly converted from png)
|
2010-08-27 07:41:32 +02:00 |
|
Rudolf Polzer
|
9f79f6a876
|
also an OSX icon (untested, created by png2icns)
|
2010-08-27 06:35:58 +02:00 |
|
Rudolf Polzer
|
3f01ab98ab
|
New icon version by sev, should work better at low res
|
2010-08-27 06:31:59 +02:00 |
|
Rudolf Polzer
|
56cf102d64
|
explain more
|
2010-08-26 06:09:40 +02:00 |
|
Rudolf Polzer
|
6dcb9aea90
|
make the algorithm a bit more customizable
|
2010-08-26 06:05:04 +02:00 |
|
Rudolf Polzer
|
53f03d541f
|
fix issues with non-square images
|
2010-08-26 06:00:49 +02:00 |
|
Rudolf Polzer
|
6ba3ca2cf0
|
also exclude models/sprites from DDS
|
2010-08-26 05:53:12 +02:00 |
|
Rudolf Polzer
|
23e1d5f0c0
|
add the crypto lib to linux release builds
|
2010-08-26 05:43:30 +02:00 |
|
Rudolf Polzer
|
2d39fadc6c
|
Merge branch 'master' into divVerent/crypto2
|
2010-08-26 05:41:36 +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 |
|
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
|
5050382ea2
|
Merge branch 'master' into divVerent/crypto2
Conflicts:
all
|
2010-08-20 14:23:54 +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 |
|