summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-09-19 18:39:50 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-09-19 18:39:50 -0300
commit549d344f0fef5e5748ded69b6a037698ff55f8bc (patch)
treea22ee2a3b0d6303fe3e4348831e7f581dd8a0a07 /drivers
parent526aae62edfa31aa156d604e8b25caab512c6bff (diff)
Fixing Issues...
- #672 (default user:// in $HOME/.godot/app_userdata (linux/osx) and $APPDATA/Godot/app_userdata (Windows) - #676 (draw both tiles and octants in order from top to bottom, left to right ) - #686 (unicode escape sequences work now) - #702 (was not a bug, but a test was added to see if bodies went too far away)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/unix/os_unix.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 1af37e2a60..ef4cf644fd 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -382,9 +382,15 @@ String OS_Unix::get_data_dir() const {
String an = Globals::get_singleton()->get("application/name");
if (an!="") {
+
+
if (has_environment("HOME")) {
- return get_environment("HOME")+"/."+an;
+ bool use_godot = Globals::get_singleton()->get("application/use_shared_user_dir");
+ if (use_godot)
+ return get_environment("HOME")+"/.godot/app_userdata/"+an;
+ else
+ return get_environment("HOME")+"/."+an;
}
}