]>
git.rm.cloudns.org Git - xonotic/xonotic.git/log
Rudolf Polzer [Thu, 5 Aug 2010 11:48:24 +0000 (13:48 +0200)]
fix compressonator usage
Rudolf Polzer [Thu, 5 Aug 2010 10:19:39 +0000 (12:19 +0200)]
fix another typo
Rudolf Polzer [Thu, 5 Aug 2010 10:11:05 +0000 (12:11 +0200)]
fix typos
Rudolf Polzer [Thu, 5 Aug 2010 10:08:29 +0000 (12:08 +0200)]
create missing dirs
Rudolf Polzer [Thu, 5 Aug 2010 09:01:18 +0000 (11:01 +0200)]
oops, forgot to use Xvfb here
Rudolf Polzer [Thu, 5 Aug 2010 08:59:22 +0000 (10:59 +0200)]
start X11 as compressonator needs it
Rudolf Polzer [Thu, 5 Aug 2010 08:41:38 +0000 (10:41 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Thu, 5 Aug 2010 08:41:10 +0000 (10:41 +0200)]
make build dirs "clean" of DP and FTEQCC
Rudolf Polzer [Thu, 5 Aug 2010 04:51:22 +0000 (06:51 +0200)]
add linux32 libraries
Rudolf Polzer [Thu, 5 Aug 2010 04:22:38 +0000 (06:22 +0200)]
fix linux64 build
Rudolf Polzer [Thu, 5 Aug 2010 04:16:14 +0000 (06:16 +0200)]
fix paths
Rudolf Polzer [Thu, 5 Aug 2010 04:14:48 +0000 (06:14 +0200)]
be more verbose
Rudolf Polzer [Thu, 5 Aug 2010 04:11:40 +0000 (06:11 +0200)]
add and update SDL for Win32; make Win32 build work
Rudolf Polzer [Thu, 5 Aug 2010 04:02:24 +0000 (06:02 +0200)]
add DX3 headers
Rudolf Polzer [Wed, 4 Aug 2010 19:33:55 +0000 (21:33 +0200)]
fix name typo
Rudolf Polzer [Wed, 4 Aug 2010 19:32:21 +0000 (21:32 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Wed, 4 Aug 2010 19:32:11 +0000 (21:32 +0200)]
use div0-gittools from xonotic git server
Rudolf Polzer [Wed, 4 Aug 2010 14:20:09 +0000 (16:20 +0200)]
parallelize something
Rudolf Polzer [Wed, 4 Aug 2010 14:19:08 +0000 (16:19 +0200)]
release building: new toys
Rudolf Polzer [Wed, 4 Aug 2010 10:40:57 +0000 (12:40 +0200)]
properly ignore merges in upstream rebase detection
Rudolf Polzer [Wed, 4 Aug 2010 10:39:44 +0000 (12:39 +0200)]
more typo fixing :)
Rudolf Polzer [Wed, 4 Aug 2010 10:34:36 +0000 (12:34 +0200)]
fix a typo ;)
Rudolf Polzer [Wed, 4 Aug 2010 10:26:57 +0000 (12:26 +0200)]
try to autodetect and fix upstream rebase
Rudolf Polzer [Wed, 4 Aug 2010 07:06:05 +0000 (09:06 +0200)]
now that we HAVE an official map, we can get rid of the ???????????????-??????????? error message :P
Rudolf Polzer [Mon, 2 Aug 2010 14:46:16 +0000 (16:46 +0200)]
new var in release building: $HOSTS_THAT_ARE_MYSELF - hosts on which no SSH is to be used
Rudolf Polzer [Mon, 2 Aug 2010 14:05:32 +0000 (16:05 +0200)]
more typo fix
Rudolf Polzer [Mon, 2 Aug 2010 14:04:48 +0000 (16:04 +0200)]
avoid more rsync
Rudolf Polzer [Mon, 2 Aug 2010 13:46:06 +0000 (15:46 +0200)]
mingw64 build fix
Rudolf Polzer [Mon, 2 Aug 2010 14:01:58 +0000 (16:01 +0200)]
./all release: more fixes
Rudolf Polzer [Thu, 29 Jul 2010 16:23:56 +0000 (18:23 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Mon, 26 Jul 2010 13:51:20 +0000 (15:51 +0200)]
delete libraries we are not using yet
Rudolf Polzer [Mon, 26 Jul 2010 13:50:36 +0000 (15:50 +0200)]
Revert "add d0_blind_id DLLs to our DLL dump"
This reverts commit
74ee735ed3c03d1cde03aee7880c61924b079e78 .
Rudolf Polzer [Mon, 26 Jul 2010 12:36:18 +0000 (14:36 +0200)]
add d0_blind_id DLLs to our DLL dump
Rudolf Polzer [Mon, 26 Jul 2010 12:05:55 +0000 (14:05 +0200)]
update win32 modplug dll
Rudolf Polzer [Mon, 26 Jul 2010 11:54:49 +0000 (13:54 +0200)]
mark libcurl-4.dll unexecutable (means nothing to Windows, but I know it needs to be rebuilt)
Rudolf Polzer [Mon, 26 Jul 2010 11:35:34 +0000 (13:35 +0200)]
buildfiles: rename dir from w32 to win32
Rudolf Polzer [Mon, 26 Jul 2010 11:32:20 +0000 (13:32 +0200)]
linux64 library dependencies for use by build script
Rudolf Polzer [Mon, 26 Jul 2010 11:22:52 +0000 (13:22 +0200)]
fix some typos in ./all
Rudolf Polzer [Sun, 25 Jul 2010 05:57:06 +0000 (07:57 +0200)]
weapon profiler: add seeker
Rudolf Polzer [Wed, 21 Jul 2010 18:13:54 +0000 (20:13 +0200)]
fix admin-merge :P
Rudolf Polzer [Wed, 21 Jul 2010 18:01:32 +0000 (20:01 +0200)]
small syntax fix
Rudolf Polzer [Wed, 21 Jul 2010 18:01:03 +0000 (20:01 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Rudolf Polzer [Wed, 21 Jul 2010 14:06:30 +0000 (16:06 +0200)]
also add -fastbounce by default. Though there is no -bounce in the default settings, this allows bounces to be fast even if --no-fast is used. If you do not want this, also add --no-fastbounce.
Rudolf Polzer [Wed, 21 Jul 2010 14:02:35 +0000 (16:02 +0200)]
add default options -fast and -dirty. If you do not want them, add --no-fast or --no-dirty behind the + in your map options file
Rudolf Polzer [Wed, 21 Jul 2010 13:54:13 +0000 (15:54 +0200)]
map compiler: allow an option --no-fast that removes a -fast option (possibly including argument) from the command line
Rudolf Polzer [Wed, 21 Jul 2010 13:05:51 +0000 (15:05 +0200)]
fix typo
Rudolf Polzer [Wed, 21 Jul 2010 13:03:35 +0000 (15:03 +0200)]
REALLY fix timeout feature
Rudolf Polzer [Wed, 21 Jul 2010 09:10:14 +0000 (11:10 +0200)]
also touch all files, to make git actually reread them
Rudolf Polzer [Wed, 21 Jul 2010 09:04:49 +0000 (11:04 +0200)]
add back the autocrlf config option in ./all - yes, had to
At least .gitattributes turns it off again on non-text files.
Rudolf Polzer [Wed, 21 Jul 2010 08:52:05 +0000 (10:52 +0200)]
fix another typo
Rudolf Polzer [Wed, 21 Jul 2010 08:50:11 +0000 (10:50 +0200)]
CRLF fixes, .gitattributes file updated
Rudolf Polzer [Wed, 21 Jul 2010 08:49:48 +0000 (10:49 +0200)]
the "*" rule must come first
Rudolf Polzer [Wed, 21 Jul 2010 08:47:39 +0000 (10:47 +0200)]
also add the attributes file
Rudolf Polzer [Wed, 21 Jul 2010 08:34:06 +0000 (10:34 +0200)]
checkout master again
Rudolf Polzer [Wed, 21 Jul 2010 08:32:45 +0000 (10:32 +0200)]
always return true
Rudolf Polzer [Wed, 21 Jul 2010 08:30:31 +0000 (10:30 +0200)]
CRLF fixes, .gitattributes file updated
Rudolf Polzer [Wed, 21 Jul 2010 08:29:40 +0000 (10:29 +0200)]
fix usage of HEAD
Rudolf Polzer [Wed, 21 Jul 2010 08:26:47 +0000 (10:26 +0200)]
more fixing
Rudolf Polzer [Wed, 21 Jul 2010 08:24:45 +0000 (10:24 +0200)]
add a gitattributes helper script
Rudolf Polzer [Wed, 21 Jul 2010 07:57:31 +0000 (09:57 +0200)]
gitattributes: add a default crlf value
Rudolf Polzer [Mon, 19 Jul 2010 12:40:45 +0000 (14:40 +0200)]
better time measuring
Rudolf Polzer [Mon, 19 Jul 2010 12:39:21 +0000 (14:39 +0200)]
more timeout fixing
Rudolf Polzer [Mon, 19 Jul 2010 07:23:14 +0000 (09:23 +0200)]
cut down hashes also on finished compile
Rudolf Polzer [Mon, 19 Jul 2010 07:16:54 +0000 (09:16 +0200)]
fixes :P
Rudolf Polzer [Mon, 19 Jul 2010 06:34:34 +0000 (08:34 +0200)]
fix timeouts
Rudolf Polzer [Mon, 19 Jul 2010 06:33:26 +0000 (08:33 +0200)]
autobuild scripts: specify timeouts for the q3map2 stages
Rudolf Polzer [Mon, 19 Jul 2010 05:58:50 +0000 (07:58 +0200)]
hope this will yield useful exit status
Rudolf Polzer [Sun, 18 Jul 2010 17:08:13 +0000 (19:08 +0200)]
treat 404 as warning, not error
Rudolf Polzer [Sun, 18 Jul 2010 15:18:15 +0000 (17:18 +0200)]
hard exit 1 if a "cd" failed :(
terencehill [Sat, 17 Jul 2010 15:26:28 +0000 (17:26 +0200)]
Show "(no_branch)" instead of "(no" in the output of the command branches (for example when you are in a remote branch)
terencehill [Sat, 17 Jul 2010 15:02:06 +0000 (17:02 +0200)]
Fix compile command to handle correctly the optional argument <client>
In case the first arg (eventually after -c|-n):
- it's an empty string "" just skip it (default clients will be used).
- doesn't contain any valid client, then assume it's not a client option but a generic option.
- contains at least one valid client, then compile valid ones and warn about invalid ones.
Now finally
./all compile -n FTEQCCFLAGS_WATERMARK=
works :)
Rudolf Polzer [Sat, 17 Jul 2010 13:40:04 +0000 (15:40 +0200)]
improve ircspam
Rudolf Polzer [Sat, 17 Jul 2010 13:18:14 +0000 (15:18 +0200)]
autobuild: improve messages, detect exit status
Rudolf Polzer [Fri, 16 Jul 2010 21:44:35 +0000 (23:44 +0200)]
admin-merge: use --no-ff
Rudolf Polzer [Wed, 14 Jul 2010 14:36:54 +0000 (16:36 +0200)]
improve mapinfo documentation
Rudolf Polzer [Fri, 9 Jul 2010 21:08:38 +0000 (23:08 +0200)]
Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx'
Rudolf Polzer [Fri, 9 Jul 2010 20:54:58 +0000 (22:54 +0200)]
properly identify upstream
merlijn [Fri, 9 Jul 2010 20:48:47 +0000 (22:48 +0200)]
add cleaner OSX version filter
Merlijn Hofstra [Thu, 8 Jul 2010 20:12:54 +0000 (22:12 +0200)]
compile against shipped SDL
Merlijn Hofstra [Thu, 8 Jul 2010 18:48:56 +0000 (20:48 +0200)]
update to SDL 1.2.14
Rudolf Polzer [Wed, 7 Jul 2010 19:52:17 +0000 (21:52 +0200)]
change to unconverted and current version of Nimbus Sans L
MrBougo [Wed, 7 Jul 2010 11:32:29 +0000 (13:32 +0200)]
Remove weird 'tname=' line in the windows script duplication
MrBougo [Tue, 6 Jul 2010 20:49:11 +0000 (22:49 +0200)]
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.
Rudolf Polzer [Sun, 4 Jul 2010 19:37:09 +0000 (21:37 +0200)]
fix temp name overwrite in "all"
Rudolf Polzer [Sun, 4 Jul 2010 19:28:51 +0000 (21:28 +0200)]
fix the shifting
Rudolf Polzer [Sun, 4 Jul 2010 17:14:39 +0000 (19:14 +0200)]
support -scale flags
Rudolf Polzer [Sun, 4 Jul 2010 16:36:06 +0000 (18:36 +0200)]
fix syntax of $HOME var use
Rudolf Polzer [Sun, 4 Jul 2010 16:28:02 +0000 (18:28 +0200)]
./all compile "wgl sdl dedicated" (allow multiple targets to be given)
Rudolf Polzer [Fri, 2 Jul 2010 12:51:03 +0000 (14:51 +0200)]
cleanup of release build compile lines
Rudolf Polzer [Fri, 2 Jul 2010 12:47:06 +0000 (14:47 +0200)]
add DEP and ASLR flags
Rudolf Polzer [Fri, 2 Jul 2010 12:44:22 +0000 (14:44 +0200)]
add a win64 target (untested)
Rudolf Polzer [Fri, 2 Jul 2010 12:04:00 +0000 (14:04 +0200)]
rev-list, not rev-parse
Rudolf Polzer [Fri, 2 Jul 2010 12:01:59 +0000 (14:01 +0200)]
use compile -n to speed up admin-merge
Rudolf Polzer [Fri, 2 Jul 2010 12:01:07 +0000 (14:01 +0200)]
autodetect whether a branch is based on master or on div0-stable; flag ./all compile -n which doesn't make clean
merlijn [Tue, 29 Jun 2010 16:41:10 +0000 (18:41 +0200)]
allow showing status number on irc
Rudolf Polzer [Mon, 28 Jun 2010 12:27:41 +0000 (14:27 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Mon, 28 Jun 2010 12:27:27 +0000 (14:27 +0200)]
more release build script stuff
Rudolf Polzer [Sat, 26 Jun 2010 20:21:56 +0000 (22:21 +0200)]
compress-texture: when calling wine, unset $DISPLAY so it won't show a dialog box if compressing failed.
Rudolf Polzer [Sat, 26 Jun 2010 14:57:19 +0000 (16:57 +0200)]
another typo fix :P
Rudolf Polzer [Sat, 26 Jun 2010 14:48:53 +0000 (16:48 +0200)]
use BoxFilter.dll in Compressonator