Browse Source

Travis CI: API documentation update at 2016-03-29 17:43:44 UTC.
[ci package]

Commit: https://github.com/urho3d/Urho3D/commit/5246f749849cd3dbce2871a27f0fd8b9483f7d78

Message: Merge remote-tracking branch 'hdunderscore/input_mousemode_update'

urho3d-travis-ci 9 years ago
parent
commit
5e65eee41e
4 changed files with 17 additions and 3 deletions
  1. 6 0
      Docs/AngelScriptAPI.h
  2. 4 2
      Docs/LuaScriptAPI.dox
  3. 6 0
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Urho3D/.soversion

+ 6 - 0
Docs/AngelScriptAPI.h

@@ -5362,12 +5362,16 @@ bool RecordGesture();
 void RemoveAllGestures();
 bool RemoveGesture(uint);
 bool RemoveScreenJoystick(int);
+void ResetMouseGrabbed();
+void ResetMouseMode();
 void ResetMouseVisible();
 bool SaveGesture(File, uint);
 bool SaveGesture(VectorBuffer&, uint);
 bool SaveGestures(File);
 bool SaveGestures(VectorBuffer&);
 void SendEvent(const String&, VariantMap& = VariantMap ( ));
+void SetMouseGrabbed(bool, bool = false);
+void SetMouseMode(MouseMode, bool = false);
 void SetMouseVisible(bool, bool = false);
 
 // Properties:
@@ -5390,6 +5394,8 @@ Array<bool> mouseButtonDown;
 /* readonly */
 Array<bool> mouseButtonPress;
 bool mouseGrabbed;
+/* readonly */
+bool mouseLocked;
 MouseMode mouseMode;
 /* readonly */
 IntVector2 mouseMove;

+ 4 - 2
Docs/LuaScriptAPI.dox

@@ -2694,8 +2694,9 @@ Methods:
 
 - void SetToggleFullscreen(bool enable)
 - void SetMouseVisible(bool enable, bool suppressEvent = false)
-- void SetMouseGrabbed(bool grab)
-- void SetMouseMode(MouseMode mode)
+- void SetMouseGrabbed(bool grab, bool suppressEvent = false)
+- void SetMouseMode(MouseMode mode, bool suppressEvent = false)
+- bool IsMouseLocked()
 - int AddScreenJoystick(XMLFile* layoutFile = 0, XMLFile* styleFile = 0)
 - bool RemoveScreenJoystick(int id)
 - void SetScreenJoystickVisible(int id, bool enable)
@@ -2763,6 +2764,7 @@ Properties:
 - bool touchEmulation
 - bool mouseVisible
 - bool mouseGrabbed
+- bool mouseLocked (readonly)
 - bool focus (readonly)
 - bool minimized (readonly)
 

+ 6 - 0
Docs/ScriptAPI.dox

@@ -251,6 +251,7 @@ namespace Urho3D
 
 ### MouseModeChanged
 - %Mode : MouseMode
+- %MouseLocked : bool
 
 ### ExitRequested
 
@@ -7168,12 +7169,16 @@ Methods:
 - void RemoveAllGestures()
 - bool RemoveGesture(uint)
 - bool RemoveScreenJoystick(int)
+- void ResetMouseGrabbed()
+- void ResetMouseMode()
 - void ResetMouseVisible()
 - bool SaveGesture(File@, uint)
 - bool SaveGesture(VectorBuffer&, uint)
 - bool SaveGestures(File@)
 - bool SaveGestures(VectorBuffer&)
 - void SendEvent(const String&, VariantMap& = VariantMap ( ))
+- void SetMouseGrabbed(bool, bool = false)
+- void SetMouseMode(MouseMode, bool = false)
 - void SetMouseVisible(bool, bool = false)
 
 Properties:
@@ -7188,6 +7193,7 @@ Properties:
 - bool[] mouseButtonDown // readonly
 - bool[] mouseButtonPress // readonly
 - bool mouseGrabbed
+- bool mouseLocked // readonly
 - MouseMode mouseMode
 - IntVector2 mouseMove // readonly
 - int mouseMoveWheel // readonly

+ 1 - 1
Source/Urho3D/.soversion

@@ -1 +1 @@
-0.0.203
+0.0.204