(Commit created by redmine exporter script from page "Wiki" version 127)

[xonotic/xonotic.wiki.git] / Maps_Branches.textile

diff --git a/Maps_Branches.textile b/Maps_Branches.textile
index 4fd69cd38af90356cd0bc4b0161c5bad8dd65f92..38871c247f598d9654ac3d07ad4cd1d6d4ccf75e 100644 (file)
--- a/Maps_Branches.textile
+++ b/Maps_Branches.textile
@@ -14,7 +14,7 @@ LEAK, also, q3map2 light bugs
 
 h2. mintox/implosion
 
-Fine, but cannot be merged due to conflicts. Author has to merge from master into map branch and fix the conflicts. Also, too dark.
+DOES NOT MERGE. Author has to merge from master into map branch and fix the conflicts. Also, too dark.
 
 h2. fruitiex/aggressor
 
@@ -33,32 +33,168 @@ h2. mirceakitsune/red_planet
 Waiting for final touches by Cuinnton.
 
 h2. plasmasheep/lsp
+
+No options file.
+
 h2. mintox/equinox
+
 h2. diabolik/ihsan
+
+DOES NOT MERGE.
+
 h2. ThePWTULN/campaigntimer
+
 h2. diabolik/strength
+
+No options file.
+
 h2. diabolik/darkzone
+
+Too dark.
+
 h2. mookow/facility_114
+
 h2. mookow/facility114-ctf
+
+DOES NOT MERGE.
+
 h2. cbrutail/map-space_ctf
+
+DOES NOT MERGE.
+
 h2. cbrutail/textures-space_ctf
+
 h2. plasmasheep/valentine114
+
+DOES NOT MERGE.
+
 h2. savagex/courtfun
+
+DOES NOT MERGE. Superseded by divVerent/courtfun2?
+
 h2. savagex/techassault
+
 h2. mookow/condemned_castles
+
 h2. fruitiex/warfare
+
 h2. fruitiex/stormkeep
+
+DOES NOT MERGE.
+
 h2. fruitiex/space_elevator
+
+DOES NOT MERGE.
+
 h2. fruitiex/runningmanctf
+
 h2. fruitiex/flow
+
+DOES NOT MERGE.
+
 h2. fruitiex/final_rage
+
 h2. fruitiex/epsilon
+
+DOES NOT MERGE.
+
 h2. fruitiex/dance
+
+DOES NOT MERGE.
+
 h2. tzork/ents-onoff
+
 h2. tzork/glowarena
+
+DOES NOT MERGE. Superseded by divVerent/glowarena-cuinnton? If yes, DELETE.
+
 h2. fruitiex/cubemaps
+
+(EE) shader textures/envmaps/metal_rusty1 uses non-existing texture env/metal_blurry/metal_blurrybx
+(EE) texture env/metal_blurry/metal_blurrybx of shader textures/envmaps/metal_rusty1 is out of place, editorimage textures must not be in env/
+(EE) no shader name pattern for textures/envmaps/metal_rusty1
+(EE) shader textures/envmaps/metal_rusty1 uses non-existing texture textures/eX/eXmetalBase04
+(EE) no shader name pattern for textures/envmaps/metal_rusty1
+(EE) shader textures/fx/forcefield1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield2-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield2-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/healpod1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/healpod1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/lightning1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/lightning1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/lightning1-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/lightning1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) texture textures/fx/lightnings/lightning1_10 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_11 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_2 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_3 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_5 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_7 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_9 is not referenced by any shader
+
 h2. fruitiex/textures
+
+(EE) shader textures/fx/forcefield1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield2-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield2-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/forcefield1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/healpod1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/healpod1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/jumppadfx1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/lightning1-a is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/lightning1-b is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/lightning1-c is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) shader textures/fx/lightning1-d is not allowed in this shader file (allowed: textures/xonotic-fx/, forbidden: textures/skies/ textures/map_ models/)
+(EE) texture textures/fx/lightnings/lightning1_10 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_11 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_2 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_3 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_5 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_7 is not referenced by any shader
+(EE) texture textures/fx/lightnings/lightning1_9 is not referenced by any shader
+(EE) texture textures/procedural/floor01 is not referenced by any shader
+(EE) texture textures/procedural/floor02 is not referenced by any shader
+(EE) texture textures/procedural/floor03 is not referenced by any shader
+(EE) texture textures/procedural/floor04 is not referenced by any shader
+(EE) texture textures/procedural/fruitconcrete is not referenced by any shader
+(EE) texture textures/procedural/fruitconcrete_blue is not referenced by any shader
+(EE) texture textures/procedural/fruitconcrete_purple is not referenced by any shader
+(EE) texture textures/procedural/fruitconcrete_red is not referenced by any shader
+
 h2. cbrutail/spacectf
+
+DOES NOT MERGE. Superseded by cbrutail/map-space_ctf? If yes, DELETE.
+
 h2. cbrutail/map-further
+
+DOES NOT MERGE.
+
 h2. cbrutail/sandbox-lighting
+
 h2. cbrutail/shaders_fx_xonotic2
+
+DOES NOT MERGE.