]> git.xonotic.org Git - xonotic/xonotic.git/log
xonotic/xonotic.git
12 years agoadd license files... forgot to do that all the time, apparently
Rudolf Polzer [Mon, 13 Jun 2011 18:55:52 +0000 (20:55 +0200)]
add license files... forgot to do that all the time, apparently

12 years agofix lack of error when switching to an unknown branch
Rudolf Polzer [Sun, 5 Jun 2011 18:24:28 +0000 (20:24 +0200)]
fix lack of error when switching to an unknown branch

12 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic
Rudolf Polzer [Sat, 4 Jun 2011 20:31:16 +0000 (22:31 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

12 years agospecial case pre-1.0 versions to be compatible with any gameversion below 1.0
Rudolf Polzer [Sat, 4 Jun 2011 20:30:57 +0000 (22:30 +0200)]
special case pre-1.0 versions to be compatible with any gameversion below 1.0

12 years agoMerge remote-tracking branch 'origin/TickleMeElmo/fix_naming_in_server_script'
merlijn [Sat, 4 Jun 2011 17:37:40 +0000 (19:37 +0200)]
Merge remote-tracking branch 'origin/TickleMeElmo/fix_naming_in_server_script'

12 years agoChanged lines 4 and 5 of server_linux.sh to the correct file names.
root [Fri, 3 Jun 2011 21:04:40 +0000 (16:04 -0500)]
Changed lines 4 and 5 of server_linux.sh to the correct file names.
executable="xonotic-linux64-dedicated" ;;
executable="xonotic-linux32-dedicated" ;;
This resolves ticket #478

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
Rudolf Polzer [Wed, 1 Jun 2011 04:48:03 +0000 (06:48 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

12 years agowe need SDL.dll in the main dir, still
Rudolf Polzer [Wed, 1 Jun 2011 04:47:39 +0000 (06:47 +0200)]
we need SDL.dll in the main dir, still

12 years agoget rid of some subshells when finding checksums of a file
Rudolf Polzer [Sat, 28 May 2011 06:35:23 +0000 (08:35 +0200)]
get rid of some subshells when finding checksums of a file

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
Rudolf Polzer [Fri, 27 May 2011 17:39:03 +0000 (19:39 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

12 years agofix DLL path when building zip. DLLroll'd.
Rudolf Polzer [Fri, 27 May 2011 17:38:45 +0000 (19:38 +0200)]
fix DLL path when building zip. DLLroll'd.

12 years agoput the windows DLLs in a bin32/ subdir
Rudolf Polzer [Fri, 27 May 2011 16:37:17 +0000 (18:37 +0200)]
put the windows DLLs in a bin32/ subdir

12 years agocached converter: better self profiling
Rudolf Polzer [Fri, 27 May 2011 11:18:33 +0000 (13:18 +0200)]
cached converter: better self profiling

12 years agouse ls-files instead of rev-parse
Rudolf Polzer [Fri, 27 May 2011 10:31:11 +0000 (12:31 +0200)]
use ls-files instead of rev-parse

12 years agosome fixes for cached converter
Rudolf Polzer [Fri, 27 May 2011 09:35:51 +0000 (11:35 +0200)]
some fixes for cached converter

12 years agowe need an arg to say what files to extract
Rudolf Polzer [Fri, 27 May 2011 08:34:55 +0000 (10:34 +0200)]
we need an arg to say what files to extract

12 years agofix a typo
Rudolf Polzer [Fri, 27 May 2011 08:27:24 +0000 (10:27 +0200)]
fix a typo

12 years agoactually use hardlinks if possible
Rudolf Polzer [Fri, 27 May 2011 07:51:52 +0000 (09:51 +0200)]
actually use hardlinks if possible

12 years agoallow the tempdir to be a hardlink structure (i.e. don't change files in there, alway...
Rudolf Polzer [Fri, 27 May 2011 07:45:43 +0000 (09:45 +0200)]
allow the tempdir to be a hardlink structure (i.e. don't change files in there, always delete and rewrite files)

12 years agorefactor ./all a bit
Rudolf Polzer [Fri, 27 May 2011 07:39:09 +0000 (09:39 +0200)]
refactor ./all a bit

12 years agofix negative numbers :P
Rudolf Polzer [Wed, 25 May 2011 14:26:58 +0000 (16:26 +0200)]
fix negative numbers :P

12 years agofix the time reports
Rudolf Polzer [Wed, 25 May 2011 14:21:01 +0000 (16:21 +0200)]
fix the time reports

12 years agoadd extra time reports for the release-buildpk3 target, as that seems to take longest
Rudolf Polzer [Wed, 25 May 2011 14:15:14 +0000 (16:15 +0200)]
add extra time reports for the release-buildpk3 target, as that seems to take longest

12 years agofix the release args messages for profiling
Rudolf Polzer [Tue, 24 May 2011 14:29:06 +0000 (16:29 +0200)]
fix the release args messages for profiling

12 years agouse "msg" for these messages too
Rudolf Polzer [Tue, 24 May 2011 11:34:58 +0000 (13:34 +0200)]
use "msg" for these messages too

12 years agoprint some timing info when release building
Rudolf Polzer [Tue, 24 May 2011 11:31:52 +0000 (13:31 +0200)]
print some timing info when release building

12 years agospeed up zip compression when not making a finished release
Rudolf Polzer [Tue, 24 May 2011 08:50:37 +0000 (10:50 +0200)]
speed up zip compression when not making a finished release

12 years agomake sure we actually read the user profile when compiling remotely (needed for ccache)
Rudolf Polzer [Fri, 20 May 2011 12:44:25 +0000 (14:44 +0200)]
make sure we actually read the user profile when compiling remotely (needed for ccache)

12 years agoremove the -agl build
Rudolf Polzer [Mon, 9 May 2011 19:42:39 +0000 (21:42 +0200)]
remove the -agl build

12 years agoreduce debug level in release binaries from -g2 to -g1
Rudolf Polzer [Mon, 9 May 2011 18:01:00 +0000 (20:01 +0200)]
reduce debug level in release binaries from -g2 to -g1

12 years agodon't use a bogus date in 1970 for the pk3 file contents, this does help rsync, but...
Rudolf Polzer [Mon, 9 May 2011 12:45:14 +0000 (14:45 +0200)]
don't use a bogus date in 1970 for the pk3 file contents, this does help rsync, but causes a bug in 7zip

12 years agowe no longer need the -mygames option
Rudolf Polzer [Sun, 8 May 2011 20:48:54 +0000 (22:48 +0200)]
we no longer need the -mygames option

12 years agomore work to make the pk3 files rsync-friendly
Rudolf Polzer [Fri, 6 May 2011 19:59:40 +0000 (21:59 +0200)]
more work to make the pk3 files rsync-friendly

we try to not store modification times in them (by making the mtime bogus
before zipping)

12 years agowhen calling 7za, turn off solid archiving to help rsync update the pk3 files
Rudolf Polzer [Fri, 6 May 2011 06:25:10 +0000 (08:25 +0200)]
when calling 7za, turn off solid archiving to help rsync update the pk3 files

12 years agoreplace libfreetype by a 3-way universal one that works on 10.4 upwards. Should fix...
Rudolf Polzer [Tue, 3 May 2011 13:46:21 +0000 (15:46 +0200)]
replace libfreetype by a 3-way universal one that works on 10.4 upwards. Should fix font display on OS X 10.5.

13 years agoguard release building against bad locales
Rudolf Polzer [Mon, 18 Apr 2011 16:39:48 +0000 (18:39 +0200)]
guard release building against bad locales

13 years agosimplify normalization
Rudolf Polzer [Sat, 16 Apr 2011 18:12:47 +0000 (20:12 +0200)]
simplify normalization

13 years agoadd a highpass feature too
Rudolf Polzer [Sat, 16 Apr 2011 18:04:05 +0000 (20:04 +0200)]
add a highpass feature too

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic
Rudolf Polzer [Sat, 16 Apr 2011 17:05:45 +0000 (19:05 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

13 years agoadd a feature to renormalize normalmaps too
Rudolf Polzer [Sat, 16 Apr 2011 17:05:32 +0000 (19:05 +0200)]
add a feature to renormalize normalmaps too

13 years agomake this script work with all "echo"s :P
Rudolf Polzer [Tue, 12 Apr 2011 09:33:28 +0000 (11:33 +0200)]
make this script work with all "echo"s :P

13 years agohide error of "cd"
Rudolf Polzer [Sat, 9 Apr 2011 17:00:58 +0000 (19:00 +0200)]
hide error of "cd"

13 years agoxonotic-map-compiler-autobuild: don't abort the "download" action if xonotic-maps...
Rudolf Polzer [Fri, 8 Apr 2011 04:38:25 +0000 (06:38 +0200)]
xonotic-map-compiler-autobuild: don't abort the "download" action if xonotic-maps.pk3dir does not exist

13 years agoAdded small script for submitting issues
mand1nga [Sat, 2 Apr 2011 20:41:15 +0000 (17:41 -0300)]
Added small script for submitting issues

13 years agomirrorselection: handle errors better
Rudolf Polzer [Sat, 2 Apr 2011 11:02:16 +0000 (13:02 +0200)]
mirrorselection: handle errors better

13 years agobump -bsp_timeout to 1800 (30 minutes), let's see if this fixes theShadow's map
Rudolf Polzer [Wed, 30 Mar 2011 20:52:50 +0000 (22:52 +0200)]
bump -bsp_timeout to 1800 (30 minutes), let's see if this fixes theShadow's map

13 years agosorry, I had accidentally switched profile and release configuration
Rudolf Polzer [Mon, 28 Mar 2011 09:16:55 +0000 (11:16 +0200)]
sorry, I had accidentally switched profile and release configuration

13 years agonew: ./all compile -p for profile
Rudolf Polzer [Fri, 25 Mar 2011 20:04:33 +0000 (21:04 +0100)]
new: ./all compile -p for profile

13 years agoremove workaround options for broken stuff in dpsoftrast
Rudolf Polzer [Sun, 20 Mar 2011 17:33:54 +0000 (18:33 +0100)]
remove workaround options for broken stuff in dpsoftrast

13 years agoturn off effects currently broken in vid_soft
Rudolf Polzer [Sun, 20 Mar 2011 13:56:19 +0000 (14:56 +0100)]
turn off effects currently broken in vid_soft

13 years agouse vid_soft properly
Rudolf Polzer [Tue, 15 Mar 2011 16:19:41 +0000 (17:19 +0100)]
use vid_soft properly

13 years agollvmpipe makes trouble? use vid_soft 1! PROBLEM?
Rudolf Polzer [Tue, 15 Mar 2011 15:56:29 +0000 (16:56 +0100)]
llvmpipe makes trouble? use vid_soft 1! PROBLEM?

13 years agoyesno: break endless loops on IO error
Rudolf Polzer [Wed, 9 Mar 2011 17:47:38 +0000 (18:47 +0100)]
yesno: break endless loops on IO error

13 years ago./all compile: ignore merge conflicts. The compiler will tell anyway...
Rudolf Polzer [Wed, 9 Mar 2011 17:25:37 +0000 (18:25 +0100)]
./all compile: ignore merge conflicts. The compiler will tell anyway...

13 years ago./all update: make a .no file skip updating. Other operations (including ./all clean...
Rudolf Polzer [Wed, 9 Mar 2011 17:06:08 +0000 (18:06 +0100)]
./all update: make a .no file skip updating. Other operations (including ./all clean --reclone) still consider these repos!

13 years agomove -gl_driver option
Rudolf Polzer [Tue, 8 Mar 2011 21:59:21 +0000 (22:59 +0100)]
move -gl_driver option

13 years agousing LD_PRELOAD fails because ./all changes it - use -gl_driver instead to select...
Rudolf Polzer [Tue, 8 Mar 2011 21:45:53 +0000 (22:45 +0100)]
using LD_PRELOAD fails because ./all changes it - use -gl_driver instead to select llvmpipe

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic
Rudolf Polzer [Tue, 8 Mar 2011 20:56:52 +0000 (21:56 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

13 years agouse llvmpipe for autoscreenshots, no longer rely on nvidia
Rudolf Polzer [Tue, 8 Mar 2011 20:56:40 +0000 (21:56 +0100)]
use llvmpipe for autoscreenshots, no longer rely on nvidia

13 years agofix build of mappingsupport pack
Rudolf Polzer [Mon, 7 Mar 2011 13:53:58 +0000 (14:53 +0100)]
fix build of mappingsupport pack

13 years agofix typo in mappingsupport zip file name
Rudolf Polzer [Mon, 7 Mar 2011 13:42:30 +0000 (14:42 +0100)]
fix typo in mappingsupport zip file name

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic
Rudolf Polzer [Sat, 5 Mar 2011 21:32:55 +0000 (22:32 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

13 years agofix typo in import of NetRadiant
Rudolf Polzer [Sat, 5 Mar 2011 21:32:43 +0000 (22:32 +0100)]
fix typo in import of NetRadiant

13 years agomake checkself also work from checkout -f
Rudolf Polzer [Wed, 2 Mar 2011 09:37:22 +0000 (10:37 +0100)]
make checkself also work from checkout -f

13 years agofix self-reexec on ./all clean --reclone
Rudolf Polzer [Wed, 2 Mar 2011 09:33:24 +0000 (10:33 +0100)]
fix self-reexec on ./all clean --reclone

13 years agoactually, be a bit more friendly: extract the NetRadiant download. We'll 7za it anyway.
Rudolf Polzer [Wed, 23 Feb 2011 13:17:51 +0000 (14:17 +0100)]
actually, be a bit more friendly: extract the NetRadiant download. We'll 7za it anyway.

13 years agoadd a Xonotic-...-mappingsupport.zip download which contains a JPEG-only texture...
Rudolf Polzer [Wed, 23 Feb 2011 13:16:13 +0000 (14:16 +0100)]
add a Xonotic-...-mappingsupport.zip download which contains a JPEG-only texture pack, and NetRadiant

13 years agoSquashed commit of the following:
Rudolf Polzer [Sun, 13 Feb 2011 13:14:24 +0000 (14:14 +0100)]
Squashed commit of the following:

commit 9b5b44aae43b7da22de91ab7fb43c8dfb7745e76
Author: sev <sev.ch@web.de>
Date:   Sun Feb 13 00:40:19 2011 +0100

    Updated Xolonium font to version 1.2. Added Greek and a few more special characters

commit 8151eaeca4ebe86a0d8d2f8aa0e62cf2df00c59e
Merge: b4b3dc8 7e05a76
Author: sev <sev.ch@web.de>
Date:   Sun Feb 13 00:34:55 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

commit b4b3dc83b8ba3588cc5c22b32c4099614757f9de
Merge: 51c2d90 2eb206c
Author: sev <sev.ch@web.de>
Date:   Thu Feb 10 12:16:40 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

commit 51c2d9013d00f6badf279228a72a5fb47e343ddf
Merge: 664c428 465dee0
Author: sev <sev.ch@web.de>
Date:   Mon Jan 24 20:15:28 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

commit 664c4281c5e6483b3107b64c4b12ef57daac8cda
Merge: cce7897 2d51977
Author: sev <sev.ch@web.de>
Date:   Thu Jan 20 11:06:27 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

commit cce789708f515c84a0067de281f53e773b80e17a
Merge: 4642ac9 9e4a6e1
Author: sev <sev.ch@web.de>
Date:   Wed Jan 19 10:57:44 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

13 years agofix typo in HEAD^
Rudolf Polzer [Sat, 12 Feb 2011 19:16:49 +0000 (20:16 +0100)]
fix typo in HEAD^

13 years agoalso include the built xolonium pk3 with the releases
Rudolf Polzer [Sat, 12 Feb 2011 19:16:28 +0000 (20:16 +0100)]
also include the built xolonium pk3 with the releases

13 years agoput g_maxplayers in server.cfg
Rudolf Polzer [Fri, 28 Jan 2011 21:18:00 +0000 (22:18 +0100)]
put g_maxplayers in server.cfg

13 years agofix some weapon names
Rudolf Polzer [Sun, 23 Jan 2011 18:49:39 +0000 (19:49 +0100)]
fix some weapon names

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic
Rudolf Polzer [Sun, 23 Jan 2011 18:33:52 +0000 (19:33 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

13 years agoweapon profiler: support a new file format that includes all data (for bots too,...
Rudolf Polzer [Sun, 23 Jan 2011 18:33:15 +0000 (19:33 +0100)]
weapon profiler: support a new file format that includes all data (for bots too, and damage, hits, kills in one file)

13 years agoMerge remote branch 'origin/sev/fontupdate'
Rudolf Polzer [Thu, 20 Jan 2011 09:54:11 +0000 (10:54 +0100)]
Merge remote branch 'origin/sev/fontupdate'

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic
Rudolf Polzer [Thu, 20 Jan 2011 09:53:21 +0000 (10:53 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

13 years agoadd Xolonium font to releases; DDS compress nexcompat too now
Rudolf Polzer [Thu, 20 Jan 2011 09:49:11 +0000 (10:49 +0100)]
add Xolonium font to releases; DDS compress nexcompat too now

13 years agofont update by sev, now with cyrillic
Rudolf Polzer [Tue, 18 Jan 2011 20:39:12 +0000 (21:39 +0100)]
font update by sev, now with cyrillic

13 years agoCorrected the readme.txt file
sev [Tue, 18 Jan 2011 17:55:37 +0000 (18:55 +0100)]
Corrected the readme.txt file

13 years agoUpdated Xolonium font to version 1.1. Many new characters, including Cyrillic.
sev [Tue, 18 Jan 2011 17:31:58 +0000 (18:31 +0100)]
Updated Xolonium font to version 1.1. Many new characters, including Cyrillic.

13 years agofix the pushbase
Rudolf Polzer [Fri, 14 Jan 2011 20:07:49 +0000 (21:07 +0100)]
fix the pushbase

13 years ago./all update -ph sets up pushing via http (experimental; ask me to generate a passwor...
Rudolf Polzer [Fri, 14 Jan 2011 20:04:38 +0000 (21:04 +0100)]
./all update -ph sets up pushing via http (experimental; ask me to generate a password for you if you want that)

13 years agoalso support scr_infobar_height
Rudolf Polzer [Wed, 12 Jan 2011 19:44:22 +0000 (20:44 +0100)]
also support scr_infobar_height

13 years agoadd a pk3dir with the current version of the Xolonium font by sev (not default yet)
Rudolf Polzer [Tue, 11 Jan 2011 14:26:59 +0000 (15:26 +0100)]
add a pk3dir with the current version of the Xolonium font by sev (not default yet)

13 years agoforce the linking
Rudolf Polzer [Fri, 7 Jan 2011 22:56:38 +0000 (23:56 +0100)]
force the linking

13 years agodelete the fteqcc.log correctly
Rudolf Polzer [Fri, 7 Jan 2011 19:54:42 +0000 (20:54 +0100)]
delete the fteqcc.log correctly

13 years agoadmin-merge -d
Rudolf Polzer [Tue, 28 Dec 2010 14:58:21 +0000 (15:58 +0100)]
admin-merge -d

13 years agofix a bug in release building; no longer build "lowdds" as it is not much smaller...
Rudolf Polzer [Sat, 25 Dec 2010 18:00:06 +0000 (19:00 +0100)]
fix a bug in release building; no longer build "lowdds" as it is not much smaller and anyone who wants even smaller is better off with "low"

13 years agorename the current .zip build to -high, and the normaldds one to ''
Rudolf Polzer [Sat, 25 Dec 2010 16:27:40 +0000 (17:27 +0100)]
rename the current .zip build to -high, and the normaldds one to ''

13 years agorelease build: also make a "normaldds" variant
Rudolf Polzer [Sat, 25 Dec 2010 11:42:18 +0000 (12:42 +0100)]
release build: also make a "normaldds" variant

13 years agosync the font configs
Rudolf Polzer [Fri, 24 Dec 2010 11:57:14 +0000 (12:57 +0100)]
sync the font configs

13 years agoload more font sizes into FONT_USER1 to make CSQC able to use FONT_USER1 for everythi...
Rudolf Polzer [Fri, 24 Dec 2010 11:48:12 +0000 (12:48 +0100)]
load more font sizes into FONT_USER1 to make CSQC able to use FONT_USER1 for everything (for this, I recently increased the #font sizes limit in DP)

13 years agofix icon changing
Rudolf Polzer [Thu, 23 Dec 2010 22:09:37 +0000 (23:09 +0100)]
fix icon changing

13 years agoput back the "v" in the tag names, as the current tags are borked and we can't reuse...
Rudolf Polzer [Thu, 23 Dec 2010 18:29:24 +0000 (19:29 +0100)]
put back the "v" in the tag names, as the current tags are borked and we can't reuse the name

13 years agodo not use that extra "v", not needed
Rudolf Polzer [Thu, 23 Dec 2010 13:04:28 +0000 (14:04 +0100)]
do not use that extra "v", not needed

13 years agoadd a script to tag releases
Rudolf Polzer [Thu, 23 Dec 2010 12:57:18 +0000 (13:57 +0100)]
add a script to tag releases

13 years agoinstead, exclude background_l2 from that hashing stuff xonotic-v0.1.0preview
Rudolf Polzer [Wed, 22 Dec 2010 22:34:08 +0000 (23:34 +0100)]
instead, exclude background_l2 from that hashing stuff

13 years agoRevert "fix hashing of modified files"
Rudolf Polzer [Wed, 22 Dec 2010 22:31:29 +0000 (23:31 +0100)]
Revert "fix hashing of modified files"

This reverts commit 30c801667460d62b21ffbb2aa1f98cf6640d8dfb.

13 years agofix hashing of modified files
Rudolf Polzer [Wed, 22 Dec 2010 21:52:16 +0000 (22:52 +0100)]
fix hashing of modified files

13 years agoworkaround for broken /bin/sh on failbuntu
Rudolf Polzer [Wed, 22 Dec 2010 20:44:10 +0000 (21:44 +0100)]
workaround for broken /bin/sh on failbuntu