Changeset 11678 for code/branches/Presentation_HS17/data
- Timestamp:
- Dec 16, 2017, 12:24:20 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17
- Files:
-
- 3 edited
- 4 copied
-
. (modified) (1 prop)
-
data/levels/FlappyOrx.oxw (copied) (copied from code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw)
-
data/levels/SOB.oxw (modified) (10 diffs)
-
data/levels/templates/enemyFlappyOrx.oxt (copied) (copied from code/branches/FlappyOrx_HS17/data/levels/templates/enemyFlappyOrx.oxt)
-
data/levels/templates/spaceshipFlappyOrx.oxt (copied) (copied from code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt)
-
data/overlays/FlappyOrxHUD.oxo (copied) (copied from code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo)
-
data/particle/fire3.particle (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17/data/levels/SOB.oxw
r11449 r11678 13 13 include("overlays/SOBHUD.oxo") 14 14 ?> 15 15 16 16 17 … … 48 49 49 50 50 51 51 <Template name=sobFigureTemplate> 52 52 <SOBFigure camerapositiontemplate=sobfigurecameras collisionType="dynamic" position="0,0,30"> … … 57 57 58 58 <collisionShapes> 59 <BoxCollisionShape position=" -2,0,2" halfExtents="3,1,10" />59 <BoxCollisionShape position="0,0,2" halfExtents="3,1,10" /> 60 60 </collisionShapes> 61 61 62 62 63 63 </SOBFigure> 64 </Template> 65 66 67 <Template name=fireball> 68 <SOBFireball collisionType="dynamic" speed=90> 69 <attached> 70 <Model mesh="planets/sol.mesh" position="0,0,0" scale=3 pitch=90/> 71 72 <ParticleSpawner source="Orxonox/fire4" startdelay=0 position="-4,0,0" visible="false"/> 73 74 </attached> 75 <collisionShapes> 76 <SphereCollisionShape position="0,0,0" radius="3" /> 77 </collisionShapes> 78 </SOBFireball> 64 79 </Template> 80 81 <Template name=gumbaShootable> 82 <SOBGumbaBoss collisionType="dynamic" speed=60> 83 <attached> 84 <Model mesh="Goomba.mesh" position="0,0,1" scale=3 pitch=90/> 85 </attached> 86 <collisionShapes> 87 <BoxCollisionShape position="0,0,0" halfExtents="5,5,3" /> 88 </collisionShapes> 89 </SOBGumbaBoss> 90 </Template> 91 65 92 66 93 <Level … … 95 122 96 123 97 <!--Gumba--> 124 125 126 127 98 128 99 129 <SOBGumba collisionType="dynamic" speed=40 position = "240,0,0"> … … 106 136 </collisionShapes> 107 137 </SOBGumba> 138 108 139 <SOBGumba collisionType="dynamic" speed=30 position = "420,0,0"> 109 140 <attached> … … 193 224 </SOBGumba> 194 225 195 <SOBGumba collisionType="dynamic" speed=30 position = "1750,0,0"> 196 <attached> 197 <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/> 198 199 </attached> 200 <collisionShapes> 201 <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" /> 202 </collisionShapes> 203 </SOBGumba> 204 205 <SOBGumba collisionType="dynamic" speed=20 position = "1770,0,0"> 206 <attached> 207 <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/> 208 209 </attached> 210 <collisionShapes> 211 <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" /> 212 </collisionShapes> 213 </SOBGumba> 214 226 <!--GumbaBoss--> 227 <SOBGumbaBoss collisionType="dynamic" speed=20 position = "1750,0,0"> 228 <attached> 229 <Model mesh="Goomba.mesh" position="0,0,21" scale=6 pitch=90/> 230 231 </attached> 232 <collisionShapes> 233 <BoxCollisionShape position="0,0,20" halfExtents="10,10,6" /> 234 </collisionShapes> 235 </SOBGumbaBoss> 236 x 215 237 216 238 <!--CollisionShape for Gumba--> … … 225 247 </collisionShapes> 226 248 </StaticEntity> 227 228 229 230 231 232 249 233 250 … … 581 598 582 599 583 <!-- Luft4 -->600 <!-- Luft4 (BossAbschnitt)--> 584 601 <Model mesh="Dreieck.mesh" position="1560,0,-10" scale=10 Roll=90 Pitch=-90 yaw=90/> <!-- L4.1 --> 585 602 586 603 <Model mesh="Rohr.mesh" position="1645,5,-35" scale=10 roll=90 yaw=90 pitch=-90 /> <!-- L4.2 --> 587 588 <Model mesh="Cube1.1.mesh" position="1690,0,20" scale=10/> <!-- L4.3 -->589 <Model mesh="Cube1.1.mesh" position="1700,0,20" scale=10/> <!-- L4.4 -->590 591 <SOBQBlock collisionType="static" type="Coin" position="1710,0,20" mass='-1'> <!-- L4.5 -->592 <attached>593 <Model mesh="QCube.mesh" scale=10 pitch=90/>594 <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>595 </attached>596 <collisionShapes>597 <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />598 </collisionShapes>599 </SOBQBlock>600 601 <Model mesh="Cube1.1.mesh" position="1720,0,20" scale=10/> <!-- L4.6 -->602 604 <Model mesh="Rohr.mesh" position="1805,5,-35" scale=10 roll=90 yaw=90 pitch=-90 /> <!-- L4.7 --> 603 605 <Model mesh="Dreieckgross.mesh" position="1850,0,-10" scale=10 pitch=90 /> <!-- L4.8 --> … … 606 608 607 609 608 <Model mesh="Schloss.mesh" position="2050,40, 60" scale=12pitch=90/> <!-- L4.12 -->610 <Model mesh="Schloss.mesh" position="2050,40,80" scale=15 pitch=90/> <!-- L4.12 --> 609 611 <Model mesh="Fahne.mesh" position="1984,-5,88" scale=10 pitch=90/> <!-- L4.11 --> 610 612 <Model mesh="Fahnenstange.mesh" position="1990,0,95" pitch=90 scale=3/> <!-- L4.10 --> … … 680 682 </StaticEntity> 681 683 682 683 684 685 <StaticEntity collisionType="static" mass='-1'>686 <collisionShapes>687 688 <BoxCollisionShape position="1690,0,20" halfExtents="5,5,5" /> <!-- 4.3 -->689 <BoxCollisionShape position="1700,0,20" halfExtents="5,5,5" /> <!-- 4.4 -->690 <BoxCollisionShape position="1720,0,20" halfExtents="5,5,5" /> <!-- 4.6 -->691 692 693 </collisionShapes>694 </StaticEntity>695 684 696 685 -
code/branches/Presentation_HS17/data/particle/fire3.particle
r5781 r11678 65 65 colour3 0 0 0 0 66 66 time3 1 67 colour4 0.5 0.5 0.5 0 68 time4 1 69 colour5 0.5 0.5 0.5 0 70 time5 1 67 71 68 } 72 69 }
Note: See TracChangeset
for help on using the changeset viewer.
