summaryrefslogtreecommitdiff
path: root/core/os
diff options
context:
space:
mode:
authorhurikhan <m4r10.5ch14ck@gmail.com>2015-01-20 23:39:53 +0900
committerhurikhan <m4r10.5ch14ck@gmail.com>2015-01-20 23:39:53 +0900
commitc5080e23b822766b99cebb18618ff3fa69f16beb (patch)
tree5660ba782ad3ce2a44d086a28c99e0d5d88f1a81 /core/os
parentd878b3205aac60f1ff139a2189663638befb557a (diff)
parent79af8057107214a385505d3b130c42d8e4a7a875 (diff)
Merge remote-tracking branch 'upstream/master' into x11-window-management
Diffstat (limited to 'core/os')
-rw-r--r--core/os/input.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp
index a827e75896..5d4b3a834d 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -62,6 +62,8 @@ void Input::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_mouse_mode","mode"),&Input::set_mouse_mode);
ObjectTypeDB::bind_method(_MD("get_mouse_mode"),&Input::get_mouse_mode);
ObjectTypeDB::bind_method(_MD("warp_mouse_pos","to"),&Input::warp_mouse_pos);
+ ObjectTypeDB::bind_method(_MD("action_press"),&Input::action_press);
+ ObjectTypeDB::bind_method(_MD("action_release"),&Input::action_release);
BIND_CONSTANT( MOUSE_MODE_VISIBLE );
BIND_CONSTANT( MOUSE_MODE_HIDDEN );