Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6908 for code/branches


Ignore:
Timestamp:
May 17, 2010, 2:41:01 PM (15 years ago)
Author:
freicy
Message:

by Cyrill Frei

Location:
code/branches/fps
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/fps/data/levels/includes/weaponsettings_fps.oxi

    r6867 r6908  
    3131            bulletLoadingTime="0.2"
    3232            magazineLoadingTime="5.0"
    33             speed="1250"
     33            speed="250"
    3434            unlimitedMunition=true
    3535        />

  • code/branches/fps/data/levels/presentation_FS10.oxw

    r6883 r6908  
    2121    <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" />
    2222
     23  <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
     24      <attached>
     25        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
     26      </attached>
     27      <collisionShapes>
     28        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
     29      </collisionShapes>
     30  </Pawn>
     31 
     32  <Pawn health=100 position="0,-35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
     33      <attached>
     34        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
     35      </attached>
     36      <collisionShapes>
     37        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
     38      </collisionShapes>
     39  </Pawn>
     40 
    2341  <StaticEntity position="0,-50,0" direction="0,-1,0" collisionType=static mass=100000 >
    2442      <attached>

  • code/branches/fps/data/levels/templates/fps.oxt

    r6883 r6908  
    5151  <FpsPlayer>
    5252    <camerapositions>
    53       <CameraPosition position="0,0,0" drag=false mouselook=true />
     53      <CameraPosition position="0,0,20" drag=false mouselook=true />
    5454      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
    5555      <CameraPosition position="0,0,-40" yaw=180 drag=true />

  • code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc

    r6882 r6908  
    7979        this->setConfigValues();
    8080        this->registerVariables();
    81        
     81
    8282    }
    8383
Note: See TracChangeset for help on using the changeset viewer.