xonotic/xonotic.git
10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Sat, 2 Oct 2010 19:25:02 +0000 (21:25 +0200)]
Merge branch 'master' into divVerent/crypto2

Conflicts:
all

10 years agoexperimentally enable compilation with v6 support
Rudolf Polzer [Sat, 2 Oct 2010 19:24:02 +0000 (21:24 +0200)]
experimentally enable compilation with v6 support

10 years agouse -xonotic now
Rudolf Polzer [Sat, 2 Oct 2010 18:00:23 +0000 (20:00 +0200)]
use -xonotic now

10 years agoadjust timeouts for auto screenshots
Rudolf Polzer [Sat, 2 Oct 2010 11:26:21 +0000 (13:26 +0200)]
adjust timeouts for auto screenshots

10 years agouse a short URL
Rudolf Polzer [Fri, 1 Oct 2010 22:11:21 +0000 (00:11 +0200)]
use a short URL

10 years agofix :)
Rudolf Polzer [Fri, 1 Oct 2010 21:57:49 +0000 (23:57 +0200)]
fix :)

10 years agodon't return "bad" exit code
Rudolf Polzer [Fri, 1 Oct 2010 21:36:03 +0000 (23:36 +0200)]
don't return "bad" exit code

10 years agoset access permissions for map screenshots dir for my web script to work
Rudolf Polzer [Fri, 1 Oct 2010 14:17:23 +0000 (16:17 +0200)]
set access permissions for map screenshots dir for my web script to work

10 years agoignore some signals
Rudolf Polzer [Fri, 1 Oct 2010 05:33:55 +0000 (07:33 +0200)]
ignore some signals

10 years agouse a full BT
Rudolf Polzer [Fri, 1 Oct 2010 05:24:47 +0000 (07:24 +0200)]
use a full BT

10 years agobe more user friendly on crash
Rudolf Polzer [Fri, 1 Oct 2010 05:23:11 +0000 (07:23 +0200)]
be more user friendly on crash

