Travis CI: API documentation update at 2014-04-18 20:53:24 UTC.

[ci package]

Docs/AngelScriptAPI.h

@@ -4264,9 +4264,7 @@ int width;
 class Input
 {
 // Methods:
-uint AddScreenJoystick(XMLFile = null, XMLFile = null);
-void CloseJoystick(uint);
-bool DetectJoysticks();
+int AddScreenJoystick(XMLFile = null, XMLFile = null);
 int GetKeyFromName(const String&) const;
 int GetKeyFromScancode(int) const;
 String GetKeyName(int) const;
@@ -4274,9 +4272,8 @@ int GetScancodeFromKey(int) const;
 int GetScancodeFromName(const String&) const;
 String GetScancodeName(int) const;
 uint LoadGestures(File);
-bool OpenJoystick(uint);
 bool RecordGesture();
-bool RemoveScreenJoystick(uint);
+bool RemoveScreenJoystick(int);
 bool SaveGesture(File, uint);
 bool SaveGestures(File);
 void SendEvent(const String&, VariantMap& = VariantMap ( ));
@@ -4289,10 +4286,10 @@ String category;
 /* readonly */
 bool focus;
 /* readonly */
-Array<String> joystickNames;
-/* readonly */
 Array<JoystickState> joysticks;
 /* readonly */
+Array<JoystickState> joysticksByIndex;
+/* readonly */
 Array<bool> keyDown;
 /* readonly */
 Array<bool> keyPress;
@@ -4329,6 +4326,7 @@ int refs;
 Array<bool> scancodeDown;
 /* readonly */
 Array<bool> scancodePress;
+Array<bool> screenJoystickVisible;
 /* readonly */
 bool screenKeyboardSupport;
 bool screenKeyboardVisible;
@@ -4386,7 +4384,10 @@ Array<bool> buttonDown;
 /* readonly */
 Array<bool> buttonPress;
 /* readonly */
+bool controller;
+/* readonly */
 Array<int> hatPosition;
+int joystickID;
 String name;
 /* readonly */
 uint numAxes;

Docs/LuaScriptAPI.dox

@@ -2041,11 +2041,9 @@ Methods:
 
 - void SetToggleFullscreen(bool enable)
 - void SetMouseVisible(bool enable)
-- bool OpenJoystick(unsigned index)
-- void CloseJoystick(unsigned index)
-- bool DetectJoysticks()
-- unsigned AddScreenJoystick(XMLFile* layoutFile = 0, XMLFile* styleFile = 0)
-- bool RemoveScreenJoystick(unsigned index)
+- int AddScreenJoystick(XMLFile* layoutFile = 0, XMLFile* styleFile = 0)
+- bool RemoveScreenJoystick(int id)
+- void SetScreenJoystickVisible(int id, bool enable)
 - void SetScreenKeyboardVisible(bool enable)
 - bool RecordGesture()
 - bool SaveGestures(File* dest)
@@ -2077,10 +2075,11 @@ Methods:
 - unsigned GetNumTouches() const
 - TouchState* GetTouch(unsigned index) const
 - unsigned GetNumJoysticks() const
-- const String GetJoystickName(unsigned index) const
-- JoystickState* GetJoystick(unsigned index)
+- JoystickState* GetJoystick(int id)
+- JoystickState* GetJoystickByIndex(unsigned index)
 - bool GetToggleFullscreen() const
 - bool GetScreenKeyboardSupport() const
+- bool IsScreenJoystickVisible(int id) const
 - bool IsScreenKeyboardVisible() const
 - bool IsMouseVisible() const
 - bool HasFocus()
@@ -2162,6 +2161,7 @@ Properties:
 
 Methods:
 
+- bool IsController() const
 - unsigned GetNumButtons() const
 - unsigned GetNumAxes() const
 - unsigned GetNumHats() const
@@ -2172,6 +2172,9 @@ Methods:
 
 Properties:
 
+- const String name
+- const int joystickID
+- bool controller (readonly)
 - unsigned numButtons (readonly)
 - unsigned numAxes (readonly)
 - unsigned numHats (readonly)

Docs/ScriptAPI.dox

@@ -148,37 +148,30 @@ namespace Urho3D
 - %Buttons : int
 - %Qualifiers : int
 
+### JoystickConnected
+- %JoystickID : int
+
+### JoystickDisconnected
+- %JoystickID : int
+
 ### JoystickButtonDown
-- %Joystick : int
+- %JoystickID : int
 - %Button : int
 
 ### JoystickButtonUp
-- %Joystick : int
+- %JoystickID : int
 - %Button : int
 
 ### JoystickAxisMove
-- %Joystick : int
+- %JoystickID : int
 - %Button : int
 - %Position : float
 
 ### JoystickHatMove
-- %Joystick : int
+- %JoystickID : int
 - %Button : int
 - %Position : int
 
-### ControllerButtonDown
-- %Joystick : int
-- %Button : int
-
-### ControllerButtonUp
-- %Joystick : int
-- %Button : int
-
-### ControllerAxisMove
-- %Joystick : int
-- %Button : int
-- %Position : float
-
 ### TouchBegin
 - %TouchID : int
 - %X : int
@@ -5559,9 +5552,7 @@ Properties:
 
 Methods:
 
-- uint AddScreenJoystick(XMLFile@ = null, XMLFile@ = null)
-- void CloseJoystick(uint)
-- bool DetectJoysticks()
+- int AddScreenJoystick(XMLFile@ = null, XMLFile@ = null)
 - int GetKeyFromName(const String&) const
 - int GetKeyFromScancode(int) const
 - String GetKeyName(int) const
@@ -5569,9 +5560,8 @@ Methods:
 - int GetScancodeFromName(const String&) const
 - String GetScancodeName(int) const
 - uint LoadGestures(File@)
-- bool OpenJoystick(uint)
 - bool RecordGesture()
-- bool RemoveScreenJoystick(uint)
+- bool RemoveScreenJoystick(int)
 - bool SaveGesture(File@, uint)
 - bool SaveGestures(File@)
 - void SendEvent(const String&, VariantMap& = VariantMap ( ))
@@ -5581,8 +5571,8 @@ Properties:
 - ShortStringHash baseType // readonly
 - String category // readonly
 - bool focus // readonly
-- String[] joystickNames // readonly
 - JoystickState@[] joysticks // readonly
+- JoystickState@[] joysticksByIndex // readonly
 - bool[] keyDown // readonly
 - bool[] keyPress // readonly
 - bool minimized // readonly
@@ -5602,6 +5592,7 @@ Properties:
 - int refs // readonly
 - bool[] scancodeDown // readonly
 - bool[] scancodePress // readonly
+- bool[] screenJoystickVisible
 - bool screenKeyboardSupport // readonly
 - bool screenKeyboardVisible
 - bool toggleFullscreen
@@ -5649,7 +5640,9 @@ Properties:
 - float[] axisPosition // readonly
 - bool[] buttonDown // readonly
 - bool[] buttonPress // readonly
+- bool controller // readonly
 - int[] hatPosition // readonly
+- int joystickID
 - String name
 - uint numAxes // readonly
 - uint numButtons // readonly