xonotic/xonotic.git
10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Thu, 14 Oct 2010 08:00:03 +0000 (10:00 +0200)]
Merge branch 'master' into divVerent/crypto2

Conflicts:
all

10 years agothere is no -mtune=generic
Rudolf Polzer [Thu, 14 Oct 2010 07:59:37 +0000 (09:59 +0200)]
there is no -mtune=generic

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Thu, 14 Oct 2010 07:32:59 +0000 (09:32 +0200)]
Merge branch 'master' into divVerent/crypto2

10 years agoinfobar also uses size 12
Rudolf Polzer [Wed, 13 Oct 2010 19:51:58 +0000 (21:51 +0200)]
infobar also uses size 12

10 years agofix infobar font
Rudolf Polzer [Wed, 13 Oct 2010 19:46:53 +0000 (21:46 +0200)]
fix infobar font

10 years agomore heavily optimize ./all compile -r builds
Rudolf Polzer [Wed, 13 Oct 2010 19:42:31 +0000 (21:42 +0200)]
more heavily optimize ./all compile -r builds

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Wed, 13 Oct 2010 19:40:52 +0000 (21:40 +0200)]
Merge branch 'master' into divVerent/crypto2

Conflicts:
all

10 years ago32bit builds: optimize for i686 instruction set (why not...)
Rudolf Polzer [Wed, 13 Oct 2010 19:40:13 +0000 (21:40 +0200)]
32bit builds: optimize for i686 instruction set (why not...)

10 years agomore improvements... no longer outputs [PB] sky
Rudolf Polzer [Wed, 13 Oct 2010 18:47:12 +0000 (20:47 +0200)]
more improvements... no longer outputs [PB] sky

10 years agoan attempt at a "starfield" skybox generator. Renders something entirely different...
Rudolf Polzer [Wed, 13 Oct 2010 18:15:50 +0000 (20:15 +0200)]
an attempt at a "starfield" skybox generator. Renders something entirely different though... ;)

10 years agodon't need the rev-parse output either
Rudolf Polzer [Wed, 13 Oct 2010 09:47:59 +0000 (11:47 +0200)]
don't need the rev-parse output either

10 years agodon't show a stupid error message
Rudolf Polzer [Wed, 13 Oct 2010 09:46:58 +0000 (11:46 +0200)]
don't show a stupid error message

10 years agoclean --reclone: never delete master or the repo-branch
Rudolf Polzer [Wed, 13 Oct 2010 09:43:16 +0000 (11:43 +0200)]
clean --reclone: never delete master or the repo-branch

10 years agobrightspot finding tool: improve output
Rudolf Polzer [Tue, 12 Oct 2010 19:35:12 +0000 (21:35 +0200)]
brightspot finding tool: improve output

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Fri, 8 Oct 2010 19:45:54 +0000 (21:45 +0200)]
Merge branch 'master' into divVerent/crypto2

Conflicts:
all

