Index: code/branches/Merge_HS18/data/gui/layouts/CampaignMenu.layout
===================================================================
--- code/branches/Merge_HS18/data/gui/layouts/CampaignMenu.layout	(revision 12179)
+++ code/branches/Merge_HS18/data/gui/layouts/CampaignMenu.layout	(revision 12180)
@@ -7,4 +7,8 @@
         <Property name="Area" value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property name="BackgroundEnabled" value="False" />
+              
+
+        
+
         <Window name="Mission1Text" type="MenuWidgets/Button">
             <Property name="Text" value="Mission One" />
@@ -13,4 +17,5 @@
             <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission1Button" type="MenuWidgets/JuuButton">
             <Property name="Visible" value="False" />
@@ -19,13 +24,15 @@
             <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission2Text" type="MenuWidgets/Button">
             <Property name="Text" value="Fight in our Back" />
-            <Property name="Visible" value="False" />
+            <Property name="Visible" value="True" />
             <Property name="Area" value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
             <Property name="Disabled" value="True" />
             <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
         </Window>
+        
         <Window name="Mission2Button" type="MenuWidgets/JuuButton">
-            <Property name="Visible" value="False" />
+            <Property name="Visible" value="True" />
             <Property name="MaxSize" value="{{1,0},{1,0}}" />
             <Property name="Area" value="{{0.4,0},{0.7,0},{0.5,0},{0.85,0}}" />
@@ -33,4 +40,5 @@
             <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission3Text" type="MenuWidgets/Button">
             <Property name="Text" value="Pirate Attack" />
@@ -47,4 +55,5 @@
             <Event function="CampaignMenu.Mission3Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission4Text" type="MenuWidgets/Button">
             <Property name="Text" value="Trip to Area 51" />
@@ -61,4 +70,5 @@
             <Event function="CampaignMenu.Mission4Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission5Text" type="MenuWidgets/Button">
             <Property name="Text" value="Area 51 under Fire" />
@@ -75,4 +85,5 @@
             <Event function="CampaignMenu.Mission5Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission6Text" type="MenuWidgets/Button">
             <Property name="Text" value="Escape the Bastards" />
@@ -85,6 +96,8 @@
             <Property name="Visible" value="False" />
             <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            
             <Property name="Area" value="{{0.6,0},{0.17,0},{0.65,0},{0.27,0}}" />
-            <Property name="Disabled" value="True" />
+            
+            <Property name="Disabled" value="True" /> 
             <Event function="CampaignMenu.Mission6Button_clicked" name="Clicked" />
         </Window>
@@ -96,4 +109,5 @@
             <Property name="Area" value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
         </Window>
+
         <Window name="Mission7Button" type="MenuWidgets/JuuButton">
             <Property name="Visible" value="False" />
@@ -117,4 +131,5 @@
             <Event function="CampaignMenu.Mission8Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission9Text" type="MenuWidgets/Button">
             <Property name="Text" value="Retaliation" />
@@ -131,4 +146,5 @@
             <Event function="CampaignMenu.Mission9Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="CampaignMenuBackButton" type="MenuWidgets/Button">
             <Property name="Text" value="Back" />
@@ -137,4 +153,6 @@
             <Event function="CampaignMenu.CampaignMenuBackButton_clicked" name="Clicked" />
         </Window>
+
+
         <Window name="CampaignMenuCongratulation" type="MenuWidgets/StaticText">
             <Property name="Text" value="Campaign Completed!!!" />
@@ -146,4 +164,5 @@
             <Property name="Area" value="{{0.4,0},{0.15,0},{0.6,0},{0.2,0}}" />
         </Window>
+        
     </Window>
 </GUILayout>
Index: code/branches/Merge_HS18/data/gui/scripts/CampaignMenu.lua
===================================================================
--- code/branches/Merge_HS18/data/gui/scripts/CampaignMenu.lua	(revision 12179)
+++ code/branches/Merge_HS18/data/gui/scripts/CampaignMenu.lua	(revision 12180)
@@ -2,4 +2,5 @@
 
 local P = createMenuSheet("CampaignMenu")
+
 
 function P:onShow()
@@ -33,13 +34,19 @@
     end
 end
-
+--Updated Buttons der levels
 function P.updateButton(index, button)
+    --Wenn genuegend Levels vorhanden sind, wird der Butten angezeigt
     if (P.shouldDisplayButton(index)) then
         button:setProperty("Visible", "True")
 
+        --wenn genuegend levels bestanden sind, wird er benutzbar
         if (P.shouldEnableButton(index)) then
             button:setProperty("Disabled", "False")
         end
     end
+end
+
+function P.Test(e)
+     orxonox.execute("startMainMenu")
 end
 
@@ -69,5 +76,11 @@
 end
 
+
+
+
 function P.Mission1Button_clicked(e)
+    P.loadLevel(P.FindLevel(0))
+end
+function P.KeyPressed(e)
     P.loadLevel(P.FindLevel(0))
 end
