Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 9, 2015, 2:09:38 PM (8 years ago)
Author:
bucyril
Message:

Finished hover ship control and resolved merge conflict
—this line, and those below, will be ignored—

M src/modules/hover/HoverShip.cc
M src/modules/hover/HoverShip.h
M data/levels/templates/spaceshipHover.oxt

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt

    r10760 r10784  
    11<Template name=spaceshiphover>
    2   <HoverShip
     2  <SpaceShip
     3   hudtemplate            = spaceshiphud
    34   camerapositiontemplate = spaceshiphovercameras
    45   spawnparticlesource    = "Orxonox/fairytwirl"
    … …  
    2122   rotationThrust    = 25
    2223
     24   jumpBoost = 30
     25
    2326   lift = 1;
    2427   stallSpeed = 220;
    … …  
    3134   collisionType     = "dynamic"
    3235   mass              = 100
    33    linearDamping     = 0.7
     36   linearDamping     = 0.2
    3437   angularDamping    = 0.9999999
    3538  >
    … …  
    5659  include("../includes/weaponSettingsPirate.oxi")
    5760?>
    58   </HoverShip>
     61  </SpaceShip>
    5962</Template>
    6063
    … …  
    7073</Template>
    7174
    72 <Template name=spaceshiphoverengine baseclass=MultiStateEngine>
     75<Template name=spaceshiphoverengine baseclass=Engine>
    7376  <MultiStateEngine
    7477   boostfactor    = 2
Note: See TracChangeset for help on using the changeset viewer.