Changeset 11783 for code/trunk/data

Timestamp:

Feb 20, 2018, 12:14:40 AM (7 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/gui/layouts/Dialog.layout (copied) (copied from code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout)
• data/gui/layouts/Dialogue.layout (deleted)
• data/gui/layouts/HighscoreMenu.layout (modified) (1 prop)
• data/gui/scripts/Dialog.lua (copied) (copied from code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua)
• data/gui/scripts/Dialogue.lua (deleted)
• data/gui/scripts/HighscoreMenu.lua (modified) (1 prop)
• data/gui/scripts/TestDialogButttons.lua (modified) (1 prop)
• data/levels/ArrowLevel.oxw (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw)
• data/levels/AsteroidFarming.oxw (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw)
• data/levels/Asteroids2D.oxw (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw)
• data/levels/DialogShowcase.oxw (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw)
• data/levels/DialogueShowcase.oxw (deleted)
• data/levels/Endurancefinal.oxw (modified) (1 prop)
• data/levels/FlappyOrx.oxw (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw)
• data/levels/MilleniumFalconTest.oxw (modified) (1 prop)
• data/levels/NC_StoryModeLevel.oxw (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw)
• data/levels/ProtectBoss.oxw (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw)
• data/levels/SOB.oxw (modified) (10 diffs, 1 prop)
• data/levels/StoryModeMap.oxw (modified) (1 prop)
• data/levels/includes/MFalconWeapon.oxi (modified) (1 prop)
• data/levels/includes/asteroids2DWeapon.oxi (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi)
• data/levels/newnewnewspacerace.oxw (modified) (1 prop)
• data/levels/templates/MFalcon.oxt (modified) (1 prop)
• data/levels/templates/StoryMode.oxt (modified) (1 prop)
• data/levels/templates/StoryModeEscort.oxt (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt)
• data/levels/templates/asteroidsAsteroids2D.oxt (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt)
• data/levels/templates/endurancetest_template.oxt (modified) (1 prop)
• data/levels/templates/enemyFlappyOrx.oxt (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt)
• data/levels/templates/fastship.oxt (modified) (1 prop)
• data/levels/templates/spaceshipAsteroids2D.oxt (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt)
• data/levels/templates/spaceshipFlappyOrx.oxt (copied) (copied from code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt)
• data/overlays/Asteroids2DHUD.oxo (copied) (copied from code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo)
• data/overlays/FlappyOrxHUD.oxo (copied) (copied from code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo)
• data/overlays/HUDTemplates3.oxo (modified) (2 diffs)
• data/overlays/HUDTemplatesFPS.oxo (modified) (1 diff)
• data/overlays/SOBHUD.oxo (modified) (1 prop)
• data/overlays/StoryModeHUD.oxo (modified) (1 diff, 1 prop)
• data/overlays/StoryModeHUD2.oxo (copied) (copied from code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo)
• data/particle/fire3.particle (modified) (1 diff)

code/trunk/data/levels/SOB.oxw

@@ -7 +7 @@
 
         <?lua
-        include("HUDTemplates3.oxo")  
-        include("jumpHUD.oxo")
         include("stats.oxo")
         include("templates/lodInformation.oxt")
         include("overlays/SOBHUD.oxo")
         ?>
+
 
 
@@ -48 +47 @@
 
 
-
         <Template name=sobFigureTemplate>
                 <SOBFigure camerapositiontemplate=sobfigurecameras collisionType="dynamic" position="0,0,30">
@@ -57 +55 @@
 
                         <collisionShapes>
-                                <BoxCollisionShape position="-2,0,2" halfExtents="3,1,10" />
+                                <BoxCollisionShape position="0,0,2" halfExtents="3,1,10" />
                         </collisionShapes>
 
 
                 </SOBFigure>
+        </Template> 
+
+
+        <Template name=fireball>
+                <SOBFireball collisionType="dynamic" speed=90>
+                        <attached>
+                                <Model mesh="planets/sol.mesh" position="0,0,0" scale=3 pitch=90/> 
+
+                                <ParticleSpawner source="Orxonox/fire4" startdelay=0  position="-4,0,0" visible="false"/>
+                                
+                        </attached>
+                        <collisionShapes>
+                                <SphereCollisionShape position="0,0,0" radius="3" />                    
+                        </collisionShapes>
+                </SOBFireball>
         </Template>
+
+        <Template name=gumbaShootable>
+                <SOBGumba collisionType="dynamic" speed=60>
+                        <attached>
+                                <Model mesh="Goomba.mesh" position="0,0,1" scale=3 pitch=90/>                           
+                        </attached>
+                        <collisionShapes>
+                                <BoxCollisionShape position="0,0,0" halfExtents="5,5,3" />                      
+                        </collisionShapes>
+                </SOBGumba>
+        </Template>
+
 
         <Level
@@ -95 +120 @@
 
 
-                                        <!--Gumba-->
+
+
+
+
 
                                         <SOBGumba collisionType="dynamic" speed=40 position = "240,0,0">
@@ -106 +134 @@
                                                 </collisionShapes>
                                         </SOBGumba>
+
                                         <SOBGumba collisionType="dynamic" speed=30 position = "420,0,0">
                                                 <attached>
@@ -193 +222 @@
                                         </SOBGumba>
 
-                                        <SOBGumba collisionType="dynamic" speed=30 position = "1750,0,0">
-                                                <attached>
-                                                        <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/> 
-                                                        
-                                                </attached>
-                                                <collisionShapes>
-                                                        <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />                     
-                                                </collisionShapes>
-                                        </SOBGumba>
-
-                                        <SOBGumba collisionType="dynamic" speed=20 position = "1770,0,0">
-                                                <attached>
-                                                        <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/> 
-                                                        
-                                                </attached>
-                                                <collisionShapes>
-                                                        <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />                     
-                                                </collisionShapes>
-                                        </SOBGumba>
-
+                                        <!--GumbaBoss-->
+                                        <SOBGumbaBoss collisionType="dynamic" speed=20 position = "1750,0,0">
+                                                <attached>
+                                                        <Model mesh="Goomba.mesh" position="0,0,21" scale=6 pitch=90/> 
+                                                        
+                                                </attached>
+                                                <collisionShapes>
+                                                        <BoxCollisionShape position="0,0,20" halfExtents="10,10,6" />                   
+                                                </collisionShapes>
+                                        </SOBGumbaBoss>
+x       
 
                                         <!--CollisionShape for Gumba-->
@@ -225 +245 @@
                                                 </collisionShapes>
                                         </StaticEntity>
-
-
-
-                                        
-
 
 
@@ -581 +596 @@
 
 
-                                        <!-- Luft4 -->
+                                        <!-- Luft4 (BossAbschnitt)-->
                                         <Model mesh="Dreieck.mesh" position="1560,0,-10" scale=10 Roll=90 Pitch=-90 yaw=90/>                    <!-- L4.1 -->
 
                                         <Model mesh="Rohr.mesh" position="1645,5,-35" scale=10  roll=90 yaw=90 pitch=-90 />                     <!-- L4.2 -->
-
-                                        <Model mesh="Cube1.1.mesh" position="1690,0,20" scale=10/>                                                                              <!-- L4.3 -->
-                                        <Model mesh="Cube1.1.mesh" position="1700,0,20" scale=10/>                                                                              <!-- L4.4 -->
-
-                                        <SOBQBlock collisionType="static" type="Coin" position="1710,0,20" mass='-1'>                                   <!-- L4.5 -->                           
-                                                <attached>
-                                                        <Model mesh="QCube.mesh" scale=10 pitch=90/>
-                                                        <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>                         
-                                                </attached>
-                                                <collisionShapes>
-                                                        <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
-                                                </collisionShapes>
-                                        </SOBQBlock> 
-
-                                        <Model mesh="Cube1.1.mesh" position="1720,0,20" scale=10/>                                                                              <!-- L4.6 -->
                                         <Model mesh="Rohr.mesh" position="1805,5,-35" scale=10  roll=90 yaw=90 pitch=-90 />                     <!-- L4.7 -->
                                         <Model mesh="Dreieckgross.mesh" position="1850,0,-10" scale=10 pitch=90 />                                              <!-- L4.8 -->
@@ -606 +606 @@
 
 
-                                        <Model mesh="Schloss.mesh" position="2050,40,60" scale=12 pitch=90/>                                    <!-- L4.12 -->
+                                        <Model mesh="Schloss.mesh" position="2050,40,80" scale=15 pitch=90/>                                    <!-- L4.12 -->
                                         <Model mesh="Fahne.mesh" position="1984,-5,88" scale=10 pitch=90/>                                              <!-- L4.11 -->
                                         <Model mesh="Fahnenstange.mesh" position="1990,0,95" pitch=90 scale=3/>                                 <!-- L4.10 -->
@@ -680 +680 @@
                                         </StaticEntity>
 
-
-
-
-                                        <StaticEntity collisionType="static" mass='-1'>
-                                                <collisionShapes>
-
-                                                        <BoxCollisionShape position="1690,0,20" halfExtents="5,5,5" />                                  <!-- 4.3 -->
-                                                        <BoxCollisionShape position="1700,0,20" halfExtents="5,5,5" />                                  <!-- 4.4 -->
-                                                        <BoxCollisionShape position="1720,0,20" halfExtents="5,5,5" />                                  <!-- 4.6 -->
-
-
-                                                </collisionShapes>
-                                        </StaticEntity>
 
 

code/trunk/data/overlays/HUDTemplates3.oxo

@@ -47 +47 @@
 <Template name="spaceshiphud">
   <OverlayGroup name = "spaceshiphud" scale = "1, 1">
-    <Map />
+
 
     <HUDHealthBar
@@ -217 +217 @@
 
     <GUIOverlay
-      name = "Dialogue"
-      guiname = "Dialogue"
+      name = "Dialog"
+      guiname = "Dialog"
       visible = "false"
     />

code/trunk/data/overlays/HUDTemplatesFPS.oxo

@@ -1 +1 @@
 <Template name="fpshud">
   <OverlayGroup name = "fpshud" scale = "1, 1">
-    <Map />
-
     <HUDHealthBar
      name              = "HealthBar1"

code/trunk/data/overlays/StoryModeHUD.oxo

@@ -2 +2 @@
 <Template name="StoryModeMap">
   <OverlayGroup name = "spaceshiphud" scale = "1, 1">
-    <Map />
-
 
      <GUIOverlay

code/trunk/data/particle/fire3.particle

@@ -65 +65 @@
                 colour3 0 0 0 0
                 time3   1
-                colour4 0.5 0.5 0.5 0
-                time4   1
-                colour5 0.5 0.5 0.5 0
-                time5   1
+                
         }
 }