aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJuan Linietsky2014-09-19 18:39:50 -0300
committerJuan Linietsky2014-09-19 18:39:50 -0300
commit549d344f0fef5e5748ded69b6a037698ff55f8bc (patch)
treea22ee2a3b0d6303fe3e4348831e7f581dd8a0a07 /platform
parent526aae62edfa31aa156d604e8b25caab512c6bff (diff)
downloadgodot-549d344f0fef5e5748ded69b6a037698ff55f8bc.tar.gz
godot-549d344f0fef5e5748ded69b6a037698ff55f8bc.tar.zst
godot-549d344f0fef5e5748ded69b6a037698ff55f8bc.zip
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 'platform')
-rw-r--r--platform/windows/os_windows.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 7f86f3bb9..a12cd6740 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1835,7 +1835,11 @@ String OS_Windows::get_data_dir() const {
if (has_environment("APPDATA")) {
- return (OS::get_singleton()->get_environment("APPDATA")+"\\"+an).replace("\\","/"); // windows path to unix path to be consistent with get_resource_path
+ bool use_godot = Globals::get_singleton()->get("application/use_shared_user_dir");
+ if (use_godot)
+ return (OS::get_singleton()->get_environment("APPDATA")+"/"+an).replace("\\","/");
+ else
+ return (OS::get_singleton()->get_environment("APPDATA")+"/Godot/app_userdata/"+an).replace("\\","/");
}
}