10 years ago./all: drop into gdb if a crash happened and gdb is available (otherwise keep using...
Rudolf Polzer [Fri, 1 Oct 2010 05:16:04 +0000 (07:16 +0200)]
./all: drop into gdb if a crash happened and gdb is available (otherwise keep using catchsegv)

10 years agoa var rename
Rudolf Polzer [Wed, 29 Sep 2010 17:41:38 +0000 (19:41 +0200)]
a var rename

10 years agoprefer CTF when making map autobuilds
Rudolf Polzer [Wed, 29 Sep 2010 14:10:55 +0000 (16:10 +0200)]
prefer CTF when making map autobuilds

10 years agoautoscreenshots: turn off sound
Rudolf Polzer [Wed, 29 Sep 2010 13:50:28 +0000 (15:50 +0200)]
autoscreenshots: turn off sound

10 years agoskip "archived" branches
Rudolf Polzer [Wed, 29 Sep 2010 13:35:53 +0000 (15:35 +0200)]
skip "archived" branches

10 years agoclean up pk3s properly
Rudolf Polzer [Wed, 29 Sep 2010 13:34:16 +0000 (15:34 +0200)]
clean up pk3s properly

10 years agofix variable use
Rudolf Polzer [Wed, 29 Sep 2010 13:23:28 +0000 (15:23 +0200)]
fix variable use

10 years agoauto start X server when needed
Rudolf Polzer [Wed, 29 Sep 2010 13:17:08 +0000 (15:17 +0200)]
auto start X server when needed

10 years agosend error status
Rudolf Polzer [Wed, 29 Sep 2010 13:14:39 +0000 (15:14 +0200)]
send error status

10 years agohandle a failcase better
Rudolf Polzer [Wed, 29 Sep 2010 13:11:33 +0000 (15:11 +0200)]
handle a failcase better

10 years agoallow more tries
Rudolf Polzer [Wed, 29 Sep 2010 13:10:04 +0000 (15:10 +0200)]
allow more tries

10 years agooops, that command was wrong and evil
Rudolf Polzer [Wed, 29 Sep 2010 13:07:23 +0000 (15:07 +0200)]
oops, that command was wrong and evil

10 years agoprefix the file name better
Rudolf Polzer [Wed, 29 Sep 2010 13:00:06 +0000 (15:00 +0200)]
prefix the file name better

10 years agofigbux
Rudolf Polzer [Wed, 29 Sep 2010 12:54:25 +0000 (14:54 +0200)]
figbux

10 years agohandle failure
Rudolf Polzer [Wed, 29 Sep 2010 12:53:17 +0000 (14:53 +0200)]
handle failure

10 years agoalso add a screenshot script
Rudolf Polzer [Wed, 29 Sep 2010 12:48:44 +0000 (14:48 +0200)]
also add a screenshot script

10 years agoadd an autoscreenshot method
Rudolf Polzer [Wed, 29 Sep 2010 12:43:59 +0000 (14:43 +0200)]
add an autoscreenshot method

10 years agouse http for accessing github, not git://
Rudolf Polzer [Tue, 28 Sep 2010 15:33:59 +0000 (17:33 +0200)]
use http for accessing github, not git://

10 years agofix a typo in the shader maker conversion
Rudolf Polzer [Tue, 28 Sep 2010 10:16:24 +0000 (12:16 +0200)]
fix a typo in the shader maker conversion

10 years agobetter usage message
Rudolf Polzer [Sun, 26 Sep 2010 14:24:36 +0000 (16:24 +0200)]
better usage message

10 years agoadd a shell script port of shade.vbs
Rudolf Polzer [Sun, 26 Sep 2010 14:23:34 +0000 (16:23 +0200)]
add a shell script port of shade.vbs

10 years agoMerge remote branch 'origin/tzork/shadescript'
Rudolf Polzer [Sun, 26 Sep 2010 13:45:00 +0000 (15:45 +0200)]
Merge remote branch 'origin/tzork/shadescript'

10 years agofix another syntax error
Rudolf Polzer [Sun, 26 Sep 2010 11:52:57 +0000 (13:52 +0200)]
fix another syntax error

10 years agochange a comma to a semicolon to make all work again, thanks MrBougo
merlijn [Sun, 26 Sep 2010 08:11:23 +0000 (10:11 +0200)]
change a comma to a semicolon to make all work again, thanks MrBougo

10 years ago./all run: use catchsegv if available
Rudolf Polzer [Sun, 26 Sep 2010 06:51:27 +0000 (08:51 +0200)]
./all run: use catchsegv if available

10 years agoCommit simple .vbs for automatic generation of shader from a textureset
Jakob MG [Sun, 26 Sep 2010 00:32:58 +0000 (02:32 +0200)]
Commit simple .vbs for automatic generation of shader from a textureset

10 years agoalso remote prune origin when using --reclone
Rudolf Polzer [Sat, 25 Sep 2010 09:06:44 +0000 (11:06 +0200)]
also remote prune origin when using --reclone

10 years agofix admin-merge test compile
Rudolf Polzer [Sat, 25 Sep 2010 08:23:10 +0000 (10:23 +0200)]
fix admin-merge test compile

10 years agofix the fixme
Rudolf Polzer [Sat, 25 Sep 2010 08:21:14 +0000 (10:21 +0200)]
fix the fixme

10 years agoMerge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Rudolf Polzer [Sat, 25 Sep 2010 08:20:28 +0000 (10:20 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Sat, 25 Sep 2010 08:16:25 +0000 (10:16 +0200)]
Merge branch 'master' into divVerent/crypto2

Conflicts:
all

10 years agoreordered the repos in ./all in a better order (more in order of priority)
Rudolf Polzer [Sat, 25 Sep 2010 08:15:37 +0000 (10:15 +0200)]
reordered the repos in ./all in a better order (more in order of priority)

10 years agoFix again a wrong cvar name (previous fix was undone by the merge commit) and add...
terencehill [Fri, 24 Sep 2010 21:23:39 +0000 (23:23 +0200)]
Fix again a wrong cvar name (previous fix was undone by the merge commit) and add a fixme comment

10 years agoturn D3D off again in release builds (and build without C++)
Rudolf Polzer [Fri, 24 Sep 2010 20:12:08 +0000 (22:12 +0200)]
turn D3D off again in release builds (and build without C++)

10 years agocompile SDL with the C compiler again
Rudolf Polzer [Fri, 24 Sep 2010 11:05:32 +0000 (13:05 +0200)]
compile SDL with the C compiler again

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Fri, 24 Sep 2010 10:50:35 +0000 (12:50 +0200)]
Merge branch 'master' into divVerent/crypto2

Conflicts:
misc/builddeps/dp.win64/include/d3dtypes.h
misc/builddeps/dp.win64/include/dsound.h

10 years agoadd win64 D3D9 headers
Rudolf Polzer [Fri, 24 Sep 2010 10:48:00 +0000 (12:48 +0200)]
add win64 D3D9 headers

10 years agoproperly build as C++
Rudolf Polzer [Fri, 24 Sep 2010 10:41:18 +0000 (12:41 +0200)]
properly build as C++

10 years agowin32: enable D3D9 (win64 not yet, have no working win64 C++ compiler here)
Rudolf Polzer [Fri, 24 Sep 2010 10:05:38 +0000 (12:05 +0200)]
win32: enable D3D9 (win64 not yet, have no working win64 C++ compiler here)

10 years agobetter distribute source code
Rudolf Polzer [Fri, 24 Sep 2010 04:50:10 +0000 (06:50 +0200)]
better distribute source code

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Thu, 23 Sep 2010 14:42:36 +0000 (16:42 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agoalso make a foo-full-HASH.pk3 when building a map that also contains files of the...
Rudolf Polzer [Thu, 23 Sep 2010 14:41:57 +0000 (16:41 +0200)]
also make a foo-full-HASH.pk3 when building a map that also contains files of the branch vs master

10 years agofix a stupid find command :)
Rudolf Polzer [Sun, 19 Sep 2010 19:35:03 +0000 (21:35 +0200)]
fix a stupid find command :)

10 years agoMerge remote branch 'origin/master' into divVerent/crypto2
Rudolf Polzer [Sun, 19 Sep 2010 19:03:03 +0000 (21:03 +0200)]
Merge remote branch 'origin/master' into divVerent/crypto2

10 years agofix ./all clean -f -m
Rudolf Polzer [Sat, 18 Sep 2010 14:58:48 +0000 (16:58 +0200)]
fix ./all clean -f -m

10 years agofix -fU parsing
Rudolf Polzer [Sat, 18 Sep 2010 11:25:55 +0000 (13:25 +0200)]
fix -fU parsing

10 years agoupdate help in ./all
Rudolf Polzer [Sat, 18 Sep 2010 11:24:27 +0000 (13:24 +0200)]
update help in ./all

10 years agoby default, rm untracked files
Rudolf Polzer [Sat, 18 Sep 2010 11:17:46 +0000 (13:17 +0200)]
by default, rm untracked files

10 years agoreclone: also fetch upstream, this then even can recover from upstream changes
Rudolf Polzer [Sat, 18 Sep 2010 11:13:43 +0000 (13:13 +0200)]
reclone: also fetch upstream, this then even can recover from upstream changes

10 years ago./all clean --reclone
Rudolf Polzer [Sat, 18 Sep 2010 11:09:46 +0000 (13:09 +0200)]
./all clean --reclone

10 years agobe more verbose
Rudolf Polzer [Sat, 18 Sep 2010 11:07:46 +0000 (13:07 +0200)]
be more verbose

