summaryrefslogtreecommitdiff
path: root/modules/gdscript
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-08 17:05:51 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-08 17:06:33 -0300
commit547a57777b199f451305a6d4b6ad63fb0b2bd3ed (patch)
tree9fb9ce5851ea3ccc39c6ebce607ceeca771fd991 /modules/gdscript
parent6323779596dea0db7f58afef7d3d3d5588ef20cb (diff)
renamed joystick to joypad everywhere around source code!
Diffstat (limited to 'modules/gdscript')
-rw-r--r--modules/gdscript/gd_editor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index ebb753d129..d3c3dac1fd 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -2391,8 +2391,8 @@ Error GDScriptLanguage::complete_code(const String& p_code, const String& p_base
"# Key",
"# MouseMotion",
"# MouseButton",
- "# JoystickMotion",
- "# JoystickButton",
+ "# JoypadMotion",
+ "# JoypadButton",
"# ScreenTouch",
"# ScreenDrag",
"# Action"