Misc Fixes
========== -NOTIFICATION_WM_QUIT fixed on android (seems tha way this is reported changed in newer sdk) -WIP implementation of APK Expansion APIs for publishing games larger than 50mb in Play Store -Feaures in the new tutorials are all present in the sourcecode -This (hopefully) should get rid of the animation list order getting corrupted -Improved 3D Scene Importer (Skeletons, Animations and other stuff were not being merged). Anything missing? -In code editor, the automatic syntax checker will only use file_exists() to check preload() else it might freeze the editor too much while typing if the preload is a big resource -Fixed bugs in PolygonPathFinder, stil pending to do a node and a demo
This commit is contained in:
@ -243,12 +243,27 @@ bool Globals::_load_resource_pack(const String& p_pack) {
|
||||
return true;
|
||||
}
|
||||
|
||||
Error Globals::setup(const String& p_path) {
|
||||
Error Globals::setup(const String& p_path,const String & p_main_pack) {
|
||||
|
||||
//an absolute mess of a function, must be cleaned up and reorganized somehow at some point
|
||||
|
||||
//_load_settings(p_path+"/override.cfg");
|
||||
|
||||
if (p_main_pack!="") {
|
||||
|
||||
bool ok = _load_resource_pack(p_main_pack);
|
||||
ERR_FAIL_COND_V(!ok,ERR_CANT_OPEN);
|
||||
|
||||
if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) {
|
||||
|
||||
_load_settings("res://override.cfg");
|
||||
|
||||
}
|
||||
|
||||
return OK;
|
||||
|
||||
}
|
||||
|
||||
if (OS::get_singleton()->get_executable_path()!="") {
|
||||
|
||||
if (_load_resource_pack(OS::get_singleton()->get_executable_path())) {
|
||||
|
||||
Reference in New Issue
Block a user