Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 24, 2008, 1:39:05 PM (17 years ago)
Author:
rgrieder
Message:
  • merged Felix's changes from trunk to network branch
  • added "svn:eol-style native" property to keybindings.ini
Location:
code/branches/network/bin
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/network/bin/keybindings.ini

    • Property svn:eol-style set to native
    r1397 r1406  
    11[KeyBinder]
    2 KeyUNASSIGNED=
     2KeyUNASSIGNED=activateConsole
    33KeyESCAPE=exit
    44Key1=
    … …  
    1515KeyEQUALS=activateConsole
    1616KeyBACK=
    17 KeyTAB=
     17KeyTAB=cycleNavigationFocus
    1818KeyQ=moveRoll
    1919KeyW=moveLongitudinal
    … …  
    147147KeyMEDIASELECT=
    148148MouseLeft=fire
    149 MouseRight=fire
    150 MouseMiddle=fire
    151 MouseButton3=fire
    152 MouseButton4=fire
    153 MouseButton5=fire
    154 MouseButton6=fire
    155 MouseButton7=fire
    156 MouseWheel1Up=scale 0.1 slomo
    157 MouseWheel1Down=scale 0.1 slomo
     149MouseRight=
     150MouseMiddle=
     151MouseButton3=
     152MouseButton4=
     153MouseButton5=
     154MouseButton6=
     155MouseButton7=
     156MouseWheel1Up=
     157MouseWheel1Down=
    158158MouseWheel2Up=
    159159MouseWheel2Down=
    … …  
    214214JoyAxis24Pos=
    215215JoyAxis24Neg=
    216 JoyButton0=cycleFocus
     216JoyButton0=cycleNavigationFocus
    217217JoyButton1=
    218218JoyButton2=

  • code/branches/network/bin/levels/sample.oxw

    r1362 r1406  
    1010
    1111<!--Ambient colourvalue="1,1,1" /-->
    12 <Skybox src="Orxonox/StarSkyBox" />
     12<Skybox src="Orxonox/Starbox" />
    1313<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
    14 <Model position="1500,0,100" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
    15 <Model position="0,4200,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
    16 <Model position="0,0,6800" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
     14<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
     15<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
     16<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
    1717<NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
    1818<NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
Note: See TracChangeset for help on using the changeset viewer.