summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-02-11 15:46:06 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-02-11 15:46:06 +0100
commit334b3bc9b01fc0a17525e899400b3323e5caa02f (patch)
tree93a1f5bbf19d40260985345fc4e1c0c97c23fa97
parente46ffe5c66044bdb0168784c54c544b1569e1b66 (diff)
parent0065be1bcd9cbb94bcaad49b6033518284aa29bf (diff)
Merge pull request #3669 from Hinsbart/fix_joylabel
fix joystick related label text in project settings
-rw-r--r--tools/editor/project_settings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index 873e397010..22e93c5a95 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -297,7 +297,7 @@ void ProjectSettings::_add_item(int p_item){
case InputEvent::JOYSTICK_MOTION: {
device_id->set_val(0);
- device_index_label->set_text("Joy Button Axis:");
+ device_index_label->set_text("Joystick Axis Index:");
device_index->clear();
for(int i=0;i<JOY_AXIS_MAX*2;i++) {
@@ -322,7 +322,7 @@ void ProjectSettings::_add_item(int p_item){
case InputEvent::JOYSTICK_BUTTON: {
device_id->set_val(0);
- device_index_label->set_text("Joy Button Index:");
+ device_index_label->set_text("Joystick Button Index:");
device_index->clear();
for(int i=0;i<JOY_BUTTON_MAX;i++) {