Changeset 2662 for code/trunk/bin

Timestamp:

Feb 14, 2009, 10:17:35 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• bin/Plugins.cfg (modified) (1 diff)
• bin/def_keybindings.ini (modified) (7 diffs)
• bin/telnet_server.tcl (modified) (1 diff)

code/trunk/bin/Plugins.cfg

@@ -10 +10 @@
 Plugin=Plugin_BSPSceneManager
 Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
+Plugin=Plugin_CgProgramManager
 

code/trunk/bin/def_keybindings.ini

@@ -32 +32 @@
 KeyF14=
 KeyF15=
-KeyF2=
+KeyF2="OverlayGroup toggleVisibility Stats"
 KeyF3=
 KeyF4=
@@ -50 +50 @@
 KeyKana=
 KeyKanji=
-KeyL=
+KeyL=dropItems
 KeyLeft=
 KeyLeftAlt=
 KeyLeftBracket=
-KeyLeftControl=
+KeyLeftControl=mouseLook
 KeyLeftShift=
 KeyLeftWindows=
@@ -100 +100 @@
 KeyPageDown=
 KeyPageUp=
-KeyPause=
+KeyPause=pause
 KeyPeriod=
 KeyPlayPause=
@@ -119 +119 @@
 KeySlash=
 KeySleep=
-KeySpace=
+KeySpace=boost
 KeyStop=
 KeySystemRequest=
@@ -145 +145 @@
 KeyYen=
 KeyZ=
-Key_084=
-Key_085=
-Key_089=
-Key_090=
-Key_091=
-Key_092=
-Key_093=
-Key_094=
-Key_095=
-Key_096=
-Key_097=
-Key_098=
-Key_099=
-Key_103=
-Key_104=
-Key_105=
-Key_106=
-Key_107=
-Key_108=
-Key_109=
-Key_110=
-Key_111=
-Key_112=
-Key_114=
-Key_115=
-Key_117=
-Key_118=
-Key_119=
-Key_120=
-Key_121=
-Key_123=
-Key_125=
-Key_128=
-Key_129=
-Key_130=
-Key_131=
-Key_132=
-Key_133=
-Key_134=
-Key_135=
-Key_136=
-Key_137=
-Key_138=
-Key_139=
-Key_140=
-Key_141=
-Key_143=
-Key_144=
-Key_154=
-Key_155=
-Key_158=
-Key_159=
-Key_163=
-Key_165=
-Key_166=
-Key_167=
-Key_168=
-Key_169=
-Key_170=
-Key_171=
-Key_172=
-Key_173=
-Key_175=
-Key_177=
-Key_180=
-Key_182=
-Key_185=
-Key_186=
-Key_187=
-Key_188=
-Key_189=
-Key_190=
-Key_191=
-Key_192=
-Key_193=
-Key_194=
-Key_195=
-Key_196=
-Key_198=
-Key_202=
-Key_204=
-Key_206=
-Key_212=
-Key_213=
-Key_214=
-Key_215=
-Key_216=
-Key_217=
-Key_218=
-Key_224=
-Key_225=
-Key_226=
-Key_228=
 
 [MouseButtons]
@@ -247 +154 @@
 MouseLeft="fire"
 MouseMiddle=
-MouseRight=
+MouseRight="altfire"
 MouseWheel1Down=
 MouseWheel1Up=
@@ -256 +163 @@
 MouseXNeg="scale -1 rotateYaw"
 MouseXPos="scale 1 rotateYaw"
-MouseYNeg="scale 1 rotatePitch"
-MouseYPos="scale -1 rotatePitch"
+MouseYNeg="scale -1 rotatePitch"
+MouseYPos="scale 1 rotatePitch"
 

code/trunk/bin/telnet_server.tcl

@@ -81 +81 @@
          return
      }
-     if {[string equal $line "quit"] || [string equal $line "exit"]} {
+     if {[string equal $line "logout"] || [string equal $line "quit"]} {
          disconnect $client
+         return
+     }
+     if {[string equal $line "exit"]} {
+         set ::termination 1
          return
      }