From 70cdfa681a0196f5dcb4ec1bb524ae1643ce23cb Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 20 Feb 2016 10:01:34 -0300 Subject: [PATCH] -Change link to new documentation -fixed bug in tilemap collision debug --- modules/gdscript/gd_editor.cpp | 1 + scene/2d/tile_map.cpp | 5 +++++ tools/editor/plugins/script_editor_plugin.cpp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index b4e5c04c959..ff19518ad56 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -52,6 +52,7 @@ String GDScriptLanguage::get_template(const String& p_class_name, const String& "# var a=2\n"+ "# var b=\"textvar\"\n\n"+ "func _ready():\n"+ + "\t# Called every time the node is added to the scene.\n"+ "\t# Initialization here\n"+ "\tpass\n"+ "\n"+ diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 2014c9730ff..1cd63999628 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -450,6 +450,7 @@ void TileMap::_update_dirty_quadrants() { _fix_cell_transform(xform,c,shape_ofs+center_ofs,s); if (debug_canvas_item) { + vs->canvas_item_add_set_transform(debug_canvas_item,xform); shape->draw(debug_canvas_item,debug_collision_color); } @@ -459,6 +460,10 @@ void TileMap::_update_dirty_quadrants() { } } + if (debug_canvas_item) { + vs->canvas_item_add_set_transform(debug_canvas_item,Matrix32()); + } + if (navigation) { Ref navpoly = tile_set->tile_get_navigation_polygon(c.id); if (navpoly.is_valid()) { diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 18f3787cff8..9c772308500 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -979,7 +979,7 @@ void ScriptEditor::_menu_option(int p_option) { } break; case SEARCH_WEBSITE: { - OS::get_singleton()->shell_open("http://www.godotengine.org/projects/godot-engine/wiki/Documentation#Tutorials"); + OS::get_singleton()->shell_open("http://docs.godotengine.org/"); } break; case WINDOW_NEXT: {