[Orxonox-commit 2853] r7556 - in code/branches/lastmanstanding: data/levels src/orxonox/gametypes
landauf at orxonox.net
landauf at orxonox.net
Tue Oct 19 18:34:13 CEST 2010
Author: landauf
Date: 2010-10-19 18:34:13 +0200 (Tue, 19 Oct 2010)
New Revision: 7556
Modified:
code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw
code/branches/lastmanstanding/data/levels/notifications.oxw
code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc
code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h
Log:
eol-style native
Modified: code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw
===================================================================
--- code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw 2010-10-19 16:32:25 UTC (rev 7555)
+++ code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw 2010-10-19 16:34:13 UTC (rev 7556)
@@ -1,117 +1,117 @@
-<?lua
- include("stats.oxo")
- include("hudtemplates3.oxo")
- include("templates/lodinformation.oxt")
-?>
-
-<?lua
- include("templates/spaceship_assff.oxt")
- include("templates/spaceship_pirate.oxt")
-?>
-
-<Level
- name = "Last Man Standing"
- description = "testmap for gametype last man standing"
- gametype = "LastManStanding"
->
- <templates>
- <Template link=lodtemplate_default />
- </templates>
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
-<!----- Spawnpoints ----->
- <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 team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- <SpawnPoint team=0 position="-200,200,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- <SpawnPoint team=0 position="-200,0,200" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- <SpawnPoint team=0 position="200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- <SpawnPoint team=0 position="200,200,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- <SpawnPoint team=0 position="200,0,200" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-<!-- ----------------random fog ------>
-<?lua
-for i = 1, 100, 1
-do
-j = math.random()
-?>
-
- <StaticEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>">
- <attached>
- <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
- </attached>
- </StaticEntity>
-
-<?lua
-end
-?>
-<!-- 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="-80,-30,20" scale=10 mesh="pirate.mesh" roll="180" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="70,0,-25" halfExtents="150, 50, 25" />
- <BoxCollisionShape position="95,75,-16" halfExtents="70, 10, 12" />
- <BoxCollisionShape position="95,-75,-16" halfExtents="70, 10, 12" />
- <BoxCollisionShape position="77,47,30" halfExtents="110, 2, 30" />
- <BoxCollisionShape position="77,-47,30" halfExtents="110, 2, 30" />
- <BoxCollisionShape position="77,0,50" halfExtents="110, 45, 6" />
- <BoxCollisionShape position="167,0,70" halfExtents="17, 20, 20" />
- </collisionShapes>
- </MovableEntity>
-
-<!-- ---------------- Space Station --------------- -->
-<?lua
- dofile("includes/CuboidSpaceStation.lua")
- ?>
- <StaticEntity scale=1 position="-5000,100,1000" roll=30>
- <attached>
- <?lua
- createSpaceStationPar(65461,2,1,2,1,2,1,100)
- ?>
- <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
- </attached>
- </StaticEntity>
-<!--
- <Destroyer position="3500, -2000, -1000" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=500>
- <attached>
- <CheckPoint />
- <Model position="0,0,0" scale="5" mesh="Carrier.mesh"/>
- <Backlight
- mainstate=activity
- active=false
- scale=0.4
- name=bltest
- position=" 7.6, 0, 6"
- colour="0.2, 0.65, 1.0, 1.0"
- width=15
- length=1500
- lifetime=2
- elements=50
- trailmaterial="Trail/backlighttrail"
- turnontime=1
- turnofftime=1
- material="Flares/ThrusterFlare1"
- />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="70,0,-25" halfExtents="150, 50, 25" />
- <BoxCollisionShape position="95,75,-16" halfExtents="70, 10, 12" />
- <BoxCollisionShape position="95,-75,-16" halfExtents="70, 10, 12" />
- <BoxCollisionShape position="77,47,30" halfExtents="110, 2, 30" />
- <BoxCollisionShape position="77,-47,30" halfExtents="110, 2, 30" />
- <BoxCollisionShape position="77,0,50" halfExtents="110, 45, 6" />
- <BoxCollisionShape position="167,0,70" halfExtents="17, 20, 20" />
- </collisionShapes>
- </Destroyer>
--->
-
-
- </Scene>
-</Level>
-
+<?lua
+ include("stats.oxo")
+ include("hudtemplates3.oxo")
+ include("templates/lodinformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceship_assff.oxt")
+ include("templates/spaceship_pirate.oxt")
+?>
+
+<Level
+ name = "Last Man Standing"
+ description = "testmap for gametype last man standing"
+ gametype = "LastManStanding"
+>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+<!----- Spawnpoints ----->
+ <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 team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <SpawnPoint team=0 position="-200,200,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <SpawnPoint team=0 position="-200,0,200" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <SpawnPoint team=0 position="200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <SpawnPoint team=0 position="200,200,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <SpawnPoint team=0 position="200,0,200" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+<!-- ----------------random fog ------>
+<?lua
+for i = 1, 100, 1
+do
+j = math.random()
+?>
+
+ <StaticEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>">
+ <attached>
+ <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
+ </attached>
+ </StaticEntity>
+
+<?lua
+end
+?>
+<!-- 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="-80,-30,20" scale=10 mesh="pirate.mesh" roll="180" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="70,0,-25" halfExtents="150, 50, 25" />
+ <BoxCollisionShape position="95,75,-16" halfExtents="70, 10, 12" />
+ <BoxCollisionShape position="95,-75,-16" halfExtents="70, 10, 12" />
+ <BoxCollisionShape position="77,47,30" halfExtents="110, 2, 30" />
+ <BoxCollisionShape position="77,-47,30" halfExtents="110, 2, 30" />
+ <BoxCollisionShape position="77,0,50" halfExtents="110, 45, 6" />
+ <BoxCollisionShape position="167,0,70" halfExtents="17, 20, 20" />
+ </collisionShapes>
+ </MovableEntity>
+
+<!-- ---------------- Space Station --------------- -->
+<?lua
+ dofile("includes/CuboidSpaceStation.lua")
+ ?>
+ <StaticEntity scale=1 position="-5000,100,1000" roll=30>
+ <attached>
+ <?lua
+ createSpaceStationPar(65461,2,1,2,1,2,1,100)
+ ?>
+ <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
+ </attached>
+ </StaticEntity>
+<!--
+ <Destroyer position="3500, -2000, -1000" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=500>
+ <attached>
+ <CheckPoint />
+ <Model position="0,0,0" scale="5" mesh="Carrier.mesh"/>
+ <Backlight
+ mainstate=activity
+ active=false
+ scale=0.4
+ name=bltest
+ position=" 7.6, 0, 6"
+ colour="0.2, 0.65, 1.0, 1.0"
+ width=15
+ length=1500
+ lifetime=2
+ elements=50
+ trailmaterial="Trail/backlighttrail"
+ turnontime=1
+ turnofftime=1
+ material="Flares/ThrusterFlare1"
+ />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="70,0,-25" halfExtents="150, 50, 25" />
+ <BoxCollisionShape position="95,75,-16" halfExtents="70, 10, 12" />
+ <BoxCollisionShape position="95,-75,-16" halfExtents="70, 10, 12" />
+ <BoxCollisionShape position="77,47,30" halfExtents="110, 2, 30" />
+ <BoxCollisionShape position="77,-47,30" halfExtents="110, 2, 30" />
+ <BoxCollisionShape position="77,0,50" halfExtents="110, 45, 6" />
+ <BoxCollisionShape position="167,0,70" halfExtents="17, 20, 20" />
+ </collisionShapes>
+ </Destroyer>
+-->
+
+
+ </Scene>
+</Level>
+
Property changes on: code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/lastmanstanding/data/levels/notifications.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list