Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1407 for code/trunk/bin


Ignore:
Timestamp:
May 24, 2008, 1:49:54 PM (16 years ago)
Author:
rgrieder
Message:
  • reverted the HUD changes to ease up back merge from network branch

@everyone: please commit to the network branch from now on if it concerns the presentation.
Oli has also created a folder for the presentation files.
@fabian: you are excluded

Location:
code/trunk/bin
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/bin/keybindings.ini

    r1393 r1407  
    11[KeyBinder]
    2 KeyUNASSIGNED=activateConsole
    3 KeyESCAPE=exit
     2KeyUNASSIGNED=
     3KeyESCAPE= exit
    44Key1=
    55Key2=
    … …  
    1515KeyEQUALS=activateConsole
    1616KeyBACK=
    17 KeyTAB=cycleNavigationFocus
     17KeyTAB=
    1818KeyQ=
    1919KeyW=
    … …  
    154154MouseButton6=
    155155MouseButton7=
    156 MouseWheel1Up=
    157 MouseWheel1Down=
     156MouseWheel1Up=AxisAmp 0.1 slomo
     157MouseWheel1Down=AxisAmp 0.1 slomo
    158158MouseWheel2Up=
    159159MouseWheel2Down=

  • code/trunk/bin/levels/sample.oxw

    r1400 r1407  
    1010
    1111<!--Ambient colourvalue="1,1,1" /-->
    12 <Skybox src="Orxonox/Starbox" />
     12<Skybox src="Orxonox/StarSkyBox" />
    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="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"/>
     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"/>
    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.