hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-fixed bug in Button now exporting font property

Browse source 
-made GUI Theme editor usable
-editor does not allow to export or create .pck in the same path as a project
-changed .pck format (lacked support for versioning so couldn't change it), previous was causing crashes and is now incompatible, just re-export.
-will not look for .pck files recursively, was causing unexpected behaviors
-fixed execution of Godot in paths with non unicode characters in Windows, OSX and Linux.
This commit is contained in:
Juan Linietsky 2014-02-15 02:01:39 -03:00
parent b0870e487c
commit 9afdb3e0ad
30 changed files with 107728 additions and 88050 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/globals.cpp
View file

@ -319,11 +319,13 @@ Error Globals::setup(const String& p_path) {
String candidate = d->get_current_dir();
String current_dir = d->get_current_dir();
bool found = false;
bool first_time=true;
while(true) {
//try to load settings in ascending through dirs shape!
if (_load_resource_pack(current_dir+"/data.pck") || _load_resource_pack(current_dir+"/data.pcz")) {
//tries to open pack, but only first time
if (first_time && _load_resource_pack(current_dir+"/data.pck")) {
if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) {
_load_settings("res://override.cfg");
@ -344,6 +346,7 @@ Error Globals::setup(const String& p_path) {
if (d->get_current_dir()==current_dir)
break; //not doing anything useful
current_dir=d->get_current_dir();
first_time=false;
}