noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

SceneMainLoop -> SceneTree

Browse Source 
-=-=-=-=-=-=-=-=-=-=-=-=-=-

*YOUR SOURCE MIGHT NOT WORK*
For mor information on fix:
https://github.com/okamstudio/godot/wiki/devel_scene_tree

Other stuff:
-Shower of bullets demo
-Fixes all around
This commit is contained in:
Juan Linietsky
2014-11-05 21:20:42 -03:00
parent d14baf6e41
commit 0dbedd18fc
168 changed files with 1534 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/editor/project_settings.cpp
View File

@@ -57,7 +57,7 @@ static const char* _button_names[JOY_BUTTON_MAX]={
void ProjectSettings::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_SCENE) {
if (p_what==NOTIFICATION_ENTER_TREE) {
translation_list->connect("button_pressed",this,"_translation_delete");
_update_actions();
@@ -504,7 +504,7 @@ void ProjectSettings::popup_project_settings() {
void ProjectSettings::_item_selected() {
TreeItem *ti = globals_editor->get_tree()->get_selected();
TreeItem *ti = globals_editor->get_scene_tree()->get_selected();
if (!ti)
return;
if (!ti->get_parent())
@@ -1212,7 +1212,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
globals_editor->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN, 5 );
globals_editor->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END, 5 );
globals_editor->set_capitalize_paths(false);
globals_editor->get_tree()->connect("cell_selected",this,"_item_selected");
globals_editor->get_scene_tree()->connect("cell_selected",this,"_item_selected");
globals_editor->connect("property_toggled",this,"_item_checked");
globals_editor->connect("property_edited",this,"_settings_prop_edited");