10 years agofix some typos in the C89 code
Rudolf Polzer [Thu, 7 Oct 2010 12:28:16 +0000 (14:28 +0200)]
fix some typos in the C89 code

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Thu, 7 Oct 2010 12:17:54 +0000 (14:17 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years ago./all compile: flag -r to make a release (not debug) build
Rudolf Polzer [Thu, 7 Oct 2010 12:16:55 +0000 (14:16 +0200)]
./all compile: flag -r to make a release (not debug) build

10 years agoimplement a missing C89 case
Rudolf Polzer [Thu, 7 Oct 2010 12:16:15 +0000 (14:16 +0200)]
implement a missing C89 case

10 years agomake sure fix_config always works
Rudolf Polzer [Wed, 6 Oct 2010 10:10:42 +0000 (12:10 +0200)]
make sure fix_config always works

10 years agomake overriding more strict again
Rudolf Polzer [Tue, 5 Oct 2010 20:16:10 +0000 (22:16 +0200)]
make overriding more strict again

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic
Rudolf Polzer [Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic

10 years agoautobuild: support overriding map bounds for minimap from mapinfo
Rudolf Polzer [Tue, 5 Oct 2010 20:07:53 +0000 (22:07 +0200)]
autobuild: support overriding map bounds for minimap from mapinfo

10 years agotypo fix
Rudolf Polzer [Tue, 5 Oct 2010 16:41:19 +0000 (18:41 +0200)]
typo fix

10 years agowe still have to checkout in the screenshot system
Rudolf Polzer [Tue, 5 Oct 2010 16:38:21 +0000 (18:38 +0200)]
we still have to checkout in the screenshot system

10 years agofix another var
Rudolf Polzer [Tue, 5 Oct 2010 16:31:19 +0000 (18:31 +0200)]
fix another var

10 years agomore chdir
Rudolf Polzer [Tue, 5 Oct 2010 16:23:32 +0000 (18:23 +0200)]
more chdir

10 years agofollowup
Rudolf Polzer [Tue, 5 Oct 2010 16:23:03 +0000 (18:23 +0200)]
followup

10 years agofix another wrong chdir
Rudolf Polzer [Tue, 5 Oct 2010 16:22:33 +0000 (18:22 +0200)]
fix another wrong chdir

10 years agofix index building
Rudolf Polzer [Tue, 5 Oct 2010 12:38:20 +0000 (14:38 +0200)]
fix index building

10 years agofix index file name
Rudolf Polzer [Tue, 5 Oct 2010 12:12:06 +0000 (14:12 +0200)]
fix index file name

10 years agoanother chdir
Rudolf Polzer [Tue, 5 Oct 2010 12:11:28 +0000 (14:11 +0200)]
another chdir

10 years agofix a chdir bug
Rudolf Polzer [Tue, 5 Oct 2010 12:10:55 +0000 (14:10 +0200)]
fix a chdir bug

10 years agobuild index at a better place; fix exit code
Rudolf Polzer [Tue, 5 Oct 2010 12:09:26 +0000 (14:09 +0200)]
build index at a better place; fix exit code

10 years agoalso upload that index
Rudolf Polzer [Tue, 5 Oct 2010 12:03:41 +0000 (14:03 +0200)]
also upload that index

10 years agoexperimental change to the map build infrastructure... let's see what breaks :P ...
Rudolf Polzer [Tue, 5 Oct 2010 11:55:05 +0000 (13:55 +0200)]
experimental change to the map build infrastructure... let's see what breaks :P - allow building an index of the map compiles for the web interface to use

10 years agoremove that sleep as it didn't help anyway
Rudolf Polzer [Mon, 4 Oct 2010 16:02:39 +0000 (18:02 +0200)]
remove that sleep as it didn't help anyway

10 years agoimprove cleaning
Rudolf Polzer [Mon, 4 Oct 2010 13:30:03 +0000 (15:30 +0200)]
improve cleaning

10 years agofix pushurl handling
Rudolf Polzer [Mon, 4 Oct 2010 13:05:47 +0000 (15:05 +0200)]
fix pushurl handling

10 years agosupport pushurl
rpolzer [Mon, 4 Oct 2010 10:14:12 +0000 (12:14 +0200)]
support pushurl

10 years agosupport a separate push URL
rpolzer [Mon, 4 Oct 2010 10:13:01 +0000 (12:13 +0200)]
support a separate push URL

10 years agotemporarily slow down file conversion a bit (sleep 0.25) to keep server load down
Rudolf Polzer [Sun, 3 Oct 2010 17:14:21 +0000 (19:14 +0200)]
temporarily slow down file conversion a bit (sleep 0.25) to keep server load down

10 years agoreally enable v6
Rudolf Polzer [Sun, 3 Oct 2010 13:00:38 +0000 (15:00 +0200)]
really enable v6

10 years agoMerge branch 'master' into divVerent/crypto2
Rudolf Polzer [Sun, 3 Oct 2010 12:57:04 +0000 (14:57 +0200)]
Merge branch 'master' into divVerent/crypto2

10 years agoenable v6 in all compile
Rudolf Polzer [Sun, 3 Oct 2010 12:56:22 +0000 (14:56 +0200)]
enable v6 in all compile

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