[Orxonox-commit 1826] r6543 - in code/branches/ppspickups1: data/levels data/levels/includes data/levels/templates src/modules/pickup/items

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-03-17 12:36:46 +0100 (Wed, 17 Mar 2010)
New Revision: 6543

Modified:
   code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi
   code/branches/ppspickups1/data/levels/pickup_ppstest.oxw
   code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt
   code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc
   code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h
Log:
svn:eol-style "native"  for all text based files.

Modified: code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi
===================================================================
--- code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi	2010-03-17 11:14:42 UTC (rev 6542)
+++ code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi	2010-03-17 11:36:46 UTC (rev 6543)
@@ -1,9 +1,9 @@
-<PickupRepresentation
-    name="SpeedBoost"
-    description="Speeds up the Ship for a certain time."
-    spawnerTemplate="speedboostpickuprepresentation"
->
-    <pickup>
-        <SpeedPickup template="speedboostpickup" />
-    </pickup>
-</PickupRepresentation>
+<PickupRepresentation
+    name="SpeedBoost"
+    description="Speeds up the Ship for a certain time."
+    spawnerTemplate="speedboostpickuprepresentation"
+>
+    <pickup>
+        <SpeedPickup template="speedboostpickup" />
+    </pickup>
+</PickupRepresentation>


Property changes on: code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/ppspickups1/data/levels/pickup_ppstest.oxw
===================================================================
--- code/branches/ppspickups1/data/levels/pickup_ppstest.oxw	2010-03-17 11:14:42 UTC (rev 6542)
+++ code/branches/ppspickups1/data/levels/pickup_ppstest.oxw	2010-03-17 11:36:46 UTC (rev 6543)
@@ -1,32 +1,32 @@
-<?lua
-  include("stats.oxo")
-  include("hudtemplates3.oxo")
-
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  -- include("templates/pickup_representation_templates_speed.oxt")
-?>
-
-<Level
- name         = "SpeedPickupTest"
- description  = "Test for the new Speed Pickup"
->
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-<?lua
-  include("includes/pickups_speed.oxi")
-?>
-<!--
-    <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
-        <pickup>
-            <SpeedPickup template="speedboostpickup" />
-        </pickup>
-    </PickupSpawner>
--->
-    <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="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-  </Scene>
-</Level>
+<?lua
+  include("stats.oxo")
+  include("hudtemplates3.oxo")
+
+  include("templates/spaceship_assff.oxt")
+  include("templates/spaceship_pirate.oxt")
+  -- include("templates/pickup_representation_templates_speed.oxt")
+?>
+
+<Level
+ name         = "SpeedPickupTest"
+ description  = "Test for the new Speed Pickup"
+>
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/Starbox"
+  >
+
+<?lua
+  include("includes/pickups_speed.oxi")
+?>
+<!--
+    <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+        <pickup>
+            <SpeedPickup template="speedboostpickup" />
+        </pickup>
+    </PickupSpawner>
+-->
+    <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="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+  </Scene>
+</Level>


Property changes on: code/branches/ppspickups1/data/levels/pickup_ppstest.oxw
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt
===================================================================
--- code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt	2010-03-17 11:14:42 UTC (rev 6542)
+++ code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt	2010-03-17 11:36:46 UTC (rev 6543)
@@ -1,25 +1,25 @@
-<Template name=speedboostpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="1,0,0" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0,1,0" material="Cross" scale=1 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name="speedboostpickup">
-  <SpeedPickup
-    speedAddition = "0"
-    speedMultiplier = "2"
-    duration = "10"
-    activationType = "immediate"
-    durationType = "once"
-  />
-</Template>
+<Template name=speedboostpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="1,0,0" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0,1,0" material="Cross" scale=1 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name="speedboostpickup">
+  <SpeedPickup
+    speedAddition = "0"
+    speedMultiplier = "2"
+    duration = "10"
+    activationType = "immediate"
+    durationType = "once"
+  />
+</Template>


Property changes on: code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc	2010-03-17 11:14:42 UTC (rev 6542)
+++ code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc	2010-03-17 11:36:46 UTC (rev 6543)
@@ -23,6 +23,6 @@
  *      Damian 'Mozork' Frick
  *   Co-authors:
  *      ...
- *
+ *
  *   TODO: Implement...
  */


Property changes on: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h	2010-03-17 11:14:42 UTC (rev 6542)
+++ code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h	2010-03-17 11:36:46 UTC (rev 6543)
@@ -23,6 +23,6 @@
  *      Damian 'Mozork' Frick
  *   Co-authors:
  *      ...
- *
+ *
  *   TODO: Implement...
- */
+ */


Property changes on: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h
___________________________________________________________________
Added: svn:eol-style
   + native