xonotic/xonotic.git
11 years agohandle a weird error case
Rudolf Polzer [Thu, 5 Aug 2010 07:51:14 +0000 (09:51 +0200)]
handle a weird error case

11 years agothe un-debianized blind_id DLLs
Rudolf Polzer [Thu, 5 Aug 2010 07:45:08 +0000 (09:45 +0200)]
the un-debianized blind_id DLLs

11 years agoadd 32bit d0_blind_id lib
Rudolf Polzer [Thu, 5 Aug 2010 04:57:32 +0000 (06:57 +0200)]
add 32bit d0_blind_id lib

11 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Thu, 5 Aug 2010 04:57:01 +0000 (06:57 +0200)]
Merge branch 'master' into divVerent/crypto2

11 years agoadd linux32 libraries
Rudolf Polzer [Thu, 5 Aug 2010 04:51:22 +0000 (06:51 +0200)]
add linux32 libraries

11 years agoadd missing d0_blind_id headers
Rudolf Polzer [Thu, 5 Aug 2010 04:26:03 +0000 (06:26 +0200)]
add missing d0_blind_id headers

11 years agofix linux64 build
Rudolf Polzer [Thu, 5 Aug 2010 04:22:38 +0000 (06:22 +0200)]
fix linux64 build

11 years agofix paths
Rudolf Polzer [Thu, 5 Aug 2010 04:16:14 +0000 (06:16 +0200)]
fix paths

11 years agobe more verbose
Rudolf Polzer [Thu, 5 Aug 2010 04:14:48 +0000 (06:14 +0200)]
be more verbose

11 years agoadd and update SDL for Win32; make Win32 build work
Rudolf Polzer [Thu, 5 Aug 2010 04:11:40 +0000 (06:11 +0200)]
add and update SDL for Win32; make Win32 build work

11 years agoadd DX3 headers
Rudolf Polzer [Thu, 5 Aug 2010 04:02:24 +0000 (06:02 +0200)]
add DX3 headers

11 years agoadd win32 libs
Rudolf Polzer [Thu, 5 Aug 2010 04:00:29 +0000 (06:00 +0200)]
add win32 libs

11 years agoupdate d0_ libraries linux64
Rudolf Polzer [Thu, 5 Aug 2010 03:48:07 +0000 (05:48 +0200)]
update d0_ libraries linux64

11 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Thu, 5 Aug 2010 03:47:06 +0000 (05:47 +0200)]
Merge branch 'master' into divVerent/crypto2

11 years agofix name typo
Rudolf Polzer [Wed, 4 Aug 2010 19:33:55 +0000 (21:33 +0200)]
fix name typo

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Wed, 4 Aug 2010 19:32:21 +0000 (21:32 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

11 years agouse div0-gittools from xonotic git server
Rudolf Polzer [Wed, 4 Aug 2010 19:32:11 +0000 (21:32 +0200)]
use div0-gittools from xonotic git server

11 years agoproperly ignore merges in upstream rebase detection
Rudolf Polzer [Wed, 4 Aug 2010 10:40:57 +0000 (12:40 +0200)]
properly ignore merges in upstream rebase detection

11 years agomore typo fixing :)
Rudolf Polzer [Wed, 4 Aug 2010 10:39:44 +0000 (12:39 +0200)]
more typo fixing :)

11 years agofix a typo ;)
Rudolf Polzer [Wed, 4 Aug 2010 10:34:36 +0000 (12:34 +0200)]
fix a typo ;)

11 years agotry to autodetect and fix upstream rebase
Rudolf Polzer [Wed, 4 Aug 2010 10:26:57 +0000 (12:26 +0200)]
try to autodetect and fix upstream rebase

11 years agonow that we HAVE an official map, we can get rid of the ???????????????-????????...
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

11 years agonew var in release building: $HOSTS_THAT_ARE_MYSELF - hosts on which no SSH is to...
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

11 years agomore typo fix
Rudolf Polzer [Mon, 2 Aug 2010 14:05:32 +0000 (16:05 +0200)]
more typo fix

11 years agoavoid more rsync
Rudolf Polzer [Mon, 2 Aug 2010 14:04:48 +0000 (16:04 +0200)]
avoid more rsync

11 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Mon, 2 Aug 2010 14:02:19 +0000 (16:02 +0200)]
Merge branch 'master' into divVerent/crypto2

11 years agomingw64 build fix
Rudolf Polzer [Mon, 2 Aug 2010 13:46:06 +0000 (15:46 +0200)]
mingw64 build fix

