Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

-Renamed GlobalConfig to ProjectSettings, makes more sense.

Browse source 
-Added system for feature overrides, it's pretty cool :)
This commit is contained in:
Juan Linietsky 2017-07-19 17:00:46 -03:00
parent 89588d4334
commit 25678b1876
162 changed files with 1296 additions and 831 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/os/file_access.cpp
View file

@ -31,7 +31,7 @@
#include "core/io/file_access_pack.h"
#include "core/io/marshalls.h"
#include "global_config.h"
#include "project_settings.h"
#include "os/os.h"
#include "thirdparty/misc/md5.h"
@ -135,10 +135,10 @@ String FileAccess::fix_path(const String &p_path) const {
case ACCESS_RESOURCES: {
if (GlobalConfig::get_singleton()) {
if (ProjectSettings::get_singleton()) {
if (r_path.begins_with("res://")) {
String resource_path = GlobalConfig::get_singleton()->get_resource_path();
String resource_path = ProjectSettings::get_singleton()->get_resource_path();
if (resource_path != "") {
return r_path.replace("res:/", resource_path);