Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6692 in orxonox.OLD


Ignore:
Timestamp:
Jan 25, 2006, 2:16:31 PM (18 years ago)
Author:
patrick
Message:

emerged spaceshipcontrol back to trunk via command >svn merge branches/spaceshipcontrol/ trunk/ -r 6639:HEAD

Location:
trunk/src/world_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/projectiles/laser.cc

    r6655 r6692  
    2828#include "particle_emitter.h"
    2929#include "sprite_particles.h"
     30#include <cassert>
    3031
    3132

  • trunk/src/world_entities/space_ships/space_ship.cc

    r6679 r6692  
    132132  yInvert = 1;
    133133  mouseSensitivity = 0.001;
    134   airViscosity = 0.01;
     134  airViscosity = 0.05;
    135135  controlVelocityX = 25;
    136136  controlVelocityY = 150;
    … …  
    321321
    322322  //other physics (gravity)
    323   if(travelSpeed < 120)
    324   move += Vector(0,-1,0)*60*time + Vector(0,1,0)*travelSpeed/2*time;
     323  //if(travelSpeed < 120)
     324  //move += Vector(0,-1,0)*60*time + Vector(0,1,0)*travelSpeed/2*time;
    325325
    326326  //hoover effect
Note: See TracChangeset for help on using the changeset viewer.