11 years ago./all release: more fixes
Rudolf Polzer [Mon, 2 Aug 2010 14:01:58 +0000 (16:01 +0200)]
./all release: more fixes

11 years agomingw64 build fix
Rudolf Polzer [Mon, 2 Aug 2010 13:46:06 +0000 (15:46 +0200)]
mingw64 build fix

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Thu, 29 Jul 2010 16:23:56 +0000 (18:23 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

11 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Mon, 26 Jul 2010 13:52:20 +0000 (15:52 +0200)]
Merge branch 'master' into divVerent/crypto2

11 years agodelete libraries we are not using yet
Rudolf Polzer [Mon, 26 Jul 2010 13:51:20 +0000 (15:51 +0200)]
delete libraries we are not using yet

11 years agoRevert "add d0_blind_id DLLs to our DLL dump"
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.

11 years agonew versions of the libs, this time with rijndael in separate lib
Rudolf Polzer [Mon, 26 Jul 2010 13:50:04 +0000 (15:50 +0200)]
new versions of the libs, this time with rijndael in separate lib

11 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Mon, 26 Jul 2010 12:36:38 +0000 (14:36 +0200)]
Merge branch 'master' into divVerent/crypto2

11 years agoadd d0_blind_id DLLs to our DLL dump
Rudolf Polzer [Mon, 26 Jul 2010 12:36:18 +0000 (14:36 +0200)]
add d0_blind_id DLLs to our DLL dump

11 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Mon, 26 Jul 2010 12:34:39 +0000 (14:34 +0200)]
Merge branch 'master' into divVerent/crypto2

Conflicts:
all

11 years agoupdate win32 modplug dll
Rudolf Polzer [Mon, 26 Jul 2010 12:05:55 +0000 (14:05 +0200)]
update win32 modplug dll

11 years agomark libcurl-4.dll unexecutable (means nothing to Windows, but I know it needs to...
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)

11 years agobuildfiles: rename dir from w32 to win32
Rudolf Polzer [Mon, 26 Jul 2010 11:35:34 +0000 (13:35 +0200)]
buildfiles: rename dir from w32 to win32

11 years agolinux64 library dependencies for use by build script
Rudolf Polzer [Mon, 26 Jul 2010 11:32:20 +0000 (13:32 +0200)]
linux64 library dependencies for use by build script

11 years agofix some typos in ./all
Rudolf Polzer [Mon, 26 Jul 2010 11:22:52 +0000 (13:22 +0200)]
fix some typos in ./all

11 years agoweapon profiler: add seeker
Rudolf Polzer [Sun, 25 Jul 2010 05:57:06 +0000 (07:57 +0200)]
weapon profiler: add seeker

11 years agoMerge remote branch 'origin/master' into divVerent/crypto2
Rudolf Polzer [Fri, 23 Jul 2010 06:44:40 +0000 (08:44 +0200)]
Merge remote branch 'origin/master' into divVerent/crypto2

11 years agofix admin-merge :P
Rudolf Polzer [Wed, 21 Jul 2010 18:13:54 +0000 (20:13 +0200)]
fix admin-merge :P

11 years agosmall syntax fix
Rudolf Polzer [Wed, 21 Jul 2010 18:01:32 +0000 (20:01 +0200)]
small syntax fix

