summaryrefslogtreecommitdiffstats
path: root/core/os/os.cpp
diff options
context:
space:
mode:
authorpunto- <ariel@godotengine.org>2016-01-12 03:59:19 -0300
committerpunto- <ariel@godotengine.org>2016-01-12 03:59:19 -0300
commit7393e404521350cbb3e69ce87a19ee602ec2a7a4 (patch)
tree2c0b71bce28a0bbbbd448084b80bc602183e19b0 /core/os/os.cpp
parent8cb013a1bf4728853851d0cbcbc963754632d330 (diff)
parentc632c13c66db715b816390f0734f2b1839a7ff3e (diff)
downloadredot-engine-7393e404521350cbb3e69ce87a19ee602ec2a7a4.tar.gz
Merge pull request #3272 from Hinsbart/joy-binding
Add some joystick functions to input. Enables manipulation of mapping…
Diffstat (limited to 'core/os/os.cpp')
-rw-r--r--core/os/os.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 1a505fb236..be447d511e 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -507,6 +507,13 @@ float OS::get_time_scale() const {
return _time_scale;
}
+bool OS::is_joy_known(int p_device) {
+ return true;
+}
+
+String OS::get_joy_guid(int p_device) const {
+ return "Default Joystick";
+}
OS::OS() {
last_error=NULL;