Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

develop #50

Merged
cromer merged 47 commits from develop into master 2022-09-02 00:37:34 -04:00
Conversation 0 Commits 47 Files Changed 45 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d560d13627 - Show all commits

2
src/Main.cpp
View File

@ -91,7 +91,6 @@ void alai::Main::_on_monitor_loaded()
load_level(); load_level();
auto event = get_node<alai::Event>("/root/Event"); auto event = get_node<alai::Event>("/root/Event");
event->emit_signal("level_loaded"); event->emit_signal("level_loaded");
get_tree()->set_pause(true);
} }
void alai::Main::load_monitor() void alai::Main::load_monitor()
@ -100,6 +99,7 @@ void alai::Main::load_monitor()
event->connect("monitor_loaded", this, "_on_monitor_loaded"); event->connect("monitor_loaded", this, "_on_monitor_loaded");
godot::Ref<godot::PackedScene> monitor_scene = _resource_loader->load("res://monitor/Monitor.tscn"); godot::Ref<godot::PackedScene> monitor_scene = _resource_loader->load("res://monitor/Monitor.tscn");
add_child(monitor_scene->instance()); add_child(monitor_scene->instance());
get_tree()->set_pause(true);
} }
void alai::Main::load_level() void alai::Main::load_level()