From: DaveG <da...@us...> - 2006-06-10 12:25:11
|
Update of /cvsroot/planeshift/planeshift/data/options In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2872/data/options Modified Files: mouse_def.xml Added Files: controls_def.xml Removed Files: keys_def.xml Log Message: Massive commit with overhauls of multiple interconnected systems: - Wrote new control mapping system from scratch. It's now more efficient and generalized. - Now takes in CS input events and actually uses them, instead of polling the keyboard. - Controls file format has changed. Now stored in data/gui/controls.xml People should delete their old keys.xml/keys_def.xml and delete their mouse.xml to reset to the new defaults file mouse_def.xml (with a few things changed) - Updated config GUI to handle all this. - Fixes bugs #779, #1373, #1375, #1413, and #1674 - Re-did entire movement system. It actually works now and the code isn't gibberish. - Got rid of convoluted, wasteful, send back/forth modifiers/variants/godknowswhat stuff. There was no need to send messages to the server for every movement button press. - Character modes are now stored in the DB along with their speed modifiers. - Moved out-of-stamina checking to the server side, and re-did the system for it. - Fixed stupid bug where 'movement' in the script was just sent the movement ID. - New movement stamina script now has the following available variables: 'speed', 'ascent_speed', 'ascent_angle', 'weight', 'max_weight' and computes 'change' - You now have limited movement while airborne (in addition to inertia) to give the limited effect of "shifting weight" and turning mid-flight. This greatly improves control and makes things more natural. It also fixes the hideous collision detection bug where you could get stuck on surfaces when they were off the ground and locked out. - Cleaned up some animation handling; moved cal3d functions in psEngine to GEMClientActor. - Character modes are now stored in DR and psPersistActor, which inherits from it. This fixes bug when walking into a new area and not seeing a pre-existing mode. - Fixes bugs #951 and #1219 - Implemented sneak mode to creep around slowly all spiffy-like. Set to Rshift by default. - Got strafe animations to show correctly. ~> Still a few issues here: SpeedOp isn't fixed yet, and some things may need more work. => Requires my commit to PS SVN to see anims; players will have to wait for next release. => Requires new StaminaMove script. Added test one to CVS; detailed one on its way for Laanx. => REQUIRED CS REVISION BUMP TO 24454 (needs my fix in CS for key mods) => DB VERSION BUMP => NET VERSION BUMP --- NEW FILE: controls_def.xml --- <controls> <bind action="Forward" key="w" /> <bind action="Backward" key="s" /> <bind action="Rotate left" key="a" /> <bind action="Rotate right" key="d" /> <bind action="Strafe left" key="q" /> <bind action="Strafe right" key="e" /> <bind action="Forward (sec)" key="Up" /> <bind action="Backward (sec)" key="Down" /> <bind action="Rotate left (sec)" key="Left" /> <bind action="Rotate right (sec)" key="Right" /> <bind action="Strafe left (sec)" key="" /> <bind action="Strafe right (sec)" key="" /> <bind action="Run" key="LShift" /> <bind action="Autorun" key="r" /> <bind action="MouseRun" key="" /> <bind action="Sneak" key="RShift" /> <bind action="Jump" key="Space" /> <bind action="Sit" key="z" /> <bind action="Look up" key="PgDn" /> <bind action="Look down" key="PgUp" /> <bind action="Zoom in" key="ScrollUp" /> <bind action="Zoom out" key="ScrollDown" /> <bind action="Camera mode" key="m" /> <bind action="Center camera" key="x" /> <bind action="CameraForward/Back" key="" /> <bind action="MouseLook" key="MiddleClick" /> <bind action="Toggle MouseLook" key="Tab" /> <bind action="Buddy" key="b" /> <bind action="Buy" key="" /> <bind action="Communications" key="" /> <bind action="Help" key="F1" /> <bind action="Inventory" key="i" /> <bind action="Options" key="o" /> <bind action="Quit" key="Alt+q" /> <bind action="Spell book" key="c" /> <bind action="Stats" key="p" /> <bind action="Toggle chat" key="Enter" /> <bind action="Reply tell" key="'" /> <bind action="Close" key="Esc" /> <bind action="Shortcut 1" key="1" /> <bind action="Shortcut 2" key="2" /> <bind action="Shortcut 3" key="3" /> <bind action="Shortcut 4" key="4" /> <bind action="Shortcut 5" key="5" /> <bind action="Shortcut 6" key="6" /> <bind action="Shortcut 7" key="7" /> <bind action="Shortcut 8" key="8" /> <bind action="Shortcut 9" key="9" /> <bind action="Shortcut 10" key="0" /> <bind action="Shortcut 11" key="" /> <bind action="Shortcut 12" key="" /> <bind action="Shortcut 13" key="" /> <bind action="Shortcut 14" key="" /> <bind action="Shortcut 15" key="" /> <bind action="Shortcut 16" key="" /> <bind action="Shortcut 17" key="" /> <bind action="Shortcut 18" key="" /> <bind action="Shortcut 19" key="" /> <bind action="Shortcut 20" key="" /> <bind action="Shortcut 21" key="" /> <bind action="Shortcut 22" key="" /> <bind action="Shortcut 23" key="" /> <bind action="Shortcut 24" key="" /> <bind action="Shortcut 25" key="" /> <bind action="Shortcut 26" key="" /> <bind action="Shortcut 27" key="" /> <bind action="Shortcut 28" key="" /> <bind action="Shortcut 29" key="" /> <bind action="Shortcut 30" key="" /> <bind action="Shortcut 31" key="" /> <bind action="Shortcut 32" key="" /> <bind action="Shortcut 33" key="" /> <bind action="Shortcut 34" key="" /> <bind action="Shortcut 35" key="" /> <bind action="Shortcut 36" key="" /> <bind action="Shortcut 37" key="" /> <bind action="Shortcut 38" key="" /> <bind action="Shortcut 39" key="" /> <bind action="Shortcut 40" key="" /> </controls> Index: mouse_def.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/options/mouse_def.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mouse_def.xml 17 Dec 2005 08:10:37 -0000 1.9 --- mouse_def.xml 10 Jun 2006 12:25:08 -0000 1.10 *************** *** 2,8 **** <Actions action="ContextMenu" button="1" modifier="0"/> <Actions action="EntitySelect" button="0" modifier="0"/> - <Actions action="MouseLook" button="2" modifier="0"/> - <Actions action="MouseRun" button="1" modifier="2"/> - <Actions action="CameraForward/Back" button="0" modifier="1"/> <OnOff option="InvertMouse" value="0"/> <Int option="VertSensitivity" value="70"/> --- 2,5 ---- --- keys_def.xml DELETED --- |