Changeset 1293 for code/trunk/bin

Timestamp:

May 15, 2008, 5:44:55 PM (16 years ago)

Author:

scheusso

Message:

merged changes from input & camera & network branch into trunk

Location:

code/trunk/bin

Files:

• keybindings.ini (modified) (2 diffs)
• levels/sample.oxw (modified) (2 diffs)
• ogre.cfg-init (modified) (1 diff)
• run-script (modified) (1 diff)

code/trunk/bin/keybindings.ini

@@ -24 +24 @@
 R_6=
 H_6=
-P_7=
+P_7="exec disco.txt"
 R_7=
 H_7=
@@ -30 +30 @@
 R_8=
 H_8=
-P_9=
+P_9="disco.txt"
 R_9=
 H_9=

code/trunk/bin/levels/sample.oxw

@@ -9 +9 @@
   </audio--> 
 
-<Ambient colourvalue="1,1,1" />
+<!--Ambient colourvalue="1,1,1" /-->
 <Skybox src="Orxonox/StarSkyBox" />
-
-<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assf3.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="-90,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
 
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
@@ -31 +30 @@
 </Model-->
 
-<Model position="-200,1000,500" scale="10" mesh="hoover_body.mesh" yawpitchroll="-90,-90,0" />
+<!--Model position="-200,1000,500" scale="10" mesh="hoover_body.mesh" yawpitchroll="-90,-90,0" />
 <Model position="-200,1000,500" scale="10" mesh="hoover_gear0.mesh" yawpitchroll="-90,-90,0" />
 <Model position="-200,1000,500" scale="10" mesh="hoover_gear1.mesh" yawpitchroll="-90,-90,0" />
 <Model position="-200,1000,500" scale="10" mesh="hoover_gear2.mesh" yawpitchroll="-90,-90,0" />
-<Model position="-200,1000,500" scale="10" mesh="hoover_turbine.mesh" yawpitchroll="-90,-90,0" />
+<Model position="-200,1000,500" scale="10" mesh="hoover_turbine.mesh" yawpitchroll="-90,-90,0" /-->
 
 

code/trunk/bin/ogre.cfg-init

@@ -4 +4 @@
 FSAA=0
 Full Screen=No
-RTT Preferred Mode=PBuffer
+RTT Preferred Mode=FBO
 Video Mode=1024 x 768

code/trunk/bin/run-script

@@ -22 +22 @@
         fi
 fi
+trap "xset r" EXIT HUP INT TERM ABRT KILL
 exec ./orxonox $@