maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/godotengine/godot

Browse source
This commit is contained in:
Juan Linietsky 2016-01-08 17:53:51 -03:00
parent 40ba22631b 515567d491
commit 225a1b26f4
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/gui/text_edit.cpp
View file

@ -839,7 +839,7 @@ void TextEdit::_notification(int p_what) {
}
if (cursor.column==str.length() && cursor.line==line) {
if (cursor.column==str.length() && cursor.line==line && (char_ofs+char_margin)>=xmargin_beg) {
cursor_pos=Point2i( char_ofs+char_margin, ofs_y );
VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(cursor_pos, Size2i(1,get_row_height())),cache.font_color);

15
tools/editor/editor_node.cpp
View file

@ -1321,10 +1321,18 @@ void EditorNode::_dialog_action(String p_file) {
case FILE_EXPORT_TILESET: {
Ref<TileSet> ml;
if (file_export_lib_merge->is_pressed() && FileAccess::exists(p_file)) {
if (FileAccess::exists(p_file)) {
ml=ResourceLoader::load(p_file,"TileSet");
if (ml.is_null()) {
if (!file_export_lib_merge->is_pressed()) {
ml->clear();
}
}
if (ml.is_null()) {
if (file_export_lib_merge->is_pressed()) {
current_option=-1;
//accept->get_cancel()->hide();
accept->get_ok()->set_text("I see..");
@ -1333,9 +1341,6 @@ void EditorNode::_dialog_action(String p_file) {
return;
}
}
if (ml.is_null()) {
ml = Ref<TileSet>( memnew( TileSet ));
}

2
tools/editor/plugins/script_editor_plugin.cpp
View file

@ -2413,7 +2413,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
debug_menu->get_popup()->add_item("Continue",DEBUG_CONTINUE);
debug_menu->get_popup()->add_separator();
debug_menu->get_popup()->add_check_item("Show Debugger",DEBUG_SHOW);
debug_menu->get_popup()->add_check_item("Keep Debuger Open",DEBUG_SHOW_KEEP_OPEN);
debug_menu->get_popup()->add_check_item("Keep Debugger Open",DEBUG_SHOW_KEEP_OPEN);
debug_menu->get_popup()->connect("item_pressed", this,"_menu_option");
debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true);

3
tools/editor/script_editor_debugger.cpp
View file

@ -569,8 +569,8 @@ void ScriptEditorDebugger::_notification(int p_what) {
ppeer->set_stream_peer(connection);
show();
emit_signal("show_debugger",true);
dobreak->set_disabled(false);
tabs->set_current_tab(0);
@ -770,6 +770,7 @@ void ScriptEditorDebugger::_stack_dump_frame_selected() {
void ScriptEditorDebugger::_hide_request() {
hide();
emit_signal("show_debugger",false);
}