From: Rudolf Polzer Date: Fri, 2 Apr 2010 12:23:15 +0000 (+0200) Subject: Merge commit 'origin/mand1nga/rebrand' X-Git-Tag: xonotic-v0.1.0preview~520 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=1bc0cc65a12e4acdc5e104d0a3e6094848fb233d;hp=37578b037035324f40447e45eb8ae2dc7585c837 Merge commit 'origin/mand1nga/rebrand' --- diff --git a/.gitignore b/.gitignore index 6ecb0074..042cc4d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ darkplaces +fteqcc +div0-gittools diff --git a/all b/all index 91a38e60..2b1cd557 100755 --- a/all +++ b/all @@ -2,13 +2,48 @@ set -e -repos=" +msg() +{ + echo "$*" +} + +self=`cksum "$0"` +checkself() +{ + self_new=`cksum "$0"` + if [ x"$self" != x"$self_new" ]; then + msg "./all has changed." + if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then + msg "Rerunning the requested operation to make sure." + export XONOTIC_FORBID_RERUN_ALL=1 + exec "$0" "$@" + else + msg "Please try $0 update, and then retry your requested operation." + exit 1 + fi + fi + return 0 +} + +verbose() +{ + msg "+ $*" + "$@" +} + +repos_urls=" + . data/xonotic-data.pk3dir data/xonotic-maps.pk3dir data/xonotic-music.pk3dir + data/xonotic-nexcompat.pk3dir darkplaces + fteqcc@git://github.com/Blub/qclib.git + div0-gittools@git://git.icculus.org/divverent/div0-gittools.git " +repos=`for X in $repos_urls; do echo "${X%%@*}"; done` + if [ "$#" = 0 ]; then set -- help fi @@ -17,21 +52,45 @@ shift d0=`pwd` case "$cmd" in - update) + update|pull) base=`git config remote.origin.url` - base=${base%/xonotic.git} - for d in $repos; do + base=${base%xonotic.git} + for dcomplete in $repos_urls; do + case "$dcomplete" in + *@*) + d=${dcomplete%%@*} + url=${dcomplete#*@} + switch=false + ;; + *) + d=${dcomplete%%@*} + url=$base${d##*/}.git + switch=true + ;; + esac if [ -d "$d0/$d" ]; then + verbose cd "$d0/$d" + case "$d" in + .) + ;; + *) + if $switch; then + verbose git config remote.origin.url "$url" + fi + ;; + esac + verbose git pull + cd "$d0" + checkself "$0" "$@" cd "$d0/$d" - git config remote.origin.url "$base/${d##*/}.git" - git pull + verbose git remote prune origin cd "$d0" else - git clone "$base/${d##*/}.git" "$d0/$d" + verbose git clone "$url" "$d0/$d" fi done ;; - checkout) + checkout|switch) remote=$1 branch=$2 if [ -z "$branch" ]; then @@ -40,42 +99,139 @@ case "$cmd" in fi exists=false for d in $repos; do - cd "$d0/$d" + verbose cd "$d0/$d" if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then exists=true - git checkout "$branch" + verbose git checkout "$branch" elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then exists=true - git checkout --track -b "$branch" "$remote/$branch" + verbose git checkout --track -b "$branch" "$remote/$branch" else - git checkout master + verbose git checkout master fi cd "$d0" + checkself "$0" "$@" done + if ! $exists; then + echo "The requested branch was not found in any repository." + fi "$0" branch ;; branch) + remote=$1 + branch=$2 + if [ -z "$branch" ]; then + branch=$remote + remote=origin + fi + if [ -z "$branch" ]; then + for d in $repos; do + cd "$d0/$d" + r=`git symbolic-ref HEAD` + r=${r#refs/heads/} + echo "$d is at $r" + cd "$d0" + done + else + for d in $repos; do + cd "$d0/$d" + a= + while [ x"$a" != x"y" -a x"$a" != x"n" ]; do + echo "Branch in $d?" + read -r a + done + if [ x"$a" = x"y" ]; then + verbose git push "$remote" HEAD:"$branch" + verbose git checkout --track -b "$branch" "$remote/$branch" + fi + cd "$d0" + done + "$0" branch + fi + ;; + branches) + for d in $repos; do + cd "$d0/$d" + echo "In $d:" + git branch -a | sed 's/^/ /; /->/d' + cd "$d0" + done + ;; + push) for d in $repos; do cd "$d0/$d" r=`git symbolic-ref HEAD` r=${r#refs/heads/} - echo "$d is at $r" + a= + if git log "origin/$r".."$r" | grep .; then + while [ x"$a" != x"y" -a x"$a" != x"n" ]; do + echo "Push $r in $d?" + read -r a + done + if [ x"$a" = x"y" ]; then + verbose git push `git config "branch.$r.remote" || echo origin` HEAD + fi + fi cd "$d0" done ;; - branches) + compile) + if [ -z "$MAKEFLAGS" ]; then + if [ -f /proc/cpuinfo ]; then + ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0)) + if [ $ncpus -gt 1 ]; then + MAKEFLAGS=-j$ncpus + fi + fi + fi + verbose cd "$d0/fteqcc" + verbose make $MAKEFLAGS + verbose cd "$d0/data/xonotic-data.pk3dir" + verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS + verbose cd "$d0/darkplaces" + verbose make $MAKEFLAGS sv-debug + verbose make $MAKEFLAGS cl-debug + verbose make $MAKEFLAGS sdl-debug + ;; + run) + client=-sdl + case "$1" in + sdl|glx|agl|dedicated) + client=-$1 + shift + ;; + wgl) + client= + shift + ;; + esac + if ! [ -x "darkplaces/darkplaces$client" ]; then + if [ -x "darkplaces/darkplaces$client.exe" ]; then + client=$client.exe + else + echo "Client darkplaces/darkplaces$client not found, aborting" + exit 1 + fi + fi + #verbose "darkplaces/darkplaces$client" -xonotic "$@" + verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@" + ;; + each|foreach) for d in $repos; do - cd "$d0/$d" - echo "In $d:" - git branch -a | sed 's/^/ /' + verbose cd "$d0/$d" + verbose "$@" cd "$d0" done ;; *) echo "Usage:" - echo " $0 update" - echo " $0 branch" + echo " $0 pull" + echo " $0 push" echo " $0 branches" + echo " $0 branch " echo " $0 checkout" + echo " $0 compile" + echo " $0 run " + echo " $0 each " ;; esac diff --git a/changes-since-last-release b/changes-since-last-release deleted file mode 100644 index 696da478..00000000 --- a/changes-since-last-release +++ /dev/null @@ -1,217 +0,0 @@ -CHANGES since 2.4.2 to r6387: -compat-q3a: switch crylink/hagar, as crylink is closer to BFG and hagar is closer to Plasmagun -engine: add a half-baked "commandmode" (currently it has, like messagemode, no history, no line editing) -engine: added blend and orientation commands for effectinfo.txt (overrides the defaults chosen by the particle type) -engine: added cvar sv_gameplayfix_gravityunaffectedbyticrate - off by default -engine: added shader keywords dpshadow and dpnoshadow (no parameters), these modify the shadowing properties of a mesh, regardless of its other properties -engine: allow cl_maxfps and cl_maxidlefps to be 0, meaning unlimited (like in many QW clients) -engine: Blub's "deflate" extension to the download system. Currently only provides csprogs.dat in deflated form. Compatible in both directions, compression is only done if both client and server use this new code. -engine: capturing to ogg/theora video (cl_capturevideo_ogg; requires theora and vorbisenc dlls), ogg and avi capturing are now modules in the engine -engine: cl_demo_mousegrab -engine: csqc can get bone infos -engine: cvarlist now accepts wildcards -engine: demo recording: stuff csprogs.dat files into .dem files so demos can always be played back -engine: disable DGA mouse by default -engine: effectinfo: add "stretchfactor" -engine: fix a possible bug with zym model animation (this looks like a typo, and fixing it makes the shotgun anim in nexuiz appear more consistent) -engine: fix bugs with q1bsp/hlbsp rotating submodels -engine: fixed crash with ATI drivers on shutdown or vid_restart -engine: fixed pointsound in csqc -engine: fixed several collision bug regarding non solid players -engine: fix memory corruption when using trailparticles with an effect that has a dlight -engine: get rid of skinframe loading spam on dedicated servers -engine: if in menu, make con_closeontoggleconsole.integer also enable the toggleconsole key -engine: implemented occlusion query support on corona rendering, this enables coronas to fade according to the percentage of occluded pixels around the light origin, giving a more realistic corona behavior -engine: implemented zpass shadowing, not used yet -engine: model_brush: use the same tesselation number for patches in the same LOD group (q3map2 writes the same mins/maxs for any patch inside a LOD group, and this fact is used for identifying LOD groups) -engine: mod_q3bsp_nolightmaps: do not load lightmaps, use the bad q3map2-written vertex lighting instead (you have been warned). Mostly useful for maps with HUUUUGE lightmaps on low-end systems. -engine: new command by terrencehill: "status 1" and "status 2" as alternate, more readable status displays. "status" unchanged. -engine: new tcmod: "tcmod page