[Orxonox-commit 1835] r6552 - in code/branches/ppspickups1: data/levels data/levels/includes data/levels/templates src/modules/pickup/items
scheusso at orxonox.net
scheusso at orxonox.net
Thu Mar 18 13:01:56 CET 2010
Author: scheusso
Date: 2010-03-18 13:01:56 +0100 (Thu, 18 Mar 2010)
New Revision: 6552
Added:
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
Modified:
code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt
Log:
merged revisions 6525:6543 from ppspickups1 into ppspickups1
Added: code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi
===================================================================
--- code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (rev 0)
+++ code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi 2010-03-18 12:01:56 UTC (rev 6552)
@@ -0,0 +1,18 @@
+<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>
Added: code/branches/ppspickups1/data/levels/pickup_ppstest.oxw
===================================================================
--- code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (rev 0)
+++ code/branches/ppspickups1/data/levels/pickup_ppstest.oxw 2010-03-18 12:01:56 UTC (rev 6552)
@@ -0,0 +1,64 @@
+<?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>
Added: code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt
===================================================================
--- code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (rev 0)
+++ code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt 2010-03-18 12:01:56 UTC (rev 6552)
@@ -0,0 +1,50 @@
+<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>
Modified: code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt 2010-03-18 11:46:49 UTC (rev 6551)
+++ code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt 2010-03-18 12:01:56 UTC (rev 6552)
@@ -1,4 +1,8 @@
ADD_SOURCE_FILES(PICKUP_SRC_FILES
+
HealthPickup.cc
+
+ SpeedPickup.cc
MetaPickup.cc
+
)
Added: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (rev 0)
+++ code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc 2010-03-18 12:01:56 UTC (rev 6552)
@@ -0,0 +1,56 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Damian 'Mozork' Frick
+ * Co-authors:
+ * ...
+ *
+ * TODO: Implement...
+ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Damian 'Mozork' Frick
+ * Co-authors:
+ * ...
+ *
+ * TODO: Implement...
+ */
Added: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (rev 0)
+++ code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h 2010-03-18 12:01:56 UTC (rev 6552)
@@ -0,0 +1,56 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Damian 'Mozork' Frick
+ * Co-authors:
+ * ...
+ *
+ * TODO: Implement...
+ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Damian 'Mozork' Frick
+ * Co-authors:
+ * ...
+ *
+ * TODO: Implement...
+ */
More information about the Orxonox-commit
mailing list