11 years agoMerge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Rudolf Polzer [Wed, 21 Jul 2010 18:01:03 +0000 (20:01 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

11 years agoalso add -fastbounce by default. Though there is no -bounce in the default settings...
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.

11 years agoadd default options -fast and -dirty. If you do not want them, add --no-fast or ...
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

11 years agomap compiler: allow an option --no-fast that removes a -fast option (possibly includi...
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

11 years agofix typo
Rudolf Polzer [Wed, 21 Jul 2010 13:05:51 +0000 (15:05 +0200)]
fix typo

11 years agoREALLY fix timeout feature
Rudolf Polzer [Wed, 21 Jul 2010 13:03:35 +0000 (15:03 +0200)]
REALLY fix timeout feature

11 years agoalso touch all files, to make git actually reread them
Rudolf Polzer [Wed, 21 Jul 2010 09:10:14 +0000 (11:10 +0200)]
also touch all files, to make git actually reread them

11 years agoadd back the autocrlf config option in ./all - yes, had to
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.

11 years agofix another typo
Rudolf Polzer [Wed, 21 Jul 2010 08:52:05 +0000 (10:52 +0200)]
fix another typo

11 years agoCRLF fixes, .gitattributes file updated
Rudolf Polzer [Wed, 21 Jul 2010 08:50:11 +0000 (10:50 +0200)]
CRLF fixes, .gitattributes file updated

11 years agoCRLF fixes, .gitattributes file updated
Rudolf Polzer [Wed, 21 Jul 2010 08:50:04 +0000 (10:50 +0200)]
CRLF fixes, .gitattributes file updated

11 years agothe "*" rule must come first
Rudolf Polzer [Wed, 21 Jul 2010 08:49:48 +0000 (10:49 +0200)]
the "*" rule must come first

11 years agoalso add the attributes file
Rudolf Polzer [Wed, 21 Jul 2010 08:47:39 +0000 (10:47 +0200)]
also add the attributes file

11 years agocheckout master again
Rudolf Polzer [Wed, 21 Jul 2010 08:34:06 +0000 (10:34 +0200)]
checkout master again

11 years agoalways return true
Rudolf Polzer [Wed, 21 Jul 2010 08:32:45 +0000 (10:32 +0200)]
always return true

11 years agoCRLF fixes, .gitattributes file updated
Rudolf Polzer [Wed, 21 Jul 2010 08:30:31 +0000 (10:30 +0200)]
CRLF fixes, .gitattributes file updated

11 years agoCRLF fixes, .gitattributes file updated
Rudolf Polzer [Wed, 21 Jul 2010 08:30:26 +0000 (10:30 +0200)]
CRLF fixes, .gitattributes file updated

11 years agofix usage of HEAD
Rudolf Polzer [Wed, 21 Jul 2010 08:29:40 +0000 (10:29 +0200)]
fix usage of HEAD

11 years agomore fixing
Rudolf Polzer [Wed, 21 Jul 2010 08:26:47 +0000 (10:26 +0200)]
more fixing

11 years agoadd a gitattributes helper script
Rudolf Polzer [Wed, 21 Jul 2010 08:24:45 +0000 (10:24 +0200)]
add a gitattributes helper script

11 years agogitattributes: add a default crlf value
Rudolf Polzer [Wed, 21 Jul 2010 07:57:31 +0000 (09:57 +0200)]
gitattributes: add a default crlf value

11 years agobetter time measuring
Rudolf Polzer [Mon, 19 Jul 2010 12:40:45 +0000 (14:40 +0200)]
better time measuring

11 years agomore timeout fixing
Rudolf Polzer [Mon, 19 Jul 2010 12:39:21 +0000 (14:39 +0200)]
more timeout fixing

11 years agocut down hashes also on finished compile
Rudolf Polzer [Mon, 19 Jul 2010 07:23:14 +0000 (09:23 +0200)]
cut down hashes also on finished compile

11 years agofixes :P
Rudolf Polzer [Mon, 19 Jul 2010 07:16:54 +0000 (09:16 +0200)]
fixes :P

11 years agofix timeouts
Rudolf Polzer [Mon, 19 Jul 2010 06:34:34 +0000 (08:34 +0200)]
fix timeouts

11 years agoautobuild scripts: specify timeouts for the q3map2 stages
Rudolf Polzer [Mon, 19 Jul 2010 06:33:26 +0000 (08:33 +0200)]
autobuild scripts: specify timeouts for the q3map2 stages

11 years agohope this will yield useful exit status
Rudolf Polzer [Mon, 19 Jul 2010 05:58:50 +0000 (07:58 +0200)]
hope this will yield useful exit status

11 years agotreat 404 as warning, not error
Rudolf Polzer [Sun, 18 Jul 2010 17:08:13 +0000 (19:08 +0200)]
treat 404 as warning, not error

11 years agohard exit 1 if a "cd" failed :(
Rudolf Polzer [Sun, 18 Jul 2010 15:18:15 +0000 (17:18 +0200)]
hard exit 1 if a "cd" failed :(

11 years agonew key_0, Xon//KssdlzGkFKdnnN4sgg8H+koTbBn5JTi37BAW1Q=
Rudolf Polzer [Sat, 17 Jul 2010 18:57:22 +0000 (20:57 +0200)]
new key_0, Xon//KssdlzGkFKdnnN4sgg8H+koTbBn5JTi37BAW1Q=

11 years agonew key_15 = TEST5XYWfX09i5/ekwTd1cJkalvnR3A1AvBlFPijhE0=
Rudolf Polzer [Sat, 17 Jul 2010 17:56:31 +0000 (19:56 +0200)]
new key_15 = TEST5XYWfX09i5/ekwTd1cJkalvnR3A1AvBlFPijhE0=

11 years agoShow "(no_branch)" instead of "(no" in the output of the command branches (for exampl...
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)

11 years agoMerge remote branch 'origin/master' into divVerent/crypto2
Rudolf Polzer [Sat, 17 Jul 2010 15:05:09 +0000 (17:05 +0200)]
Merge remote branch 'origin/master' into divVerent/crypto2

Conflicts:
all

11 years agoFix compile command to handle correctly the optional argument <client>
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 :)

11 years agoimprove ircspam
Rudolf Polzer [Sat, 17 Jul 2010 13:40:04 +0000 (15:40 +0200)]
improve ircspam

11 years agoautobuild: improve messages, detect exit status
Rudolf Polzer [Sat, 17 Jul 2010 13:18:14 +0000 (15:18 +0200)]
autobuild: improve messages, detect exit status

11 years agoadmin-merge: use --no-ff
Rudolf Polzer [Fri, 16 Jul 2010 21:44:35 +0000 (23:44 +0200)]
admin-merge: use --no-ff

11 years agokey_15 regenerated and updated too now. Fingerprint: TESTXb8Uc+UPEIwLZ5a7+BcR614=
Rudolf Polzer [Thu, 15 Jul 2010 14:54:32 +0000 (16:54 +0200)]
key_15 regenerated and updated too now. Fingerprint: TESTXb8Uc+UPEIwLZ5a7+BcR614=

11 years agoupdate key_0 to work with new d0_blind_id code. Fingerprint now is Xon//vwjXVSP+wLZJG...
Rudolf Polzer [Thu, 15 Jul 2010 13:40:01 +0000 (15:40 +0200)]
update key_0 to work with new d0_blind_id code. Fingerprint now is Xon//vwjXVSP+wLZJGejzdJ/Ee8=

11 years agoimprove mapinfo documentation
Rudolf Polzer [Wed, 14 Jul 2010 14:36:54 +0000 (16:36 +0200)]
improve mapinfo documentation

11 years agoinclude d0_blind_id in ./all compile and run
Rudolf Polzer [Wed, 14 Jul 2010 07:08:52 +0000 (09:08 +0200)]
include d0_blind_id in ./all compile and run

11 years agoalso make key_0 accessible to merlijn
Rudolf Polzer [Sat, 10 Jul 2010 10:28:29 +0000 (12:28 +0200)]
also make key_0 accessible to merlijn

11 years agore-encrypt key_15 so merlijn can also read it
Rudolf Polzer [Sat, 10 Jul 2010 10:27:03 +0000 (12:27 +0200)]
re-encrypt key_15 so merlijn can also read it

11 years agoalso .gitignore user keys
Rudolf Polzer [Sat, 10 Jul 2010 10:08:41 +0000 (12:08 +0200)]
also .gitignore user keys

11 years agofix .gitignore
Rudolf Polzer [Sat, 10 Jul 2010 10:08:19 +0000 (12:08 +0200)]
fix .gitignore

11 years agoofficial TESTING CA key (TESTz0leokAa2SBGJpGWkZJS9bw=)
Rudolf Polzer [Sat, 10 Jul 2010 09:56:10 +0000 (11:56 +0200)]
official TESTING CA key (TESTz0leokAa2SBGJpGWkZJS9bw=)

11 years agoadd our "production PKI" keys (the private key is encrypted to my own GPG key - we...
Rudolf Polzer [Sat, 10 Jul 2010 06:57:12 +0000 (08:57 +0200)]
add our "production PKI" keys (the private key is encrypted to my own GPG key - we can later re-encrypt it to other GPG identities)

11 years agoMerge remote branch 'refs/remotes/origin/merlijn/sdl-osx'
Rudolf Polzer [Fri, 9 Jul 2010 21:08:38 +0000 (23:08 +0200)]
Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx'

11 years agoproperly identify upstream
Rudolf Polzer [Fri, 9 Jul 2010 20:54:58 +0000 (22:54 +0200)]
properly identify upstream

11 years agoadd cleaner OSX version filter
merlijn [Fri, 9 Jul 2010 20:48:47 +0000 (22:48 +0200)]
add cleaner OSX version filter

11 years agocompile against shipped SDL
Merlijn Hofstra [Thu, 8 Jul 2010 20:12:54 +0000 (22:12 +0200)]
compile against shipped SDL

11 years agoupdate to SDL 1.2.14
Merlijn Hofstra [Thu, 8 Jul 2010 18:48:56 +0000 (20:48 +0200)]
update to SDL 1.2.14

11 years agochange to unconverted and current version of Nimbus Sans L
Rudolf Polzer [Wed, 7 Jul 2010 19:52:17 +0000 (21:52 +0200)]
change to unconverted and current version of Nimbus Sans L