summaryrefslogtreecommitdiffstats
path: root/core/globals.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-02-19 11:57:14 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-02-19 11:57:14 -0300
commitd7d65fa2f2b51d03f7bdfcbceedca99188ce979c (patch)
treefecdf1bfa39ba5a4895b4dbf340a3b68098c109a /core/globals.cpp
parent8c1731b67995add31361ae526b0e6af76346181e (diff)
downloadredot-engine-d7d65fa2f2b51d03f7bdfcbceedca99188ce979c.tar.gz
-improved physics ccd
-html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
Diffstat (limited to 'core/globals.cpp')
-rw-r--r--core/globals.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/globals.cpp b/core/globals.cpp
index 2eb26a7b19..997e2a2d85 100644
--- a/core/globals.cpp
+++ b/core/globals.cpp
@@ -240,6 +240,7 @@ bool Globals::_load_resource_pack(const String& p_pack) {
//if data.pck is found, all directory access will be from here
DirAccess::make_default<DirAccessPack>(DirAccess::ACCESS_RESOURCES);
+ using_datapack=true;
return true;
}
@@ -1327,6 +1328,10 @@ void Globals::set_disable_platform_override(bool p_disable) {
disable_platform_override=p_disable;
}
+bool Globals::is_using_datapack() const {
+
+ return using_datapack;
+}
void Globals::_bind_methods() {
@@ -1439,6 +1444,8 @@ Globals::Globals() {
custom_prop_info["render/mipmap_policy"]=PropertyInfo(Variant::INT,"render/mipmap_policy",PROPERTY_HINT_ENUM,"Allow,Allow For Po2,Disallow");
custom_prop_info["render/thread_model"]=PropertyInfo(Variant::INT,"render/thread_model",PROPERTY_HINT_ENUM,"Single-Unsafe,Single-Safe,Multi-Threaded");
set("display/emulate_touchscreen",false);
+
+ using_datapack=false;
}