10 years ago./all branches: more concise display; ./all clean: allow resetting the repo into...
Rudolf Polzer [Sat, 18 Sep 2010 11:03:28 +0000 (13:03 +0200)]
./all branches: more concise display; ./all clean: allow resetting the repo into pristine state (-m -fu -r -D, meaning "master, force upstream, remove untracked, delete other branches")

10 years agoMerge remote branch 'refs/remotes/origin/esteel/finished/fixserver'
Rudolf Polzer [Sat, 18 Sep 2010 10:39:45 +0000 (12:39 +0200)]
Merge remote branch 'refs/remotes/origin/esteel/finished/fixserver'

10 years agorename win64 binaries for consistency
Rudolf Polzer [Fri, 17 Sep 2010 22:08:35 +0000 (00:08 +0200)]
rename win64 binaries for consistency

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Fri, 17 Sep 2010 22:08:06 +0000 (00:08 +0200)]
Merge branch 'master' into divVerent/crypto2

10 years agowe CAN continue to keep these libs in git, we just need to disable them in releases
Rudolf Polzer [Fri, 17 Sep 2010 22:01:51 +0000 (00:01 +0200)]
we CAN continue to keep these libs in git, we just need to disable them in releases

10 years agoRevert "separate out the rijndael libraries", instead doing this PROPERLY in a next...
Rudolf Polzer [Fri, 17 Sep 2010 22:01:03 +0000 (00:01 +0200)]
Revert "separate out the rijndael libraries", instead doing this PROPERLY in a next commit

This reverts commit 75241b8410df7629ffd3164a4ee1c95b30ba6a5a.

10 years agoadd same SDL prefix hack
Rudolf Polzer [Fri, 17 Sep 2010 19:21:03 +0000 (21:21 +0200)]
add same SDL prefix hack

