Changeset 1502 for code/trunk/bin

Timestamp:

Jun 1, 2008, 3:54:20 PM (16 years ago)

Author:

rgrieder

Message:

• @everyone: Do not create a branch until I've added the svn:eol-style property correctly. Otherwise this would cost me another 4 hours or so when we want to merge back.
• merged network branch back to trunk
• I had to omit the changes from last evening concerning the line endings
• might not work yet because of the line endings
• @beni: script branch is the only branch still open. you probably will have to apply a patch because of inconsistent new lines

Location:

code/trunk/bin

Files:

• def_keybindings.ini (copied) (copied from code/branches/network/bin/def_keybindings.ini)
• disco.txt (modified) (1 diff)
• irc.tcl (copied) (copied from code/branches/network/bin/irc.tcl)
• keybindings.ini (deleted)
• levels/sample.oxw (modified) (1 diff)
• remote.tcl (copied) (copied from code/branches/network/bin/remote.tcl)
• run-script (modified) (1 diff)
• telnet_server.tcl (copied) (copied from code/branches/network/bin/telnet_server.tcl)

code/trunk/bin/disco.txt

@@ -2 +2 @@
 delay 0.2 Ambient setAmbientLightTest 0,1,0,1
 delay 0.4 Ambient setAmbientLightTest 0,0,1,1
-delay 0.6 exec disco.txt
+delay 0.6 source disco.txt

code/trunk/bin/levels/sample.oxw

@@ -9 +9 @@
   </audio--> 
 
-<!--Ambient colourvalue="1,1,1" /-->
-<Skybox src="Orxonox/StarSkyBox" />
+<Ambient colourvalue="0.1, 0.1, 0.1" />
+<Skybox src="Orxonox/Starbox" />
 <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"/>
+<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
+<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>

code/trunk/bin/run-script

@@ -8 +8 @@
 fi
 
-if [[ ! -f orge.cfg ]] ; then
+if [[ -ne orge.cfg ]] ; then
         cp ogre.cfg-init ogre.cfg
 fi