Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 3 Sep 2011 08:44:12 +0000 (10:44 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 3 Sep 2011 08:44:12 +0000 (10:44 +0200)
maps/campaignxonoticbeta.txt
scripts/decals.shader
scripts/effects_warpzone.shader
scripts/shader-audit.sh
scripts/trak7x.shader
textures/trak7x/floor/floor_tile1a_gloss.tga [new file with mode: 0644]
textures/trak7x/floor/floor_tile1a_norm.tga [new file with mode: 0644]
textures/trak7x/wall/wall_wall1b_gloss.tga [new file with mode: 0644]
textures/trak7x/wall/wall_wall1b_norm.tga [new file with mode: 0644]

index 5127722..b0e5f36 100644 (file)
@@ -13,7 +13,7 @@
 "tdm","stormkeep","5","6","20",,,"Team Deathmatch: Stormkeep","Another 3v3 TDM match.\nTip: You can shoot through warpzones!"
 //"nexball","nexballarena","5","7","5",,,"Nexball: Nexball Arena","This is similar to football now. You move the ball if you hit it, so try to push it into the ememies goal. First team who can score 5 goals wins!"
 "dom","glowplant","5","7","50",,,"Domination: Glowplant","If you control the control points and frag enemies in meanwhile you won't have any problems to win."
-"as","techassault","7","7","30",,"g_campaign_forceteam 2","Assault: Techassault","You are in the attacking team and you have to destroy all objects. There will be new rooms/ways if you destroy an object."
+"as","techassault","7","7","30",,"g_campaign_forceteam 1","Assault: Techassault","You are in the attacking team and you have to destroy all objects. There will be new rooms/ways if you destroy an object."
 "dm","xoylent","4","8","10",,"g_weaponarena laser","[Special] Deathmatch: Xoylent","Laser only: This time you get only the Laser, so try to push the enemies of the map! But don't let them push you, because you need only 10 frags to win."
 "dm","runningman","4","8","15",,,"Deathmatch: Running Man","In this DM game you will face 4 Pro bots on the DM version of Running Man."
 "ctf","space-elevator","5","8","5",,,"Capture The Flag: Space Elevator","CTF versus a team of Pro bots! 5 captures to win."
index 2aa926f..60f8aff 100644 (file)
@@ -1,6 +1,7 @@
 textures/decals/scorch01
 {
        qer_editorimage textures/decals/scorch01
+       dpoffsetmapping none
 
        surfaceparm trans
        surfaceparm nonsolid
index 17c8d78..1e89243 100644 (file)
@@ -1,5 +1,6 @@
 textures/effects_warpzone/wavy
 {
+       dpoffsetmapping none
        surfaceparm nolightmap
        // surfaceparm nonsolid // no, it must be solid like trigger
        surfaceparm trans
index cfc22fb..c006707 100755 (executable)
@@ -448,7 +448,7 @@ for X in *.shader; do
 done
 rm -f "$t"
 
-textures_avail=`( cd ..; find textures/ -type f -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' ) | 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
index 7728504..cca59c9 100644 (file)
@@ -1,6 +1,7 @@
 textures/trak7x/base-pipe1
 {
        qer_editorimage textures/trak7x/base/base_pipe1.tga
+       dpoffsetmapping - 1 match8 75
        
        q3map_bounceScale 1.25
 
@@ -20,6 +21,7 @@ textures/trak7x/base-pipe1
 textures/trak7x/floor-tile1
 {
        qer_editorimage textures/trak7x/floor/floor_tile1.tga
+       dpoffsetmapping - 1 match8 48
        
        q3map_bounceScale 1.25
 
@@ -39,6 +41,7 @@ textures/trak7x/floor-tile1
 textures/trak7x/floor-tile1a
 {
        qer_editorimage textures/trak7x/floor/floor_tile1a.tga
+       dpoffsetmapping - 1 match8 48
        
        q3map_bounceScale 1.25
 
@@ -58,6 +61,7 @@ textures/trak7x/floor-tile1a
 textures/trak7x/panel-vent1
 {
        qer_editorimage textures/trak7x/panel/panel_vent1.tga
+       dpoffsetmapping - 1 match8 78
        
        q3map_bounceScale 1.25
 
@@ -77,6 +81,7 @@ textures/trak7x/panel-vent1
 textures/trak7x/panel-vpanel1
 {
        qer_editorimage textures/trak7x/panel/panel_vpanel1.tga
+       dpoffsetmapping - 1 match8 67
        
        q3map_bounceScale 1.25
 
@@ -96,6 +101,7 @@ textures/trak7x/panel-vpanel1
 textures/trak7x/wall-wall1
 {
        qer_editorimage textures/trak7x/wall/wall_wall1.tga
+       dpoffsetmapping - 1 match8 32
        
        q3map_bounceScale 1.25
 
@@ -115,6 +121,7 @@ textures/trak7x/wall-wall1
 textures/trak7x/wall-wall1b
 {
        qer_editorimage textures/trak7x/wall/wall_wall1b.tga
+       dpoffsetmapping - 1 match8 32
        
        q3map_bounceScale 1.25
 
@@ -134,6 +141,7 @@ textures/trak7x/wall-wall1b
 textures/trak7x/wall-wallplain1
 {
        qer_editorimage textures/trak7x/wall/wall_wallplain1.tga
+       dpoffsetmapping - 1 match8 38
        
        q3map_bounceScale 1.25
 
diff --git a/textures/trak7x/floor/floor_tile1a_gloss.tga b/textures/trak7x/floor/floor_tile1a_gloss.tga
new file mode 100644 (file)
index 0000000..44e1dc0
Binary files /dev/null and b/textures/trak7x/floor/floor_tile1a_gloss.tga differ
diff --git a/textures/trak7x/floor/floor_tile1a_norm.tga b/textures/trak7x/floor/floor_tile1a_norm.tga
new file mode 100644 (file)
index 0000000..19e373e
Binary files /dev/null and b/textures/trak7x/floor/floor_tile1a_norm.tga differ
diff --git a/textures/trak7x/wall/wall_wall1b_gloss.tga b/textures/trak7x/wall/wall_wall1b_gloss.tga
new file mode 100644 (file)
index 0000000..515e829
Binary files /dev/null and b/textures/trak7x/wall/wall_wall1b_gloss.tga differ
diff --git a/textures/trak7x/wall/wall_wall1b_norm.tga b/textures/trak7x/wall/wall_wall1b_norm.tga
new file mode 100644 (file)
index 0000000..8985e13
Binary files /dev/null and b/textures/trak7x/wall/wall_wall1b_norm.tga differ