[Orxonox-commit 1671] r6389 - in code/branches/presentation2: data/levels data/levels/includes data/levels/old data/levels/templates src/modules/weapons/projectiles
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Dec 21 13:45:56 CET 2009
Author: rgrieder
Date: 2009-12-21 13:45:56 +0100 (Mon, 21 Dec 2009)
New Revision: 6389
Modified:
code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi
code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi
code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi
code/branches/presentation2/data/levels/old/physicstest2.oxw
code/branches/presentation2/data/levels/old/presentation_physics.oxw
code/branches/presentation2/data/levels/old/princessaeryn.oxw
code/branches/presentation2/data/levels/old/questsystem.oxw
code/branches/presentation2/data/levels/old/sample4.oxw
code/branches/presentation2/data/levels/presentation.oxw
code/branches/presentation2/data/levels/presentationHS09.oxw
code/branches/presentation2/data/levels/presentationHS09b.oxw
code/branches/presentation2/data/levels/princessaeryn.oxw
code/branches/presentation2/data/levels/sound.oxw
code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt
code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
Log:
Found some inappropriate tabs.
Modified: code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi
===================================================================
--- code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi 2009-12-21 12:45:56 UTC (rev 6389)
@@ -15,12 +15,12 @@
<Weapon>
<HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
<HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
- <LightningGun mode=1 muzzleoffset="0,0,0" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" />
</Weapon>
<Weapon>
<HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
<HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
- <LightningGun mode=1 muzzleoffset="0,0,0" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" />
</Weapon>
</WeaponPack>
</weapons>
Modified: code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi
===================================================================
--- code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi 2009-12-21 12:45:56 UTC (rev 6389)
@@ -15,12 +15,12 @@
<Weapon>
<HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
<HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
- <LightningGun mode=1 muzzleoffset="0,0,0" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" />
</Weapon>
<Weapon>
<HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
<HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
- <LightningGun mode=1 muzzleoffset="0,0,0" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" />
</Weapon>
</WeaponPack>
</weapons>
Modified: code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi
===================================================================
--- code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi 2009-12-21 12:45:56 UTC (rev 6389)
@@ -15,12 +15,12 @@
<Weapon>
<HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
<HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
- <LightningGun mode=1 muzzleoffset="0,0,0" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" />
</Weapon>
<Weapon>
<HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
<HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
- <LightningGun mode=1 muzzleoffset="0,0,0" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" />
</Weapon>
</WeaponPack>
</weapons>
\ No newline at end of file
Modified: code/branches/presentation2/data/levels/old/physicstest2.oxw
===================================================================
--- code/branches/presentation2/data/levels/old/physicstest2.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/old/physicstest2.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -20,8 +20,8 @@
<SpawnPoint position="0, 0, -700" yaw =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
<SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
- <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
- <StaticEntity
+ <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
+ <StaticEntity
position = "0,0,0"
name = "banana"
collisionType = "static"
@@ -34,21 +34,21 @@
<collisionShapes>
<PlaneCollisionShape name="thePlane" planeNormal="0,1,0" planeOffset=0 />
</collisionShapes>
- </StaticEntity>
+ </StaticEntity>
- <!-- red sphere for phsics engine testing purposes-->
- <!--StaticEntity position="40,0,0">
- <attached>
- <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
- </attached>
- </StaticEntity-->
+ <!-- red sphere for phsics engine testing purposes-->
+ <!--StaticEntity position="40,0,0">
+ <attached>
+ <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
+ </attached>
+ </StaticEntity-->
- <!-- yellow cube for phsics engine testing purposes-->
- <!--StaticEntity position="80,0,0">
+ <!-- yellow cube for phsics engine testing purposes-->
+ <!--StaticEntity position="80,0,0">
<attached>
<Model position="0,0,0" scale=1 mesh="cube.mesh" />
</attached>
- </StaticEntity-->
+ </StaticEntity-->
<MovableEntity
name = "blubb"
Modified: code/branches/presentation2/data/levels/old/presentation_physics.oxw
===================================================================
--- code/branches/presentation2/data/levels/old/presentation_physics.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/old/presentation_physics.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -29,9 +29,9 @@
<collisionShapes>
<PlaneCollisionShape planeNormal="0,1,0" planeOffset=0 />
</collisionShapes>
- </StaticEntity>
+ </StaticEntity>
- <MovableEntity
+ <MovableEntity
position = "0,250,500"
rotationaxis = "1, 1, 1"
rotationrate = 360
@@ -63,7 +63,7 @@
<BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
- </MovableEntity>
+ </MovableEntity>
<?lua
for i = -20, 20, 8
Modified: code/branches/presentation2/data/levels/old/princessaeryn.oxw
===================================================================
--- code/branches/presentation2/data/levels/old/princessaeryn.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/old/princessaeryn.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -5,13 +5,13 @@
?>
<?lua
- dofile("includes/CuboidSpaceStation.lua")
+ dofile("includes/CuboidSpaceStation.lua")
?>
<NotificationQueue
- name = "notification"
- position = "1.0, 1.0"
- targets = "questsystem"
+ name = "notification"
+ position = "1.0, 1.0"
+ targets = "questsystem"
/>
<Level
Modified: code/branches/presentation2/data/levels/old/questsystem.oxw
===================================================================
--- code/branches/presentation2/data/levels/old/questsystem.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/old/questsystem.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -5,9 +5,9 @@
?>
<NotificationQueue
- name = "notification"
- position = "1.0, 1.0"
- targets = "all"
+ name = "notification"
+ position = "1.0, 1.0"
+ targets = "all"
/>
<Level
@@ -28,19 +28,19 @@
</hints>
</GlobalQuest>
- <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
- <events>
- <spawn>
- <EventTrigger delay=1>
- <events>
- <trigger>
- <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
- </trigger>
- </events>
- </EventTrigger>
- </spawn>
- </events>
- </ParticleSpawner>
+ <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+ <events>
+ <spawn>
+ <EventTrigger delay=1>
+ <events>
+ <trigger>
+ <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </spawn>
+ </events>
+ </ParticleSpawner>
<QuestEffectBeacon position="0,0,100" times=-1>
<effects>
Modified: code/branches/presentation2/data/levels/old/sample4.oxw
===================================================================
--- code/branches/presentation2/data/levels/old/sample4.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/old/sample4.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -22,10 +22,10 @@
<attached>
<Model position="0,0,0" scale=10 mesh="satellite.mesh" />
<MovableEntity position="-4,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=50>
- <attached>
+ <attached>
<Model position="4,0,0" scale=10 mesh="satellitedish.mesh"/>
</attached>
- </MovableEntity>
+ </MovableEntity>
<ParticleEmitter pitch=-135 roll=30 position="-14, 3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
<ParticleEmitter pitch=135 roll=30 position="-14, 3.5,-9" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
<ParticleEmitter pitch=-45 roll=30 position="-14,-3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
Modified: code/branches/presentation2/data/levels/presentation.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentation.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/presentation.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -19,32 +19,32 @@
<SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
- <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
- <!--StaticEntity position="0,0,0">
- <attached>
- <Model position="0,0,0" scale=1 mesh="axes.mesh" />
- </attached>
- </StaticEntity -->
+ <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
+ <!--StaticEntity position="0,0,0">
+ <attached>
+ <Model position="0,0,0" scale=1 mesh="axes.mesh" />
+ </attached>
+ </StaticEntity -->
- <!-- red sphere for phsics engine testing purposes-->
- <!--StaticEntity position="40,0,0">
- <attached>
- <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
- </attached>
- </StaticEntity-->
+ <!-- red sphere for phsics engine testing purposes-->
+ <!--StaticEntity position="40,0,0">
+ <attached>
+ <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
+ </attached>
+ </StaticEntity-->
- <!-- yellow cube for phsics engine testing purposes-->
- <!--StaticEntity position="80,0,0">
- <attached>
- <Model position="0,0,0" scale=1 mesh="cube.mesh" />
- </attached>
- </StaticEntity-->
+ <!-- yellow cube for phsics engine testing purposes-->
+ <!--StaticEntity position="80,0,0">
+ <attached>
+ <Model position="0,0,0" scale=1 mesh="cube.mesh" />
+ </attached>
+ </StaticEntity-->
- <!-- Carrier with guns not implemented yet -->
- <MovableEntity position="-2000,-1000,-2000" pitch="-90" roll="90">
+ <!-- Carrier with guns not implemented yet -->
+ <MovableEntity position="-2000,-1000,-2000" pitch="-90" roll="90">
<attached>
<Model position="0,0,0" scale=10 mesh="Carrier.mesh" />
- <Model position="0,30,20" scale=10 mesh="pirate.mesh" roll="180" />
+ <Model position="0,30,20" scale=10 mesh="pirate.mesh" roll="180" />
<Model position="-80,-30,20" scale=10 mesh="pirate.mesh" roll="180" />
</attached>
</MovableEntity>
@@ -53,10 +53,10 @@
<attached>
<Model position="0,0,0" scale=10 mesh="satellite.mesh" />
<MovableEntity position="-4,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=50>
- <attached>
+ <attached>
<Model position="4,0,0" scale=10 mesh="satellitedish.mesh"/>
</attached>
- </MovableEntity>
+ </MovableEntity>
<ParticleEmitter pitch=-135 roll=30 position="-14, 3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
<ParticleEmitter pitch=135 roll=30 position="-14, 3.5,-9" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
<ParticleEmitter pitch=-45 roll=30 position="-14,-3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
Modified: code/branches/presentation2/data/levels/presentationHS09.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentationHS09.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/presentationHS09.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -346,7 +346,7 @@
<?lua
elements = {"asteroid_ice.mesh", "asteroid_UV.mesh", "ast1.mesh", "ast2.mesh", "ast3.mesh", "ast4.mesh", "ast5.mesh", "ast6.mesh"}
elements.length = function()
- return table.getn(elements)
+ return table.getn(elements)
end
for i = 1, 100, 1
do
Modified: code/branches/presentation2/data/levels/presentationHS09b.oxw
===================================================================
--- code/branches/presentation2/data/levels/presentationHS09b.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/presentationHS09b.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -40,9 +40,9 @@
<attached>
<Model position="0,0,0" scale=<?lua print(s) ?> mesh="asteroid_UV.mesh" />
</attached>
- <collisionShapes>
- <SphereCollisionShape radius="<?lua print(s*0.9) ?>" />
- </collisionShapes>
+ <collisionShapes>
+ <SphereCollisionShape radius="<?lua print(s*0.9) ?>" />
+ </collisionShapes>
</MovableEntity>
<ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
<?lua
@@ -68,10 +68,10 @@
<Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
</attached>
</MovableEntity>
- <?lua
- end
- ?>
<?lua
+end
+?>
+<?lua
for i = 1,12, 1
do
?>
@@ -80,7 +80,7 @@
<Template link=spaceshipHXYSL />
</templates>
<controller>
- <WaypointPatrolController alertnessradius=4000 team=0 active=true>
+ <WaypointPatrolController alertnessradius=4000 team=0 active=true>
<waypoints>
<StaticEntity position="5000,<?lua print(math.random()*50)?> ,<?lua print(i*50 -150) ?>" />
</waypoints>
@@ -95,7 +95,7 @@
<Template link=spaceshipTransporterSL />
</templates>
<controller>
- <WaypointPatrolController name=pirate target=pirate alertnessradius=1000 team=0 active=false>
+ <WaypointPatrolController name=pirate target=pirate alertnessradius=1000 team=0 active=false>
<waypoints>
<StaticEntity position="5000,100,1100" />
</waypoints>
@@ -196,22 +196,22 @@
s = math.random() * 100
?>
-<MovableEntity collisiontype=dynamic mass=<?lua print(s*10)?> position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
+ <MovableEntity collisiontype=dynamic mass=<?lua print(s*10)?> position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
<attached>
<Model position="0,0,0" scale=<?lua print(s) ?> mesh="asteroid_ice.mesh" />
</attached>
- <collisionShapes>
- <SphereCollisionShape radius="<?lua print(s*0.9)?>" />
- </collisionShapes>
+ <collisionShapes>
+ <SphereCollisionShape radius="<?lua print(s*0.9)?>" />
+ </collisionShapes>
</MovableEntity>
- <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
+ <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
<?lua
end
?>
<!--<EventDispatcher>
<targets>
<EventTarget target=attack />
- <EventTarget target=wait />
+ <EventTarget target=wait />
</targets>
<events>
<activity>
@@ -257,12 +257,12 @@
-<AmbientSound ambientSource="Earth.ogg" looping="true" playOnLoad="false">
- <events>
- <activity>
- <DistanceTrigger position="2000,0,0" distance=500 target="Camera" />
- </activity>
- </events>
+ <AmbientSound ambientSource="Earth.ogg" looping="true" playOnLoad="false">
+ <events>
+ <activity>
+ <DistanceTrigger position="2000,0,0" distance=500 target="Camera" />
+ </activity>
+ </events>
</AmbientSound>
<SpawnPoint position="5000,0,2000" spawnclass=SpaceShip pawndesign=spaceshipassff team=0/>
Modified: code/branches/presentation2/data/levels/princessaeryn.oxw
===================================================================
--- code/branches/presentation2/data/levels/princessaeryn.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/princessaeryn.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -5,7 +5,7 @@
?>
<?lua
- dofile("includes/CuboidSpaceStation.lua")
+ dofile("includes/CuboidSpaceStation.lua")
?>
<NotificationQueue
Modified: code/branches/presentation2/data/levels/sound.oxw
===================================================================
--- code/branches/presentation2/data/levels/sound.oxw 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/sound.oxw 2009-12-21 12:45:56 UTC (rev 6389)
@@ -19,26 +19,26 @@
<AmbientSound ambientSource="Earth.ogg" looping="true" playOnLoad="true" />
<AmbientSound ambientSource="Mars.ogg" looping="true">
- <events>
- <activity>
- <DistanceTrigger position="400,0,0" distance=200 target="Camera">
- <attached>
- <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
- </attached>
- </DistanceTrigger>
- </activity>
- </events>
+ <events>
+ <activity>
+ <DistanceTrigger position="400,0,0" distance=200 target="Camera">
+ <attached>
+ <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
+ </attached>
+ </DistanceTrigger>
+ </activity>
+ </events>
</AmbientSound>
<AmbientSound ambientSource="Jupiter.ogg" looping="true">
- <events>
- <activity>
- <DistanceTrigger position="400,150,0" distance=200 target="Camera">
- <attached>
- <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
- </attached>
- </DistanceTrigger>
- </activity>
- </events>
+ <events>
+ <activity>
+ <DistanceTrigger position="400,150,0" distance=200 target="Camera">
+ <attached>
+ <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
+ </attached>
+ </DistanceTrigger>
+ </activity>
+ </events>
</AmbientSound>
Modified: code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt
===================================================================
--- code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt 2009-12-21 12:45:56 UTC (rev 6389)
@@ -73,7 +73,7 @@
</EffectContainer>
<EffectContainer condition="not idle">
<Backlight mainstate=activity active=false scale=0.4 position="7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- <Backlight mainstate=activity active=false scale=0.4 position="-7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <Backlight mainstate=activity active=false scale=0.4 position="-7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
</EffectContainer>
<EffectContainer condition="brake">
<FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.2, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
Modified: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc 2009-12-21 12:28:10 UTC (rev 6388)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc 2009-12-21 12:45:56 UTC (rev 6389)
@@ -65,7 +65,7 @@
Model* model = new Model(this);
model->setMeshSource("rocket.mesh");
- model->scale(0.7);
+ model->scale(0.7);
this->attach(model);
ParticleEmitter* fire = new ParticleEmitter(this);
this->attach(fire);
More information about the Orxonox-commit
mailing list