Merge remote-tracking branch 'origin/savagex/courfun-nexball'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:29:46 +0000 (10:29 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:29:46 +0000 (10:29 +0100)
maps/leave_em_behind.map
scripts/entities.def
scripts/entities.ent
scripts/shader-audit.sh
sound/machines/lighthum_looped.ogg [new file with mode: 0644]
sound/machines/pumps_looped.ogg [new file with mode: 0644]
sound/map_leave_em_behind/lighthum.ogg [deleted file]
sound/map_leave_em_behind/pumps.ogg [deleted file]

index c36ebb5..1fa55a0 100644 (file)
@@ -16177,7 +16177,7 @@ exx/panel-q201
 {
 "classname" "target_speaker"
 "origin" "0.000000 -288.000000 184.000000"
-"noise" "sound/map_leave_em_behind/pumps.ogg"
+"noise" "sound/machines/pumps_looped.ogg"
 }
 {
 "classname" "target_speaker"
@@ -16667,7 +16667,7 @@ exx/panel-q201
 {
 "classname" "target_speaker"
 "origin" "0.000000 288.000000 184.000000"
-"noise" "sound/map_leave_em_behind/pumps.ogg"
+"noise" "sound/machines/pumps_looped.ogg"
 }
 {
 "classname" "target_speaker"
index be1dc9f..444a13d 100644 (file)
@@ -279,7 +279,7 @@ count: adjusts density, this many particles fall every second for a 1024x1024 ar
 Brush entity that spins in place on one axis (default Z). Use an origin brush to specify the rotation axis.
 To rotate around another axis, make a func_wall with an explicit avelocity given.
 -------- KEYS --------
-speed: speed to rotate (in degrees per second)
+speed: speed to rotate (in degrees per second, default: 100)
 noise: path/name of looping .wav file to play.
 dmg: Do this much dmg every .dmgtime interval when blocked
 dmgtime: See above. (0.25s default)
index 45f87cb..e780272 100644 (file)
@@ -281,7 +281,7 @@ This is an invisible area like a trigger, which rain falls inside of.
 Brush entity that spins in place on one axis (default Z). Use an origin brush to specify the rotation axis.
 To rotate around another axis, make a func_wall with an explicit avelocity given.
 -------- KEYS --------
-<real key="speed" name="speed">speed to rotate (in degrees per second)</real>
+<real key="speed" name="speed">speed to rotate (in degrees per second, default: 100)</real>
 <sound key="noise" name="noise">path/name of looping .wav file to play.</sound>
 <real key="dmg" name="dmg">Do this much dmg every .dmgtime interval when blocked</real>
 <real key="dmgtime" name="dmgtime">See above. (0.25s default)</real>
index 6d74b35..80dd7d2 100755 (executable)
@@ -206,14 +206,14 @@ use_texture()
                        esac
                        ;;
                ## RULE: textures/map_FOO[_/]* must use textures/map_FOO[_/]*
-               textures/map_*/*)
+               textures/map_*/*|models/map_*/*)
                        pre=${1%%/map_*}
                        suf=${1#*/map_}
                        map=${suf%%[_/]*}
                        case "$2" in
                                "$pre"/map_$map[/_]*)
                                        ;;
-                               textures/map_*)
+                               textures/map_*|models/map_*)
                                        # protect one map's textures from the evil of other maps :P
                                        err "texture $2 of shader $1 is out of place, recommended file name is $pre/map_$map/*"
                                        ;;
@@ -451,7 +451,7 @@ parse_shaderfile()
        case "$1" in
                ## RULE: map_FOO.shader may define tetxures/map_FOO_* and textures/map_FOO/*
                map_*)
-                       allowed_prefixes="textures/map_`echo "$1" | cut -d _ -f 2`_ textures/map_`echo "$1" | cut -d _ -f 2`/"
+                       allowed_prefixes="textures/map_`echo "$1" | cut -d _ -f 2`_ textures/map_`echo "$1" | cut -d _ -f 2`/ models/map_`echo "$1" | cut -d _ -f 2`_ models/map_`echo "$1" | cut -d _ -f 2`/"
                        forbidden_prefixes=
                        ;;
                ## RULE: skies_FOO.shader may define tetxures/skies/FOO and textures/skies/FOO_*
@@ -462,7 +462,7 @@ parse_shaderfile()
                ## RULE: model_*.shader may define models/*
                model_*)
                        allowed_prefixes="models/"
-                       forbidden_prefixes=
+                       forbidden_prefixes="models/map_"
                        ;;
                ## RULE: any other FOO.shader may define textures/FOO/*
                *)
@@ -499,13 +499,15 @@ for X in *.shader; do
 done
 rm -f "$t"
 
-textures_avail=`( cd ..; find textures/ -type f -not -name '*.sh' -not -name '*_norm.*' -not -name '*_glow.*' -not -name '*_gloss.*' -not -name '*_reflect.*' -not -name '*.xcf' ) | while IFS= read -r T; do normalize "$T"; done | sort -u`
+textures_avail=`( cd ..; find textures/ -type f -not -name '*.sh' -not -name '*_norm.*' -not -name '*_glow.*' -not -name '*_gloss.*' -not -name '*_reflect.*' -not -name '*.xcf' -not -name '*.txt' ) | while IFS= read -r T; do normalize "$T"; done | sort -u`
 textures_used=`echo "${textures_used#$LF}" | sort -u`
 
 echo "$textures_used$LF$textures_used$LF$textures_avail" | sort | uniq -u | while IFS= read -r L; do
        case "$L" in
                textures/radiant/*)
                        ;;
+               models/map_*/*)
+                       ;;
                textures/map_*/*)
                        ;;
                *)
diff --git a/sound/machines/lighthum_looped.ogg b/sound/machines/lighthum_looped.ogg
new file mode 100644 (file)
index 0000000..89eaa21
Binary files /dev/null and b/sound/machines/lighthum_looped.ogg differ
diff --git a/sound/machines/pumps_looped.ogg b/sound/machines/pumps_looped.ogg
new file mode 100644 (file)
index 0000000..b7f7b3e
Binary files /dev/null and b/sound/machines/pumps_looped.ogg differ
diff --git a/sound/map_leave_em_behind/lighthum.ogg b/sound/map_leave_em_behind/lighthum.ogg
deleted file mode 100644 (file)
index f7456d5..0000000
Binary files a/sound/map_leave_em_behind/lighthum.ogg and /dev/null differ
diff --git a/sound/map_leave_em_behind/pumps.ogg b/sound/map_leave_em_behind/pumps.ogg
deleted file mode 100644 (file)
index 85a76a5..0000000
Binary files a/sound/map_leave_em_behind/pumps.ogg and /dev/null differ