[Orxonox-commit 2192] r6908 - in code/branches/fps: data/levels data/levels/includes data/levels/templates src/orxonox/worldentities/pawns

[freicy at orxonox.net]

Author: freicy
Date: 2010-05-17 14:41:01 +0200 (Mon, 17 May 2010)
New Revision: 6908

Modified:
   code/branches/fps/data/levels/includes/weaponsettings_fps.oxi
   code/branches/fps/data/levels/presentation_FS10.oxw
   code/branches/fps/data/levels/templates/fps.oxt
   code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc
Log:
by Cyrill Frei

Modified: code/branches/fps/data/levels/includes/weaponsettings_fps.oxi
===================================================================
--- code/branches/fps/data/levels/includes/weaponsettings_fps.oxi	2010-05-17 12:36:42 UTC (rev 6907)
+++ code/branches/fps/data/levels/includes/weaponsettings_fps.oxi	2010-05-17 12:41:01 UTC (rev 6908)
@@ -30,7 +30,7 @@
             munitionType="LaserGunMunition"
             bulletLoadingTime="0.2"
             magazineLoadingTime="5.0"
-            speed="1250"
+            speed="250"
             unlimitedMunition=true
         />
   <!--       <LaserGun

Modified: code/branches/fps/data/levels/presentation_FS10.oxw
===================================================================
--- code/branches/fps/data/levels/presentation_FS10.oxw	2010-05-17 12:36:42 UTC (rev 6907)
+++ code/branches/fps/data/levels/presentation_FS10.oxw	2010-05-17 12:41:01 UTC (rev 6908)
@@ -20,6 +20,24 @@
   >
     <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
 
+  <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
+      <attached>
+        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
+      </collisionShapes>
+  </Pawn>
+  
+  <Pawn health=100 position="0,-35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
+      <attached>
+        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
+      </collisionShapes>
+  </Pawn>
+  
   <StaticEntity position="0,-50,0" direction="0,-1,0" collisionType=static mass=100000 >
       <attached>
         <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />

Modified: code/branches/fps/data/levels/templates/fps.oxt
===================================================================
--- code/branches/fps/data/levels/templates/fps.oxt	2010-05-17 12:36:42 UTC (rev 6907)
+++ code/branches/fps/data/levels/templates/fps.oxt	2010-05-17 12:41:01 UTC (rev 6908)
@@ -50,7 +50,7 @@
 <Template name=fpscamera defaults=0>
   <FpsPlayer>
     <camerapositions>
-      <CameraPosition position="0,0,0" drag=false mouselook=true />
+      <CameraPosition position="0,0,20" drag=false mouselook=true />
       <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
       <CameraPosition position="0,0,-40" yaw=180 drag=true />
       <CameraPosition position="0,3,-14" yaw=0 />

Modified: code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc
===================================================================
--- code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc	2010-05-17 12:36:42 UTC (rev 6907)
+++ code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc	2010-05-17 12:41:01 UTC (rev 6908)
@@ -78,7 +78,7 @@
 
         this->setConfigValues();
         this->registerVariables();
-	
+
     }
 
     FpsPlayer::~FpsPlayer()