xonotic/xonotic.git
10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Fri, 6 Aug 2010 06:36:35 +0000 (08:36 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agoproperly rebrand the DP binaries
Rudolf Polzer [Fri, 6 Aug 2010 06:36:25 +0000 (08:36 +0200)]
properly rebrand the DP binaries

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Fri, 6 Aug 2010 06:31:53 +0000 (08:31 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agoadd XPM variant of logo
Rudolf Polzer [Fri, 6 Aug 2010 06:31:45 +0000 (08:31 +0200)]
add XPM variant of logo

10 years agofix splitting of textures into jpeg-with-alpha
Rudolf Polzer [Fri, 6 Aug 2010 06:22:25 +0000 (08:22 +0200)]
fix splitting of textures into jpeg-with-alpha

10 years agodds: support both texture paths via symlink
Rudolf Polzer [Fri, 6 Aug 2010 06:16:05 +0000 (08:16 +0200)]
dds: support both texture paths via symlink

10 years agomore bugfixes...
Rudolf Polzer [Fri, 6 Aug 2010 04:30:26 +0000 (06:30 +0200)]
more bugfixes...

10 years agocached converter: PROPERLY decide what to DDS-ify
Rudolf Polzer [Thu, 5 Aug 2010 19:51:18 +0000 (21:51 +0200)]
cached converter: PROPERLY decide what to DDS-ify

10 years agoI accidentally some TGA files
Rudolf Polzer [Thu, 5 Aug 2010 19:29:37 +0000 (21:29 +0200)]
I accidentally some TGA files

10 years agofix a syntax FAIL
Rudolf Polzer [Thu, 5 Aug 2010 18:54:32 +0000 (20:54 +0200)]
fix a syntax FAIL

10 years agosimplify build
Rudolf Polzer [Thu, 5 Aug 2010 18:19:44 +0000 (20:19 +0200)]
simplify build

10 years agorelease build: also delete stale zip files
Rudolf Polzer [Thu, 5 Aug 2010 18:15:24 +0000 (20:15 +0200)]
release build: also delete stale zip files

10 years agoedit the config to adjust the version number
Rudolf Polzer [Thu, 5 Aug 2010 18:12:49 +0000 (20:12 +0200)]
edit the config to adjust the version number

10 years agomore release build stuff
Rudolf Polzer [Thu, 5 Aug 2010 18:01:27 +0000 (20:01 +0200)]
more release build stuff

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Thu, 5 Aug 2010 17:31:04 +0000 (19:31 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years ago--netradiant-NexuizPack
Rudolf Polzer [Thu, 5 Aug 2010 17:30:53 +0000 (19:30 +0200)]
--netradiant-NexuizPack

10 years agoalso compress lightmaps
Rudolf Polzer [Thu, 5 Aug 2010 15:24:24 +0000 (17:24 +0200)]
also compress lightmaps

10 years agomake +x again
Rudolf Polzer [Thu, 5 Aug 2010 15:11:07 +0000 (17:11 +0200)]
make +x again

10 years agofix loading of the compiled maps
Rudolf Polzer [Thu, 5 Aug 2010 15:10:00 +0000 (17:10 +0200)]
fix loading of the compiled maps

10 years agomusic only uses 2 variants
Rudolf Polzer [Thu, 5 Aug 2010 13:39:01 +0000 (15:39 +0200)]
music only uses 2 variants

10 years agoallow ALL sounds to be oggenc'd down
Rudolf Polzer [Thu, 5 Aug 2010 13:37:28 +0000 (15:37 +0200)]
allow ALL sounds to be oggenc'd down

10 years agoalso handle wav-to-ogg
Rudolf Polzer [Thu, 5 Aug 2010 13:33:03 +0000 (15:33 +0200)]
also handle wav-to-ogg

10 years agocache the checksums of the files
Rudolf Polzer [Thu, 5 Aug 2010 13:27:01 +0000 (15:27 +0200)]
cache the checksums of the files

10 years agohas_alpha is not a conversion
Rudolf Polzer [Thu, 5 Aug 2010 13:19:42 +0000 (15:19 +0200)]
has_alpha is not a conversion

10 years agoa "lowdds" transform: keep ONLY dds textures
Rudolf Polzer [Thu, 5 Aug 2010 13:16:29 +0000 (15:16 +0200)]
a "lowdds" transform: keep ONLY dds textures

10 years ago"low" transform: 85% jpeg, 95% for alpha channels
Rudolf Polzer [Thu, 5 Aug 2010 13:05:49 +0000 (15:05 +0200)]
"low" transform: 85% jpeg, 95% for alpha channels

10 years agoalso compress textures in models/
Rudolf Polzer [Thu, 5 Aug 2010 12:59:05 +0000 (14:59 +0200)]
also compress textures in models/

10 years agoworkaround for sometimes failing wine
Rudolf Polzer [Thu, 5 Aug 2010 12:50:19 +0000 (14:50 +0200)]
workaround for sometimes failing wine

10 years agoalso cache whether the images have alpha or not
Rudolf Polzer [Thu, 5 Aug 2010 12:38:34 +0000 (14:38 +0200)]
also cache whether the images have alpha or not

10 years agomore text
Rudolf Polzer [Thu, 5 Aug 2010 12:31:00 +0000 (14:31 +0200)]
more text

10 years agofix the mkdir related stuff
Rudolf Polzer [Thu, 5 Aug 2010 12:02:13 +0000 (14:02 +0200)]
fix the mkdir related stuff

10 years agofix another typo breaking release building
Rudolf Polzer [Thu, 5 Aug 2010 11:58:36 +0000 (13:58 +0200)]
fix another typo breaking release building

10 years agofix compressonator usage
Rudolf Polzer [Thu, 5 Aug 2010 11:48:24 +0000 (13:48 +0200)]
fix compressonator usage

10 years agofix another typo
Rudolf Polzer [Thu, 5 Aug 2010 10:19:39 +0000 (12:19 +0200)]
fix another typo

10 years agofix typos
Rudolf Polzer [Thu, 5 Aug 2010 10:11:05 +0000 (12:11 +0200)]
fix typos

10 years agocreate missing dirs
Rudolf Polzer [Thu, 5 Aug 2010 10:08:29 +0000 (12:08 +0200)]
create missing dirs

10 years agooops, forgot to use Xvfb here
Rudolf Polzer [Thu, 5 Aug 2010 09:01:18 +0000 (11:01 +0200)]
oops, forgot to use Xvfb here

10 years agostart X11 as compressonator needs it
Rudolf Polzer [Thu, 5 Aug 2010 08:59:22 +0000 (10:59 +0200)]
start X11 as compressonator needs it

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Thu, 5 Aug 2010 08:41:38 +0000 (10:41 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agomake build dirs "clean" of DP and FTEQCC
Rudolf Polzer [Thu, 5 Aug 2010 08:41:10 +0000 (10:41 +0200)]
make build dirs "clean" of DP and FTEQCC

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

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

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

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

10 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

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

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

10 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

10 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

10 years agoparallelize something
Rudolf Polzer [Wed, 4 Aug 2010 14:20:09 +0000 (16:20 +0200)]
parallelize something

10 years agorelease building: new toys
Rudolf Polzer [Wed, 4 Aug 2010 14:19:08 +0000 (16:19 +0200)]
release building: new toys

10 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

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

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

10 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

10 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

10 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

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

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

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

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

10 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

10 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

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

10 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

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 agoweapon profiler: add seeker
Rudolf Polzer [Sun, 25 Jul 2010 05:57:06 +0000 (07:57 +0200)]
weapon profiler: add seeker

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