@@ -110,4 +123,9 @@
 end
 
+function P.loadMap()
+    orxonox.execute("changeGame  dynamicMatch.oxw")
+     hideAllMenuSheets()
+end
+
 function P.FindLevel(index)
     local filename = orxonox.LevelManager:getInstance():getCampaignMission(index)
Index: code/branches/Merge_HS18/data/levels/MapExample.oxw
===================================================================
--- code/branches/Merge_HS18/data/levels/MapExample.oxw	(revision 12180)
+++ code/branches/Merge_HS18/data/levels/MapExample.oxw	(revision 12180)
@@ -0,0 +1,62 @@
+
+
+<LevelInfo
+ name = "MapExample"
+ description = "Shows a little map that should be understandable. Choose your level with right/left/space"
+ screenshot = "emptylevel.png"
+/>
+<!-- Some stuff which is needed to work -->
+<?lua
+  
+  include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("MapExampleHUD.oxo") 
+  include("stats.oxo")  
+  include("templates/MapExample.oxt")
+  
+?>
+<Level
+gametype = StoryMode
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+  <?lua include("includes/notifications.oxi") ?>
+  <Scene
+    ambientlight = "0.2, 0.2, 0.2"
+    skybox       = "Orxonox/Starbox"
+  >
+    <!-- Here we initiate the Storymodecontroller which basically keeps track at which game we want to look at at the moment. 
+    The Controller has a model attached which is set to invisible, but it's needed as an anchor. We set the cameraposition inhere too. -->
+    <StoryModeController position="0,0,0" collisionType="dynamic" mass=42000000 >
+      <attached>
+        <Model position="0,0,0" mesh="assff.mesh" scale=20  visible="false" />
+      </attached>
+      <CameraPosition position="0,0,0" direction="0, -1, 0" drag=false />
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="3,1,10" />
+      </collisionShapes>
+    </StoryModeController>
+    <!-- Creates a few static entitys. Theire position will be important. Maybe you want to note them when you plan your own map. -->
+    <StaticEntity position="550,300,0" direction="0,0,-1" >
+      <attached>
+        <!-- Model 1: Will be linked to the model Map -->
+        <Billboard colour="1,0,0.05" position="0,0,0"  material="Flares/lensflare" scale=0.5 />
+        <Model position="0,0,20" mesh="ETH.mesh" scale=10  visible="true" lookat="550,300,21"/>
+        <!-- Model 2: linked to pong -->
+        <Billboard colour="1,1,0.05" position="50,0,0"  material="Flares/lensflare" scale=0.5 />
+        <Model position="50,0,20" mesh="PacmanGelb.mesh" scale=10  visible="true" lookat="100,0,20" />
+        <!-- Model 3: linked to Towerdefense -->
+        <Billboard colour="0,1,0.05" position="100,0,0"  material="Flares/lensflare" scale=0.5 />
+        <Model position="100,0,20"  lookat = "100,50,20" mesh="Tower.mesh" scale=10  visible="true" />
+        <!-- Model 4: linked to Orxobrows -->
+        <Billboard colour="1,1,1" position="150,0,0"  material="Flares/lensflare" scale=0.5 />
+        <Model position="150,0,20" mesh="orxo.mesh" scale=5 lookat="150,0,-120"  visible="true" />
+      </attached>
+    </StaticEntity>
+    <!-- some Stuff which is needed to work -->
+    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, 1" spawnclass=StoryModeController pawndesign=MapExample />
+  </Scene>
+</Level>
+
Index: code/branches/Merge_HS18/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/Merge_HS18/data/levels/StoryModeMap.oxw	(revision 12179)
+++ code/branches/Merge_HS18/data/levels/StoryModeMap.oxw	(revision 12180)
@@ -11,4 +11,5 @@
   include("StoryModeHUD.oxo")
   include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/StoryMode.oxt")
 ?>
@@ -21,4 +22,7 @@
     <Template link=lodtemplate_default />
   </templates>
+
+   
+
   <?lua include("includes/notifications.oxi") ?>
 
@@ -27,16 +31,28 @@
     skybox       = "Orxonox/Starbox"
   >
+   
+    
+    
+    
 
-
-    <StaticEntity position="0,0,0" direction="0,0,0" >
+    <StaticEntity position="0,0,0" direction="0,0,-1" >
       <attached>
 
-        <Model position="600,370,0" mesh="planets/moon.mesh" scale=100 />
+        <Model name="a" position="550,300,0" mesh="planets/moon.mesh" scale=100 visible="true" />
+        <Billboard colour="1,0,0.05" position="550,300,-80"  material="Flares/lensflare" scale=4.5 />
+
+        <Model name="a" position="600,370,0" mesh="planets/moon.mesh" scale=100 visible="true" />
+         
+        
+         <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="false" orientation="-0.015,0.091,0.038,-0.995"/>
+        
         <Billboard colour="1,1,0.05" position="600,370,-80"  material="Flares/lensflare" scale=4.5 />
