diff options
| author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-09 16:33:02 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-09 16:33:02 -0300 |
| commit | 3a83337420c3e6c7e5f3a52cee49aa2eb17cab2d (patch) | |
| tree | 7560fb0b3caf599e7181e17edce12616a58cdf73 /tools/editor/editor_node.h | |
| parent | c88038228ae9b5c53d5d7ff3f1d99ac0adbc30eb (diff) | |
| parent | c2e2f2e0aebf6342e6f18ae5d67b6a825590675a (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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 93b95034ff..d40658a056 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -146,6 +146,7 @@ class EditorNode : public Node { RUN_PAUSE, RUN_STOP, RUN_PLAY_SCENE, + RUN_PLAY_NATIVE, RUN_PLAY_CUSTOM_SCENE, RUN_SCENE_SETTINGS, RUN_SETTINGS, @@ -153,6 +154,7 @@ class EditorNode : public Node { RUN_FILE_SERVER, RUN_DEPLOY_DUMB_CLIENTS, RUN_LIVE_DEBUG, + RUN_DEPLOY_REMOTE_DEBUG, SETTINGS_UPDATE_ALWAYS, SETTINGS_UPDATE_CHANGES, SETTINGS_IMPORT, @@ -240,9 +242,9 @@ class EditorNode : public Node { ToolButton *animation_menu; ToolButton *play_scene_button; ToolButton *play_custom_scene_button; - ToolButton *live_debug_button; + MenuButton *debug_button; TextureProgress *audio_vu; - MenuButton *fileserver_menu; + //MenuButton *fileserver_menu; TextEdit *load_errors; AcceptDialog *load_error_dialog; |