diff options
author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-03 17:28:33 -0300 |
---|---|---|
committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-03 17:28:33 -0300 |
commit | c88038228ae9b5c53d5d7ff3f1d99ac0adbc30eb (patch) | |
tree | 8df611ec64e5f58d32e09512bac9d1f5a662403d /tools/editor/editor_node.h | |
parent | d7279ddaf2aa98ed962d84d466f21dc2f39522c9 (diff) | |
parent | cbee679bd78c1b3317db1ea4e349f278576304a1 (diff) |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/editor_node.h')
-rw-r--r-- | tools/editor/editor_node.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 293da2031d..93b95034ff 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -152,6 +152,7 @@ class EditorNode : public Node { RUN_PROJECT_MANAGER, RUN_FILE_SERVER, RUN_DEPLOY_DUMB_CLIENTS, + RUN_LIVE_DEBUG, SETTINGS_UPDATE_ALWAYS, SETTINGS_UPDATE_CHANGES, SETTINGS_IMPORT, @@ -239,6 +240,7 @@ class EditorNode : public Node { ToolButton *animation_menu; ToolButton *play_scene_button; ToolButton *play_custom_scene_button; + ToolButton *live_debug_button; TextureProgress *audio_vu; MenuButton *fileserver_menu; @@ -469,6 +471,7 @@ class EditorNode : public Node { void _dock_split_dragged(int ofs); void _dock_popup_exit(); void _scene_tab_changed(int p_tab); + void _scene_tab_script_edited(int p_tab); Dictionary _get_main_scene_state(); void _set_main_scene_state(Dictionary p_state); |