Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

-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

14
modules/visual_script/visual_script_nodes.cpp
View file

@ -29,7 +29,7 @@
/*************************************************************************/
#include "visual_script_nodes.h"
#include "global_config.h"
#include "project_settings.h"
#include "global_constants.h"
#include "os/input.h"
#include "os/os.h"
@ -1939,13 +1939,13 @@ public:
VisualScriptNodeInstance *VisualScriptEngineSingleton::instance(VisualScriptInstance *p_instance) {
VisualScriptNodeInstanceEngineSingleton *instance = memnew(VisualScriptNodeInstanceEngineSingleton);
instance->singleton = GlobalConfig::get_singleton()->get_singleton_object(singleton);
instance->singleton = ProjectSettings::get_singleton()->get_singleton_object(singleton);
return instance;
}
VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output_type(TypeGuess *p_inputs, int p_output) const {
Object *obj = GlobalConfig::get_singleton()->get_singleton_object(singleton);
Object *obj = ProjectSettings::get_singleton()->get_singleton_object(singleton);
TypeGuess tg;
tg.type = Variant::OBJECT;
if (obj) {
@ -1963,11 +1963,11 @@ void VisualScriptEngineSingleton::_bind_methods() {
String cc;
List<GlobalConfig::Singleton> singletons;
List<ProjectSettings::Singleton> singletons;
GlobalConfig::get_singleton()->get_singletons(&singletons);
ProjectSettings::get_singleton()->get_singletons(&singletons);
for (List<GlobalConfig::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
for (List<ProjectSettings::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
if (E->get().name == "VS" || E->get().name == "PS" || E->get().name == "PS2D" || E->get().name == "AS" || E->get().name == "TS" || E->get().name == "SS" || E->get().name == "SS2D")
continue; //skip these, too simple named
@ -3466,7 +3466,7 @@ void VisualScriptInputAction::_validate_property(PropertyInfo &property) const {
String actions;
List<PropertyInfo> pinfo;
GlobalConfig::get_singleton()->get_property_list(&pinfo);
ProjectSettings::get_singleton()->get_property_list(&pinfo);
Vector<String> al;
for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {