Rudolf Polzer
8d2322dbfc
add a gitattributes helper script
2010-07-21 10:24:45 +02:00
Rudolf Polzer
36c7a9e93b
gitattributes: add a default crlf value
2010-07-21 09:57:31 +02:00
Rudolf Polzer
c0386f2fba
better time measuring
2010-07-19 14:40:45 +02:00
Rudolf Polzer
eeb4e981e7
more timeout fixing
2010-07-19 14:39:21 +02:00
Rudolf Polzer
9ac2d431c5
cut down hashes also on finished compile
2010-07-19 09:23:14 +02:00
Rudolf Polzer
d95dde1cc4
fixes :P
2010-07-19 09:16:54 +02:00
Rudolf Polzer
75840126be
fix timeouts
2010-07-19 08:34:34 +02:00
Rudolf Polzer
3a27e02f3a
autobuild scripts: specify timeouts for the q3map2 stages
2010-07-19 08:33:26 +02:00
Rudolf Polzer
627ef87743
hope this will yield useful exit status
2010-07-19 07:58:50 +02:00
Rudolf Polzer
8bfb119d5e
treat 404 as warning, not error
2010-07-18 19:08:13 +02:00
Rudolf Polzer
b730d3b2c8
hard exit 1 if a "cd" failed :(
2010-07-18 17:18:15 +02:00
Rudolf Polzer
4c6e2486ff
improve ircspam
2010-07-17 15:40:04 +02:00
Rudolf Polzer
94ce252c0a
autobuild: improve messages, detect exit status
2010-07-17 15:18:14 +02:00
Rudolf Polzer
6cc00fffaf
admin-merge: use --no-ff
2010-07-16 23:44:35 +02:00
Rudolf Polzer
106111952f
improve mapinfo documentation
2010-07-14 16:36:54 +02:00
Rudolf Polzer
f217d0db49
Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx'
2010-07-09 23:08:38 +02:00
Rudolf Polzer
6bd227f5ac
properly identify upstream
2010-07-09 22:54:58 +02:00
merlijn
bfe3e801b0
add cleaner OSX version filter
2010-07-09 22:48:47 +02:00
Merlijn Hofstra
347996194d
compile against shipped SDL
2010-07-08 22:12:54 +02:00
Merlijn Hofstra
b93c58b5af
update to SDL 1.2.14
2010-07-08 20:48:56 +02:00
Rudolf Polzer
fd646e5c63
change to unconverted and current version of Nimbus Sans L
2010-07-07 21:52:33 +02:00
MrBougo
f3e2327008
Remove weird 'tname=' line in the windows script duplication
2010-07-07 13:32:29 +02:00
MrBougo
bcb9893f31
Use the -mygames switch for DP
...
This only affects the game in windows, it makes the user data
directory my documents\my games\xonotic\data instead of storing
everything in the git working copy. Consistent with unix .xonotic.
2010-07-06 22:49:11 +02:00
Rudolf Polzer
58cc901f81
fix temp name overwrite in "all"
2010-07-04 21:37:09 +02:00
Rudolf Polzer
1214a3a778
fix the shifting
2010-07-04 21:28:51 +02:00
Rudolf Polzer
d5cad69062
support -scale flags
2010-07-04 19:14:39 +02:00
Rudolf Polzer
2856d02081
fix syntax of $HOME var use
2010-07-04 18:36:06 +02:00
Rudolf Polzer
c68423b1ef
./all compile "wgl sdl dedicated" (allow multiple targets to be given)
2010-07-04 18:28:02 +02:00
Rudolf Polzer
42e363f887
cleanup of release build compile lines
2010-07-02 14:51:03 +02:00
Rudolf Polzer
c1b23d70ee
add DEP and ASLR flags
2010-07-02 14:47:06 +02:00
Rudolf Polzer
9d2449295f
add a win64 target (untested)
2010-07-02 14:44:22 +02:00
Rudolf Polzer
165b5c3178
rev-list, not rev-parse
2010-07-02 14:04:00 +02:00
Rudolf Polzer
6b8ec4f290
use compile -n to speed up admin-merge
2010-07-02 14:01:59 +02:00
Rudolf Polzer
6c11bb6513
autodetect whether a branch is based on master or on div0-stable; flag ./all compile -n which doesn't make clean
2010-07-02 14:01:07 +02:00
merlijn
fecd9ecd51
allow showing status number on irc
2010-06-29 18:41:10 +02:00
Rudolf Polzer
0c0cb62b5c
Merge branch 'master' of ssh://git.xonotic.org/xonotic
2010-06-28 14:27:41 +02:00
Rudolf Polzer
0c1347d0ec
more release build script stuff
2010-06-28 14:27:27 +02:00
Rudolf Polzer
058d912718
compress-texture: when calling wine, unset $DISPLAY so it won't show a dialog box if compressing failed.
2010-06-26 22:21:56 +02:00
Rudolf Polzer
fd716c102c
another typo fix :P
2010-06-26 16:57:19 +02:00
Rudolf Polzer
9059f41000
use BoxFilter.dll in Compressonator
2010-06-26 16:48:53 +02:00
Rudolf Polzer
9c9343fa31
allow choosing between ATICompressor and DXTC.dll
2010-06-26 16:38:26 +02:00
Rudolf Polzer
0e1fbbc2bf
also support ATI Compressonator via WINE for release building
2010-06-26 16:29:54 +02:00
Rudolf Polzer
a8107a6553
Merge branch 'master' of ssh://git.xonotic.org/xonotic
2010-06-25 20:52:31 +02:00
Rudolf Polzer
cbe525917b
move shaderlist.txt into the individual dirs again now that we can
2010-06-24 17:41:55 +02:00
Rudolf Polzer
316e76ac82
in .options files, change syntax to allow settings on different lines. Syntax rules now are:
...
any line starting with - specifies options
any other line is a comment
anything from a # in a line to the end of the line is a comment
(Bad) Example:
-bsp -samplesize 16 # do not use default options
-light + -fast # this looks good too, default options are still used
-vis +
-minimap +
Version: 1
2010-06-24 15:53:02 +02:00
Rudolf Polzer
9fa81db686
Lots of improvements for admin-merge-2
2010-06-24 15:08:39 +02:00
Rudolf Polzer
df6c8dfa67
rename admin-merge-2 to admin-merge, give it a branch name argument
2010-06-23 21:27:43 +02:00
Rudolf Polzer
659839d232
let's use a free font for now, even though it doesn't look totally good
2010-06-23 13:07:19 +02:00
Rudolf Polzer
ae1d24262d
and now without debug code
2010-06-22 17:35:05 +02:00
Rudolf Polzer
0e4764e9b2
now it even works
2010-06-22 17:34:51 +02:00