-  
-        <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100  />
+       
+
+        <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100  visible="true"/>
+         
         <Billboard colour="1,1,0.05" position="100,350,-330"  material="Flares/lensflare" scale=4.5 />
 
-        <Model position="-600,250,-500" mesh="planets/moon.mesh" scale=100 />
+        <Model position="-600,250,-500" mesh="planets/moon.mesh" scale=100 visible="true"/>
         <Billboard colour="1,1,0.05" position="-600,250,-580"  material="Flares/lensflare" scale=5 />
 
@@ -62,7 +78,10 @@
     </StaticEntity>
 
+    
+
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
 
-    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=StoryMode />
+    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" spawnclass=StoryMode pawndesign=StoryMode />
+    
     
   </Scene>
Index: code/branches/Merge_HS18/data/levels/emptyLevel22.oxw
===================================================================
--- code/branches/Merge_HS18/data/levels/emptyLevel22.oxw	(revision 12180)
+++ code/branches/Merge_HS18/data/levels/emptyLevel22.oxw	(revision 12180)
@@ -0,0 +1,50 @@
+<LevelInfo
+ name = "Empty level22"
+ description = "A level with absolutely nothing in it."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipEscort.oxt")
+?>
+
+<Level>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+  <?lua include("includes/notifications.oxi") ?>
+
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/Starbox"
+  >
+
+    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+    
+    <SpaceShip position="300,0,0" lookat="0,0,0" team=3>
+    <templates>
+        <Template link=spaceshipescort />
+    </templates>
+    <controller>
+        <StoryModeController accuracy=10 team=3>
+            <waypoints>
+                <Model mesh="cube.mesh" scale=8 position="300,0,0" />
+                <Model mesh="cube.mesh" scale=8 position="300,500,0" />
+                <Model mesh="cube.mesh" scale=8 position="0,500,0" />
+                <StaticEntity position="0,0,0" />
+            </waypoints>
+        </StoryModeController>
+    </controller>
+</SpaceShip>
+  </Scene>
+  
+</Level>
+
Index: code/branches/Merge_HS18/data/levels/templates/MapExample.oxt
===================================================================
--- code/branches/Merge_HS18/data/levels/templates/MapExample.oxt	(revision 12180)
+++ code/branches/Merge_HS18/data/levels/templates/MapExample.oxt	(revision 12180)
@@ -0,0 +1,5 @@
+<Template name=MapExample>
+  <StoryModeController
+   hudtemplate            = MapExampleH
+  />
+</Template>
Index: code/branches/Merge_HS18/data/levels/templates/StoryMode.oxt
===================================================================
--- code/branches/Merge_HS18/data/levels/templates/StoryMode.oxt	(revision 12179)
+++ code/branches/Merge_HS18/data/levels/templates/StoryMode.oxt	(revision 12180)
@@ -1,4 +1,4 @@
 <Template name=StoryMode>
-  <Pawn
+  <StoryModeController
    hudtemplate            = StoryModeMap
   />
Index: code/branches/Merge_HS18/data/levels/templates/StoryModeEscort.oxt
===================================================================
--- code/branches/Merge_HS18/data/levels/templates/StoryModeEscort.oxt	(revision 12179)
+++ code/branches/Merge_HS18/data/levels/templates/StoryModeEscort.oxt	(revision 12180)
@@ -43,5 +43,5 @@
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
+      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=20 mesh="escortShip.mesh" />
       <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
 <!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
Index: code/branches/Merge_HS18/data/overlays/MapExampleHUD.oxo
===================================================================
--- code/branches/Merge_HS18/data/overlays/MapExampleHUD.oxo	(revision 12180)
+++ code/branches/Merge_HS18/data/overlays/MapExampleHUD.oxo	(revision 12180)
@@ -0,0 +1,16 @@
+
+<Template name="MapExampleH">
+  <OverlayGroup name = "spaceshiphud" scale = "1, 1">
+
+     <GUIOverlay
+      name = "CampaignMenu"
+      guiname = "CampaignMenu"
+      visible = "false"
+    />
+
+  </OverlayGroup>
+</Template>
+  <Template name="spectatorhud">
+  <OverlayGroup name = "spectatorhud" scale = "1, 1">
+  </OverlayGroup>
+</Template>
Index: code/branches/Merge_HS18/data/overlays/StoryModeHUD.oxo
===================================================================
--- code/branches/Merge_HS18/data/overlays/StoryModeHUD.oxo	(revision 12179)
+++ code/branches/Merge_HS18/data/overlays/StoryModeHUD.oxo	(revision 12180)
@@ -11,2 +11,6 @@
   </OverlayGroup>
 </Template>
+  <Template name="spectatorhud">
+  <OverlayGroup name = "spectatorhud" scale = "1, 1">
+  </OverlayGroup>
+</Template>
