Changeset 1362 for code/trunk/bin

Timestamp:

May 22, 2008, 2:56:48 PM (16 years ago)

Author:

scheusso

Message:

merged hud3 branch into trunk and changed camera orientation

Location:

code/trunk/bin

Files:

• keybindings.ini (modified) (2 diffs)
• levels/sample.oxw (modified) (1 diff)

code/trunk/bin/keybindings.ini

@@ -154 +154 @@
 MouseButton6=
 MouseButton7=
-MouseWheel1Up=#AxisAmp 0.1 slomo
-MouseWheel1Down=#AxisAmp 0.1 slomo
+MouseWheel1Up=AxisAmp 0.1 slomo
+MouseWheel1Down=AxisAmp 0.1 slomo
 MouseWheel2Up=
 MouseWheel2Down=
@@ -175 +175 @@
 JoyAxis4Neg=
 JoyAxis5Pos=
-JoyAxis5Neg=#AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit
-JoyAxis6Pos=#AxisAmp  10 slomo
+JoyAxis5Neg= #AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit
+JoyAxis6Pos= #AxisAmp  10 slomo
 JoyAxis6Neg=
 JoyAxis7Pos=

code/trunk/bin/levels/sample.oxw

@@ -11 +11 @@
 <!--Ambient colourvalue="1,1,1" /-->
 <Skybox src="Orxonox/StarSkyBox" />
-<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
-
+<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" />
+<Model position="1500,0,100" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,4200,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,0,6800" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>