10 years agoenable win64 SDL build
Rudolf Polzer [Fri, 17 Sep 2010 19:20:05 +0000 (21:20 +0200)]
enable win64 SDL build

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Fri, 17 Sep 2010 19:18:39 +0000 (21:18 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agoSDL for win64, I bet it's broken but better a broken SDL than no SDL
Rudolf Polzer [Fri, 17 Sep 2010 19:18:17 +0000 (21:18 +0200)]
SDL for win64, I bet it's broken but better a broken SDL than no SDL

10 years agosupport more filters; a (currently C99-only) way to invert discrete convolutions
Rudolf Polzer [Fri, 17 Sep 2010 15:55:34 +0000 (17:55 +0200)]
support more filters; a (currently C99-only) way to invert discrete convolutions

10 years agohonor irc_local when reconnecting too
Rudolf Polzer [Fri, 17 Sep 2010 10:51:14 +0000 (12:51 +0200)]
honor irc_local when reconnecting too

10 years agoseparate out the rijndael libraries
Rudolf Polzer [Fri, 17 Sep 2010 09:55:38 +0000 (11:55 +0200)]
separate out the rijndael libraries

10 years agowin64 dlls good now too
Rudolf Polzer [Fri, 17 Sep 2010 09:09:03 +0000 (11:09 +0200)]
win64 dlls good now too

10 years agoupdate my lib for osx, win32, linux32, linux64
Xonotic Build Service [Fri, 17 Sep 2010 07:26:38 +0000 (09:26 +0200)]
update my lib for osx, win32, linux32, linux64

10 years agoMerge remote branch 'origin/master' into divVerent/crypto2
Rudolf Polzer [Fri, 17 Sep 2010 05:37:59 +0000 (07:37 +0200)]
Merge remote branch 'origin/master' into divVerent/crypto2

10 years agofix parsing of "challenge" regarding NUL byte
Rudolf Polzer [Fri, 17 Sep 2010 05:33:53 +0000 (07:33 +0200)]
fix parsing of "challenge" regarding NUL byte

10 years agofix another typo
Rudolf Polzer [Fri, 17 Sep 2010 04:54:31 +0000 (06:54 +0200)]
fix another typo

10 years agowork around another problem in 7z's exclude logic
Rudolf Polzer [Thu, 16 Sep 2010 10:42:38 +0000 (12:42 +0200)]
work around another problem in 7z's exclude logic

10 years agodo not set +x on exe files
Rudolf Polzer [Thu, 16 Sep 2010 09:42:48 +0000 (11:42 +0200)]
do not set +x on exe files

10 years agofix a path error when release building
Rudolf Polzer [Thu, 16 Sep 2010 08:48:26 +0000 (10:48 +0200)]
fix a path error when release building

10 years agofix 7z/zip decision again :(
Rudolf Polzer [Thu, 16 Sep 2010 07:04:52 +0000 (09:04 +0200)]
fix 7z/zip decision again :(

10 years agoproperly distinguish between 7za and zip
Rudolf Polzer [Thu, 16 Sep 2010 06:41:57 +0000 (08:41 +0200)]
properly distinguish between 7za and zip

10 years agouse 7zip instead of infozip where possible
Rudolf Polzer [Thu, 16 Sep 2010 06:30:29 +0000 (08:30 +0200)]
use 7zip instead of infozip where possible

10 years agofix url_ssh
Rudolf Polzer [Thu, 16 Sep 2010 04:35:57 +0000 (06:35 +0200)]
fix url_ssh

10 years agotypo fix
Rudolf Polzer [Thu, 16 Sep 2010 04:25:49 +0000 (06:25 +0200)]
typo fix

10 years agocheck if map has been already built via HTTP too
Rudolf Polzer [Thu, 16 Sep 2010 04:24:22 +0000 (06:24 +0200)]
check if map has been already built via HTTP too

10 years agodo not run on the same commit hash more than once
Rudolf Polzer [Thu, 16 Sep 2010 04:20:08 +0000 (06:20 +0200)]
do not run on the same commit hash more than once

10 years agomove building to beta.xonotic.org
Rudolf Polzer [Thu, 16 Sep 2010 04:16:44 +0000 (06:16 +0200)]
move building to beta.xonotic.org

10 years agorelease build script: run sub-compiles with niceness of calling process
Rudolf Polzer [Wed, 15 Sep 2010 19:27:23 +0000 (21:27 +0200)]
release build script: run sub-compiles with niceness of calling process

10 years agowork around a vorbiscomment fail
Rudolf Polzer [Wed, 15 Sep 2010 16:18:56 +0000 (18:18 +0200)]
work around a vorbiscomment fail

10 years agoenable debugging during builds
Rudolf Polzer [Wed, 15 Sep 2010 11:21:13 +0000 (13:21 +0200)]
enable debugging during builds

10 years agofix typo
Rudolf Polzer [Wed, 15 Sep 2010 11:19:50 +0000 (13:19 +0200)]
fix typo

10 years agonew var HOSTS_THAT_ARE_DISABLED
Rudolf Polzer [Wed, 15 Sep 2010 11:14:23 +0000 (13:14 +0200)]
new var HOSTS_THAT_ARE_DISABLED

10 years agoGMP: require just i686, not pentium4
Rudolf Polzer [Tue, 14 Sep 2010 13:32:48 +0000 (15:32 +0200)]
GMP: require just i686, not pentium4

10 years agonow server_windows.bat should be able to find the binary
Stephan Stahl [Tue, 14 Sep 2010 09:07:45 +0000 (11:07 +0200)]
now server_windows.bat should be able to find the binary

10 years agoupdate-nexcompat: allow better syncing (ignore eX, trak4, trak5 now)
Rudolf Polzer [Tue, 14 Sep 2010 05:02:36 +0000 (07:02 +0200)]
update-nexcompat: allow better syncing (ignore eX, trak4, trak5 now)

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Tue, 14 Sep 2010 04:00:59 +0000 (06:00 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic