xonotic/xonotic.git
10 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

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

10 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)

10 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

10 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

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

10 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

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

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

10 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'

10 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.

10 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

10 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

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

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

10 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

10 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.

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

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

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

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

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

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

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

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

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

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

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

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

10 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

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

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

10 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

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

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

10 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

10 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

10 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

10 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 :(

10 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=

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

10 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)

10 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

10 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 :)

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

10 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

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

10 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=

10 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=

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

10 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

10 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

10 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

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

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

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

10 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)

10 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'

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

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

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

10 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

10 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

10 years agoRemove weird 'tname=' line in the windows script duplication
MrBougo [Wed, 7 Jul 2010 11:32:29 +0000 (13:32 +0200)]
Remove weird 'tname=' line in the windows script duplication

10 years agoUse the -mygames switch for DP
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.

10 years agoadd d0_blind_ip repo
Rudolf Polzer [Mon, 5 Jul 2010 08:52:14 +0000 (10:52 +0200)]
add d0_blind_ip repo

10 years agofix temp name overwrite in "all"
Rudolf Polzer [Sun, 4 Jul 2010 19:37:09 +0000 (21:37 +0200)]
fix temp name overwrite in "all"

10 years agofix the shifting
Rudolf Polzer [Sun, 4 Jul 2010 19:28:51 +0000 (21:28 +0200)]
fix the shifting

10 years agosupport -scale flags
Rudolf Polzer [Sun, 4 Jul 2010 17:14:39 +0000 (19:14 +0200)]
support -scale flags

10 years agofix syntax of $HOME var use
Rudolf Polzer [Sun, 4 Jul 2010 16:36:06 +0000 (18:36 +0200)]
fix syntax of $HOME var use

10 years ago./all compile "wgl sdl dedicated" (allow multiple targets to be given)
Rudolf Polzer [Sun, 4 Jul 2010 16:28:02 +0000 (18:28 +0200)]
./all compile "wgl sdl dedicated" (allow multiple targets to be given)

10 years agocleanup of release build compile lines
Rudolf Polzer [Fri, 2 Jul 2010 12:51:03 +0000 (14:51 +0200)]
cleanup of release build compile lines

10 years agoadd DEP and ASLR flags
Rudolf Polzer [Fri, 2 Jul 2010 12:47:06 +0000 (14:47 +0200)]
add DEP and ASLR flags

10 years agoadd a win64 target (untested)
Rudolf Polzer [Fri, 2 Jul 2010 12:44:22 +0000 (14:44 +0200)]
add a win64 target (untested)

10 years agorev-list, not rev-parse
Rudolf Polzer [Fri, 2 Jul 2010 12:04:00 +0000 (14:04 +0200)]
rev-list, not rev-parse

10 years agouse compile -n to speed up admin-merge
Rudolf Polzer [Fri, 2 Jul 2010 12:01:59 +0000 (14:01 +0200)]
use compile -n to speed up admin-merge

10 years agoautodetect whether a branch is based on master or on div0-stable; flag ./all compile...
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

10 years agoallow showing status number on irc
merlijn [Tue, 29 Jun 2010 16:41:10 +0000 (18:41 +0200)]
allow showing status number on irc

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Mon, 28 Jun 2010 12:27:41 +0000 (14:27 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agomore release build script stuff
Rudolf Polzer [Mon, 28 Jun 2010 12:27:27 +0000 (14:27 +0200)]
more release build script stuff

10 years agocompress-texture: when calling wine, unset $DISPLAY so it won't show a dialog box...
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.

10 years agoanother typo fix :P
Rudolf Polzer [Sat, 26 Jun 2010 14:57:19 +0000 (16:57 +0200)]
another typo fix :P

10 years agouse BoxFilter.dll in Compressonator
Rudolf Polzer [Sat, 26 Jun 2010 14:48:53 +0000 (16:48 +0200)]
use BoxFilter.dll in Compressonator

10 years agoallow choosing between ATICompressor and DXTC.dll
Rudolf Polzer [Sat, 26 Jun 2010 14:38:26 +0000 (16:38 +0200)]
allow choosing between ATICompressor and DXTC.dll

10 years agoalso support ATI Compressonator via WINE for release building
Rudolf Polzer [Sat, 26 Jun 2010 14:29:41 +0000 (16:29 +0200)]
also support ATI Compressonator via WINE for release building

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Fri, 25 Jun 2010 18:52:31 +0000 (20:52 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agomove shaderlist.txt into the individual dirs again now that we can
Rudolf Polzer [Thu, 24 Jun 2010 15:41:55 +0000 (17:41 +0200)]
move shaderlist.txt into the individual dirs again now that we can

10 years agoin .options files, change syntax to allow settings on different lines. Syntax rules...
Rudolf Polzer [Thu, 24 Jun 2010 13:53:02 +0000 (15:53 +0200)]
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

10 years agoLots of improvements for admin-merge-2
Rudolf Polzer [Thu, 24 Jun 2010 08:12:48 +0000 (10:12 +0200)]
Lots of improvements for admin-merge-2

10 years agorename admin-merge-2 to admin-merge, give it a branch name argument
Rudolf Polzer [Wed, 23 Jun 2010 19:27:43 +0000 (21:27 +0200)]
rename admin-merge-2 to admin-merge, give it a branch name argument

10 years agolet's use a free font for now, even though it doesn't look totally good
Rudolf Polzer [Wed, 23 Jun 2010 10:58:15 +0000 (12:58 +0200)]
let's use a free font for now, even though it doesn't look totally good

10 years agoand now without debug code
Rudolf Polzer [Tue, 22 Jun 2010 15:35:05 +0000 (17:35 +0200)]
and now without debug code

10 years agonow it even works
Rudolf Polzer [Tue, 22 Jun 2010 15:34:51 +0000 (17:34 +0200)]
now it even works

10 years agoeven prettier
Rudolf Polzer [Tue, 22 Jun 2010 15:33:56 +0000 (17:33 +0200)]
even prettier

10 years agonicer colors in ./all commit
Rudolf Polzer [Tue, 22 Jun 2010 15:32:43 +0000 (17:32 +0200)]
nicer colors in ./all commit

10 years agofix yet another ./all typo
Rudolf Polzer [Tue, 22 Jun 2010 15:28:25 +0000 (17:28 +0200)]
fix yet another ./all typo

10 years agoremove another md5sum dep
Rudolf Polzer [Tue, 22 Jun 2010 15:05:06 +0000 (17:05 +0200)]
remove another md5sum dep

10 years agomore converter fixes. Converter should work now.
Rudolf Polzer [Mon, 21 Jun 2010 14:43:11 +0000 (16:43 +0200)]
more converter fixes. Converter should work now.

10 years agoremove a sleep 10 debug command
Rudolf Polzer [Mon, 21 Jun 2010 14:25:52 +0000 (16:25 +0200)]
remove a sleep 10 debug command

10 years agoanother typo...
Rudolf Polzer [Mon, 21 Jun 2010 14:25:14 +0000 (16:25 +0200)]
another typo...