From da895e8542fcd19545287e4a99654f17c2d4c3d8 Mon Sep 17 00:00:00 2001
From: Guilherme Felipe <guilhermefelipecgs@gmail.com>
Date: Thu, 3 Sep 2015 19:23:39 -0300
Subject: [PATCH 01/78] Fix for smoothing camera2D when you change zoom, fix
 #2074.

---
 scene/2d/camera_2d.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index 49683da226..52ae5d2954 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -57,7 +57,9 @@ void Camera2D::_update_scroll() {
 void Camera2D::set_zoom(const Vector2 &p_zoom) {
 
 	zoom = p_zoom;
+	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
 	_update_scroll();
+	smoothed_camera_pos = old_smoothed_camera_pos;
 };
 
 Vector2 Camera2D::get_zoom() const {

From abde648e6844fa328affed0f1002f56edb4ab69c Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Sun, 18 Oct 2015 13:31:44 -0300
Subject: [PATCH 02/78] Small fixes in some editor dialogs

---
 .../animation_player_editor_plugin.cpp        |  1 +
 .../plugins/canvas_item_editor_plugin.cpp     | 60 +++++++++++--------
 tools/editor/plugins/mesh_editor_plugin.cpp   | 13 ++--
 .../plugins/multimesh_editor_plugin.cpp       | 20 ++-----
 .../editor/plugins/multimesh_editor_plugin.h  |  8 +--
 .../editor/plugins/spatial_editor_plugin.cpp  | 42 ++++---------
 6 files changed, 65 insertions(+), 79 deletions(-)

diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index f8c484e886..65565aae85 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -1279,6 +1279,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 	add_child(file);
 
 	name_dialog = memnew( ConfirmationDialog );
+	name_dialog->set_title("Create New Animation");
 	name_dialog->set_hide_on_ok(false);
 	add_child(name_dialog);
 	name = memnew( LineEdit );
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index d318f6f6fa..b03eed77b1 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -41,9 +41,9 @@
 class SnapDialog : public ConfirmationDialog {
 
 	OBJ_TYPE(SnapDialog,ConfirmationDialog);
-	
-protected:
-	friend class CanvasItemEditor;
+
+friend class CanvasItemEditor;
+
 	SpinBox *grid_offset_x;
 	SpinBox *grid_offset_y;
 	SpinBox *grid_step_x;
@@ -58,63 +58,75 @@ public:
 		Label *label;
 		VBoxContainer *container;
 		GridContainer *child_container;
-		
+
 		set_title("Configure Snap");
 		get_ok()->set_text("Close");
-		container = memnew(VBoxContainer);
+
+		container = memnew( VBoxContainer );
 		add_child(container);
-		
-		child_container = memnew(GridContainer);
+		set_child_rect(container);
+
+		child_container = memnew( GridContainer );
 		child_container->set_columns(3);
 		container->add_child(child_container);
-		
-		label = memnew(Label);
+
+		label = memnew( Label );
 		label->set_text("Grid Offset:");
 		child_container->add_child(label);
-		grid_offset_x=memnew(SpinBox);
+		label->set_h_size_flags(SIZE_EXPAND_FILL);
+
+		grid_offset_x = memnew( SpinBox );
 		grid_offset_x->set_min(-SPIN_BOX_GRID_RANGE);
 		grid_offset_x->set_max(SPIN_BOX_GRID_RANGE);
 		grid_offset_x->set_suffix("px");
 		child_container->add_child(grid_offset_x);
-		grid_offset_y=memnew(SpinBox);
+
+		grid_offset_y = memnew( SpinBox );
 		grid_offset_y->set_min(-SPIN_BOX_GRID_RANGE);
 		grid_offset_y->set_max(SPIN_BOX_GRID_RANGE);
 		grid_offset_y->set_suffix("px");
 		child_container->add_child(grid_offset_y);
 
-		label = memnew(Label);
+		label = memnew( Label );
 		label->set_text("Grid Step:");
 		child_container->add_child(label);
-		grid_step_x=memnew(SpinBox);
+		label->set_h_size_flags(SIZE_EXPAND_FILL);
+
+		grid_step_x = memnew( SpinBox );
 		grid_step_x->set_min(-SPIN_BOX_GRID_RANGE);
 		grid_step_x->set_max(SPIN_BOX_GRID_RANGE);
 		grid_step_x->set_suffix("px");
 		child_container->add_child(grid_step_x);
-		grid_step_y=memnew(SpinBox);
+
+		grid_step_y = memnew( SpinBox );
 		grid_step_y->set_min(-SPIN_BOX_GRID_RANGE);
 		grid_step_y->set_max(SPIN_BOX_GRID_RANGE);
 		grid_step_y->set_suffix("px");
 		child_container->add_child(grid_step_y);
-		
-		container->add_child(memnew(HSeparator));
 
-		child_container = memnew(GridContainer);
+		container->add_child( memnew( HSeparator ) );
+
+		child_container = memnew( GridContainer );
 		child_container->set_columns(2);
 		container->add_child(child_container);
 
-		label = memnew(Label);
+		label = memnew( Label );
 		label->set_text("Rotation Offset:");
 		child_container->add_child(label);
-		rotation_offset=memnew(SpinBox);
+		label->set_h_size_flags(SIZE_EXPAND_FILL);
+
+		rotation_offset = memnew( SpinBox );
 		rotation_offset->set_min(-SPIN_BOX_ROTATION_RANGE);
 		rotation_offset->set_max(SPIN_BOX_ROTATION_RANGE);
 		rotation_offset->set_suffix("deg");
 		child_container->add_child(rotation_offset);
-		
-		label = memnew(Label);
+
+		label = memnew( Label );
 		label->set_text("Rotation Step:");
 		child_container->add_child(label);
-		rotation_step=memnew(SpinBox);
+		label->set_h_size_flags(SIZE_EXPAND_FILL);
+
+		rotation_step = memnew( SpinBox );
 		rotation_step->set_min(-SPIN_BOX_ROTATION_RANGE);
 		rotation_step->set_max(SPIN_BOX_ROTATION_RANGE);
 		rotation_step->set_suffix("deg");
@@ -2278,7 +2290,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		} break;
 		case SNAP_CONFIGURE: {
 			((SnapDialog *)snap_dialog)->set_fields(snap_offset, snap_step, snap_rotation_offset, snap_rotation_step);
-			snap_dialog->popup_centered(Size2(200,160));
+			snap_dialog->popup_centered(Size2(220,160));
 		} break;
 		case ZOOM_IN: {
 			zoom=zoom*(1.0/0.5);
@@ -3173,7 +3185,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	p->add_item("Paste Pose",ANIM_PASTE_POSE);
 	p->add_item("Clear Pose",ANIM_CLEAR_POSE,KEY_MASK_SHIFT|KEY_K);
 
-	snap_dialog = memnew(SnapDialog);
+	snap_dialog = memnew( SnapDialog );
 	snap_dialog->connect("confirmed",this,"_snap_changed");
 	add_child(snap_dialog);
 
diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/tools/editor/plugins/mesh_editor_plugin.cpp
index 13d4c8db5a..34ccf79fee 100644
--- a/tools/editor/plugins/mesh_editor_plugin.cpp
+++ b/tools/editor/plugins/mesh_editor_plugin.cpp
@@ -160,7 +160,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
 		} break;
 		case MENU_OPTION_CREATE_OUTLINE_MESH: {
 
-			outline_dialog->popup_centered_minsize();
+			outline_dialog->popup_centered(Vector2(200, 90));
 		} break;
 	}
 
@@ -231,14 +231,19 @@ MeshInstanceEditor::MeshInstanceEditor() {
 	options->get_popup()->connect("item_pressed", this,"_menu_option");
 
 	outline_dialog = memnew( ConfirmationDialog );
-	outline_dialog->set_title("Outline Size: ");
+	outline_dialog->set_title("Create Outline Mesh");
+
+	VBoxContainer *outline_dialog_vbc = memnew( VBoxContainer );
+	outline_dialog->add_child(outline_dialog_vbc);
+	outline_dialog->set_child_rect(outline_dialog_vbc);
+
 	outline_size = memnew( SpinBox );
 	outline_size->set_min(0.001);
 	outline_size->set_max(1024);
 	outline_size->set_step(0.001);
 	outline_size->set_val(0.05);
-	outline_dialog->add_child(outline_size);
-	outline_dialog->set_child_rect(outline_size);
+	outline_dialog_vbc->add_margin_child("Outline Size:",outline_size);
+
 	add_child(outline_dialog);
 	outline_dialog->connect("confirmed",this,"_create_outline_mesh");
 
diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp
index 3c88b1d3a8..a5c823f8bd 100644
--- a/tools/editor/plugins/multimesh_editor_plugin.cpp
+++ b/tools/editor/plugins/multimesh_editor_plugin.cpp
@@ -289,7 +289,7 @@ void MultiMeshEditor::_menu_option(int p_option) {
 
 				_last_pp_node=node;
 			}
-			populate_dialog->popup_centered(Size2(250,395));
+			populate_dialog->popup_centered(Size2(250,380));
 
 		} break;
 	}
@@ -325,10 +325,8 @@ MultiMeshEditor::MultiMeshEditor() {
 
 
 	options = memnew( MenuButton );
-	//add_child(options);
 	SpatialEditor::get_singleton()->add_control_to_menu_panel(options);
-	options->set_area_as_parent_rect();
-
+	
 	options->set_text("MultiMesh");
 	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("MultiMeshInstance","EditorIcons"));
 
@@ -373,12 +371,12 @@ MultiMeshEditor::MultiMeshEditor() {
 	populate_axis->select(2);
 	vbc->add_margin_child("Mesh Up Axis:",populate_axis);
 
-	populate_rotate_random = memnew( HScrollBar );
+	populate_rotate_random = memnew( HSlider );
 	populate_rotate_random->set_max(1);
 	populate_rotate_random->set_step(0.01);
 	vbc->add_margin_child("Random Rotation:",populate_rotate_random);
 
-	populate_tilt_random = memnew( HScrollBar );
+	populate_tilt_random = memnew( HSlider );
 	populate_tilt_random->set_max(1);
 	populate_tilt_random->set_step(0.01);
 	vbc->add_margin_child("Random Tilt:",populate_tilt_random);
@@ -416,8 +414,7 @@ MultiMeshEditor::MultiMeshEditor() {
 	std->connect("selected",this,"_browsed");
 
 	_last_pp_node=NULL;
-	//options->set_anchor(MARGIN_LEFT,Control::ANCHOR_END);
-	//options->set_anchor(MARGIN_RIGHT,Control::ANCHOR_END);
+
 	err_dialog = memnew( AcceptDialog );
 	add_child(err_dialog);
 }
@@ -451,13 +448,6 @@ MultiMeshEditorPlugin::MultiMeshEditorPlugin(EditorNode *p_node) {
 	multimesh_editor = memnew( MultiMeshEditor );
 	editor->get_viewport()->add_child(multimesh_editor);
 
-//	multimesh_editor->set_anchor(MARGIN_LEFT,Control::ANCHOR_END);
-//	multimesh_editor->set_anchor(MARGIN_RIGHT,Control::ANCHOR_END);
-	multimesh_editor->set_margin(MARGIN_LEFT,253);
-	multimesh_editor->set_margin(MARGIN_RIGHT,310);
-	multimesh_editor->set_margin(MARGIN_TOP,0);
-	multimesh_editor->set_margin(MARGIN_BOTTOM,10);
-
 	multimesh_editor->options->hide();
 }
 
diff --git a/tools/editor/plugins/multimesh_editor_plugin.h b/tools/editor/plugins/multimesh_editor_plugin.h
index 4f0c0d008b..edc3dfd55f 100644
--- a/tools/editor/plugins/multimesh_editor_plugin.h
+++ b/tools/editor/plugins/multimesh_editor_plugin.h
@@ -42,10 +42,10 @@ class MultiMeshEditor : public Control {
 
 	OBJ_TYPE(MultiMeshEditor, Control );
 
-        friend class MultiMeshEditorPlugin;
+friend class MultiMeshEditorPlugin;
 
 	AcceptDialog *err_dialog;
-        MenuButton * options;
+	MenuButton * options;
 	MultiMeshInstance *_last_pp_node;
 	bool browsing_source;
 
@@ -59,8 +59,8 @@ class MultiMeshEditor : public Control {
 
 	ConfirmationDialog *populate_dialog;
 	OptionButton *populate_axis;
-	HScrollBar *populate_rotate_random;
-	HScrollBar *populate_tilt_random;
+	HSlider *populate_rotate_random;
+	HSlider *populate_tilt_random;
 	SpinBox *populate_scale_random;
 	SpinBox *populate_scale;
 	SpinBox *populate_amount;
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index 3ab9339265..f3458a768a 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -2725,7 +2725,7 @@ void SpatialEditor::_menu_item_pressed(int p_option) {
 		} break;
 		case MENU_TRANSFORM_CONFIGURE_SNAP: {
 
-			snap_dialog->popup_centered(Size2(200,160));
+			snap_dialog->popup_centered(Size2(200,180));
 		} break;
 		case MENU_TRANSFORM_LOCAL_COORDS: {
 
@@ -3793,46 +3793,24 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
 	snap_dialog = memnew( ConfirmationDialog );
 	snap_dialog->set_title("Snap Settings");
 	add_child(snap_dialog);
-	Label *l = memnew(Label);
-	l->set_text("Translate Snap:");
-	l->set_pos(Point2(5,5));
-	snap_dialog->add_child(l);
+
+	VBoxContainer *snap_dialog_vbc = memnew( VBoxContainer );
+	snap_dialog->add_child(snap_dialog_vbc);
+	snap_dialog->set_child_rect(snap_dialog_vbc);
 
 	snap_translate = memnew( LineEdit );
-	snap_translate->set_anchor( MARGIN_RIGHT, ANCHOR_END );
-	snap_translate->set_begin( Point2(15,22) );
-	snap_translate->set_end( Point2(15,35) );
 	snap_translate->set_text("1");
-	snap_dialog->add_child(snap_translate);
-
-	l = memnew(Label);
-	l->set_text("Rotate Snap (deg.):");
-	l->set_pos(Point2(5,45));
-	snap_dialog->add_child(l);
+	snap_dialog_vbc->add_margin_child("Translate Snap:",snap_translate);
 
 	snap_rotate = memnew( LineEdit );
-	snap_rotate->set_anchor( MARGIN_RIGHT, ANCHOR_END );
-	snap_rotate->set_begin( Point2(15,62) );
-	snap_rotate->set_end( Point2(15,75) );
 	snap_rotate->set_text("5");
-	snap_dialog->add_child(snap_rotate);
-
-
-	l = memnew(Label);
-	l->set_text("Scale Snap (%):");
-	l->set_pos(Point2(5,85));
-	snap_dialog->add_child(l);
+	snap_dialog_vbc->add_margin_child("Rotate Snap (deg.):",snap_rotate);
 
 	snap_scale = memnew( LineEdit );
-	snap_scale->set_anchor( MARGIN_RIGHT, ANCHOR_END );
-	snap_scale->set_begin( Point2(15,102) );
-	snap_scale->set_end( Point2(15,115) );
 	snap_scale->set_text("5");
-	snap_dialog->add_child(snap_scale);
+	snap_dialog_vbc->add_margin_child("Scale Snap (%):",snap_scale);
 
-	//snap_dialog->get_cancel()->hide();
-
-	/* SNAP DIALOG */
+	/* SETTINGS DIALOG */
 
 	settings_dialog = memnew( ConfirmationDialog );
 	settings_dialog->set_title("Viewport Settings");
@@ -3906,7 +3884,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
 	xform_dialog = memnew( ConfirmationDialog );
 	xform_dialog->set_title("Transform Change");
 	add_child(xform_dialog);
-	l = memnew(Label);
+	Label *l = memnew(Label);
 	l->set_text("Translate:");
 	l->set_pos(Point2(5,5));
 	xform_dialog->add_child(l);

From ec394950ff7c8213768c9dfb2668f5d65bfdc07a Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Sun, 18 Oct 2015 15:13:17 -0300
Subject: [PATCH 03/78] Change MeshInstanceEditor outline dialog "Ok" button
 label

---
 tools/editor/plugins/mesh_editor_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/tools/editor/plugins/mesh_editor_plugin.cpp
index 34ccf79fee..cea774f94b 100644
--- a/tools/editor/plugins/mesh_editor_plugin.cpp
+++ b/tools/editor/plugins/mesh_editor_plugin.cpp
@@ -212,7 +212,6 @@ MeshInstanceEditor::MeshInstanceEditor() {
 
 
 	options = memnew( MenuButton );
-	//add_child(options);
 	SpatialEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->set_text("Mesh");
@@ -232,6 +231,7 @@ MeshInstanceEditor::MeshInstanceEditor() {
 
 	outline_dialog = memnew( ConfirmationDialog );
 	outline_dialog->set_title("Create Outline Mesh");
+	outline_dialog->get_ok()->set_text("Create");
 
 	VBoxContainer *outline_dialog_vbc = memnew( VBoxContainer );
 	outline_dialog->add_child(outline_dialog_vbc);

From 4621d30d1b63c510c9928d073ef88be5b59248c0 Mon Sep 17 00:00:00 2001
From: firefly2442 <firefly2442@gmail.com>
Date: Sun, 18 Oct 2015 19:49:30 -0500
Subject: [PATCH 04/78] float to bool variable type, fixes: #2478

---
 servers/visual/rasterizer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h
index 15c757665b..5063c1e19b 100644
--- a/servers/visual/rasterizer.h
+++ b/servers/visual/rasterizer.h
@@ -690,7 +690,7 @@ public:
 			Rect2 rect;
 			RID texture;
 			float margin[4];
-			float draw_center;
+			bool draw_center;
 			Color color;
 			CommandStyle() { draw_center=true; type = TYPE_STYLE; }
 		};

From 0a45fb6311023ae39be74d71054fd0042a8ba183 Mon Sep 17 00:00:00 2001
From: firefly2442 <firefly2442@gmail.com>
Date: Sun, 18 Oct 2015 20:50:32 -0500
Subject: [PATCH 05/78] duplicate conditional check

---
 tools/editor/plugins/shader_graph_editor_plugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp
index 684e7e32ef..3a7dc26466 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp
@@ -2542,7 +2542,7 @@ void ShaderGraphView::_notification(int p_what) {
 
 void ShaderGraphView::add_node(int p_type, const Vector2 &location) {
 
-	if ((p_type==ShaderGraph::NODE_INPUT||p_type==ShaderGraph::NODE_INPUT) && graph->node_count(type, p_type)>0)
+	if (p_type==ShaderGraph::NODE_INPUT && graph->node_count(type, p_type)>0)
 		return;
 
 	List<int> existing;

From bb68dc5210205da32b721681667360d8f54e2ea9 Mon Sep 17 00:00:00 2001
From: firefly2442 <firefly2442@gmail.com>
Date: Sun, 18 Oct 2015 21:45:27 -0500
Subject: [PATCH 06/78] remove child variable that is duplicated from parent
 class

---
 modules/gdscript/gd_parser.h      | 1 -
 servers/visual/rasterizer_dummy.h | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h
index 134279b6d8..04f3dff3de 100644
--- a/modules/gdscript/gd_parser.h
+++ b/modules/gdscript/gd_parser.h
@@ -276,7 +276,6 @@ public:
 	};
 
 	struct NewLineNode : public Node {
-		int line;
 		NewLineNode() { type=TYPE_NEWLINE; }
 	};
 
diff --git a/servers/visual/rasterizer_dummy.h b/servers/visual/rasterizer_dummy.h
index 9249ad6256..ea39e9db6a 100644
--- a/servers/visual/rasterizer_dummy.h
+++ b/servers/visual/rasterizer_dummy.h
@@ -162,10 +162,6 @@ class RasterizerDummy : public Rasterizer {
 		uint32_t format;
 		uint32_t morph_format;
 
-		RID material;
-		bool material_owned;
-
-
 		Surface() {
 
 			packed=false;

From f256e421b52f248f76a7cb116c49f781f089aa49 Mon Sep 17 00:00:00 2001
From: Julian Murgia - StraToN <the.straton@gmail.com>
Date: Mon, 19 Oct 2015 12:26:19 +0200
Subject: [PATCH 07/78] Fixed minor bug : quicklty pointing alternatively
 Script button and Close button on a tab showed both buttons as hovered

---
 scene/gui/tabs.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp
index 6d84f028b3..10b1a626f0 100644
--- a/scene/gui/tabs.cpp
+++ b/scene/gui/tabs.cpp
@@ -103,11 +103,13 @@ void Tabs::_input_event(const InputEvent& p_event) {
 			// test hovering right button and close button
 			if (tabs[i].rb_rect.has_point(pos)) {
 				rb_hover=i;
+				cb_hover=-1;
 				hover_buttons = i;
 				break;
 			}
 			else if (tabs[i].cb_rect.has_point(pos)) {
 				cb_hover=i;
+				rb_hover=-1;
 				hover_buttons = i;
 				break;
 			}

From 1e36f36357ce2a44ffbb11276f0ce86a0dfe8606 Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Mon, 19 Oct 2015 08:00:41 -0300
Subject: [PATCH 08/78] Bind missing FixedMaterial constants, fixes #2628

---
 scene/resources/material.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index bbb2a386f3..55bb4e9073 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -406,7 +406,6 @@ void FixedMaterial::_bind_methods() {
 	BIND_CONSTANT( PARAM_SHADE_PARAM );
 	BIND_CONSTANT( PARAM_MAX );
 
-
 	BIND_CONSTANT( TEXCOORD_SPHERE );
 	BIND_CONSTANT( TEXCOORD_UV );
 	BIND_CONSTANT( TEXCOORD_UV_TRANSFORM );
@@ -417,6 +416,11 @@ void FixedMaterial::_bind_methods() {
 	BIND_CONSTANT( FLAG_USE_POINT_SIZE );
 	BIND_CONSTANT( FLAG_DISCARD_ALPHA );
 
+	BIND_CONSTANT( LIGHT_SHADER_LAMBERT );
+	BIND_CONSTANT( LIGHT_SHADER_WRAP );
+	BIND_CONSTANT( LIGHT_SHADER_VELVET );
+	BIND_CONSTANT( LIGHT_SHADER_TOON );
+
 }
 
 

From 4345009a0eb1d2416316581d362795096e40768a Mon Sep 17 00:00:00 2001
From: MarianoGNU <marianognu.easyrpg@gmail.com>
Date: Mon, 19 Oct 2015 12:21:19 -0300
Subject: [PATCH 09/78] add missing default value

---
 scene/gui/texture_progress.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scene/gui/texture_progress.cpp b/scene/gui/texture_progress.cpp
index 0d549108fa..c92929d991 100644
--- a/scene/gui/texture_progress.cpp
+++ b/scene/gui/texture_progress.cpp
@@ -302,4 +302,5 @@ TextureProgress::TextureProgress()
 {
 	mode=FILL_LEFT_TO_RIGHT;
 	rad_center_off=Point2();
+	rad_max_degrees=360;
 }

From bf4bb3e17b731f1c726fef5e85fd9ea93b2acc3a Mon Sep 17 00:00:00 2001
From: MarianoGNU <marianognu.easyrpg@gmail.com>
Date: Mon, 19 Oct 2015 15:26:00 -0300
Subject: [PATCH 10/78] Clamp filling angle instead of normalize

---
 scene/gui/texture_progress.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scene/gui/texture_progress.cpp b/scene/gui/texture_progress.cpp
index c92929d991..c8930add6e 100644
--- a/scene/gui/texture_progress.cpp
+++ b/scene/gui/texture_progress.cpp
@@ -233,11 +233,7 @@ float TextureProgress::get_radial_initial_angle()
 
 void TextureProgress::set_fill_degrees(float p_angle)
 {
-	while(p_angle>360)
-		p_angle-=360;
-	while (p_angle<0)
-		p_angle+=360;
-	rad_max_degrees=p_angle;
+	rad_max_degrees=CLAMP(p_angle,0,360);
 	update();
 }
 

From 6df7d923797908ecf38684c0008c0e4b6475d884 Mon Sep 17 00:00:00 2001
From: MarianoGNU <marianognu.easyrpg@gmail.com>
Date: Mon, 19 Oct 2015 17:46:13 -0300
Subject: [PATCH 11/78] Fix ButtonGroup broken layout

---
 scene/gui/button_group.cpp                    |  2 +-
 scene/gui/button_group.h                      |  6 ++--
 .../resources/default_theme/default_theme.cpp |  4 +++
 tools/editor/plugins/theme_editor_plugin.cpp  | 36 +++++++++----------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/scene/gui/button_group.cpp b/scene/gui/button_group.cpp
index 8d1fa80b84..c92d7f2696 100644
--- a/scene/gui/button_group.cpp
+++ b/scene/gui/button_group.cpp
@@ -155,6 +155,6 @@ void ButtonGroup::_bind_methods() {
 
 }
 
-ButtonGroup::ButtonGroup()
+ButtonGroup::ButtonGroup() : BoxContainer(true)
 {
 }
diff --git a/scene/gui/button_group.h b/scene/gui/button_group.h
index 24edf94994..74e847e937 100644
--- a/scene/gui/button_group.h
+++ b/scene/gui/button_group.h
@@ -29,14 +29,14 @@
 #ifndef BUTTON_GROUP_H
 #define BUTTON_GROUP_H
 
-#include "scene/gui/control.h"
+#include "scene/gui/box_container.h"
 
 
 class BaseButton;
 
-class ButtonGroup : public Control {
+class ButtonGroup : public BoxContainer {
 
-	OBJ_TYPE(ButtonGroup,Control);
+	OBJ_TYPE(ButtonGroup,BoxContainer);
 
 
 	Set<BaseButton*> buttons;
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 5a99538a5f..9f25337c3d 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -299,6 +299,10 @@ void make_default_theme() {
 
 	t->set_constant("hseparation","MenuButton", 3 );
 
+	// ButtonGroup
+
+	t->set_stylebox("panel","ButtonGroup", memnew( StyleBoxEmpty ));
+
 	// CheckBox
 
 	Ref<StyleBox> cbx_empty = memnew( StyleBoxEmpty );
diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp
index 55e8f164d6..63ba57bfc0 100644
--- a/tools/editor/plugins/theme_editor_plugin.cpp
+++ b/tools/editor/plugins/theme_editor_plugin.cpp
@@ -568,26 +568,24 @@ ThemeEditor::ThemeEditor() {
 	CheckButton *cb = memnew( CheckButton );
 	cb->set_text("CheckButton");
 	first_vb->add_child(cb );
-    CheckBox *cbx = memnew( CheckBox );
-    cbx->set_text("CheckBox");
-    first_vb->add_child(cbx );
+	CheckBox *cbx = memnew( CheckBox );
+	cbx->set_text("CheckBox");
+	first_vb->add_child(cbx );
 
-    /* TODO: This is not working properly, controls are overlapping*/
-    /*
-    ButtonGroup *bg = memnew( ButtonGroup );
-    bg->set_v_size_flags(SIZE_EXPAND_FILL);
-    VBoxContainer *gbvb = memnew( VBoxContainer );
-    gbvb->set_v_size_flags(SIZE_EXPAND_FILL);
-    CheckBox *rbx1 = memnew( CheckBox );
-    rbx1->set_text("CheckBox Radio1");
-    rbx1->set_pressed(true);
-    gbvb->add_child(rbx1);
-    CheckBox *rbx2 = memnew( CheckBox );
-    rbx2->set_text("CheckBox Radio2");
-    gbvb->add_child(rbx2);
-    bg->add_child(gbvb);
-    first_vb->add_child(bg);
-    */
+
+	ButtonGroup *bg = memnew( ButtonGroup );
+	bg->set_v_size_flags(SIZE_EXPAND_FILL);
+	VBoxContainer *gbvb = memnew( VBoxContainer );
+	gbvb->set_v_size_flags(SIZE_EXPAND_FILL);
+	CheckBox *rbx1 = memnew( CheckBox );
+	rbx1->set_text("CheckBox Radio1");
+	rbx1->set_pressed(true);
+	gbvb->add_child(rbx1);
+	CheckBox *rbx2 = memnew( CheckBox );
+	rbx2->set_text("CheckBox Radio2");
+	gbvb->add_child(rbx2);
+	bg->add_child(gbvb);
+	first_vb->add_child(bg);
 
 	MenuButton* test_menu_button = memnew( MenuButton );
 	test_menu_button->set_text("MenuButton");

From ad362fbc582fd8ff9239542971c60e670d0a689d Mon Sep 17 00:00:00 2001
From: firefly2442 <firefly2442@gmail.com>
Date: Mon, 19 Oct 2015 23:14:02 -0500
Subject: [PATCH 12/78] projects in the editor_settings.xml that are no longer
 found on disk will be removed

---
 tools/editor/project_manager.cpp | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index 9f47291433..458b7b1133 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -480,20 +480,25 @@ void ProjectManager::_load_recent_projects() {
 		bool favorite = (_name.begins_with("favorite_projects/"))?true:false;
 
 		uint64_t last_modified = 0;
-		if (FileAccess::exists(conf))
+		if (FileAccess::exists(conf)) {
 			last_modified = FileAccess::get_modified_time(conf);
-		String fscache = path.plus_file(".fscache");
-		if (FileAccess::exists(fscache)) {
-			uint64_t cache_modified = FileAccess::get_modified_time(fscache);
-			if ( cache_modified > last_modified )
-				last_modified = cache_modified;
-		}
 
-		ProjectItem item(project, path, conf, last_modified, favorite);
-		if (favorite)
-			favorite_projects.push_back(item);
-		else
-			projects.push_back(item);
+			String fscache = path.plus_file(".fscache");
+			if (FileAccess::exists(fscache)) {
+				uint64_t cache_modified = FileAccess::get_modified_time(fscache);
+				if ( cache_modified > last_modified )
+					last_modified = cache_modified;
+			}
+
+			ProjectItem item(project, path, conf, last_modified, favorite);
+			if (favorite)
+				favorite_projects.push_back(item);
+			else
+				projects.push_back(item);
+		} else {
+			//project doesn't exist on disk but it's in the XML settings file
+			EditorSettings::get_singleton()->erase(_name); //remove it
+		}
 	}
 
 	projects.sort();
@@ -601,6 +606,8 @@ void ProjectManager::_load_recent_projects() {
 	erase_btn->set_disabled(selected_list.size()<1);
 	open_btn->set_disabled(selected_list.size()<1);
 	run_btn->set_disabled(selected_list.size()<1 || (selected_list.size()==1 && single_selected_main==""));
+
+	EditorSettings::get_singleton()->save();
 }
 
 void ProjectManager::_open_project_confirm() {

From 96cff3a73b4b4d2cbd24a848a9f4950d54dd271f Mon Sep 17 00:00:00 2001
From: firefly2442 <firefly2442@gmail.com>
Date: Wed, 21 Oct 2015 14:28:23 -0500
Subject: [PATCH 13/78] when creating project, save icon using resource
 location by default

---
 tools/editor/project_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index 9f47291433..ee5521b8e1 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -193,7 +193,7 @@ class NewProjectDialog : public ConfirmationDialog {
 				f->store_line("\n");
 				f->store_line("[application]");
 				f->store_line("name=\""+project_name->get_text()+"\"");
-				f->store_line("icon=\"icon.png\"");
+				f->store_line("icon=\"res://icon.png\"");
 
 				memdelete(f);
 

From 580a88c3ced6aa59db50fea6b7b5e02330689b09 Mon Sep 17 00:00:00 2001
From: firefly2442 <firefly2442@gmail.com>
Date: Wed, 21 Oct 2015 14:29:52 -0500
Subject: [PATCH 14/78] fix icon locations in demo projects

---
 demos/2d/fog_of_war/engine.cfg               | 2 +-
 demos/2d/polygon_path_finder_demo/engine.cfg | 2 +-
 demos/gui/input_mapping/engine.cfg           | 1 -
 demos/misc/tween/engine.cfg                  | 2 +-
 demos/misc/window_management/engine.cfg      | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/demos/2d/fog_of_war/engine.cfg b/demos/2d/fog_of_war/engine.cfg
index 5c4307b5bc..1f56851c58 100644
--- a/demos/2d/fog_of_war/engine.cfg
+++ b/demos/2d/fog_of_war/engine.cfg
@@ -2,7 +2,7 @@
 
 name="Fog of War"
 main_scene="res://fog.scn"
-icon="icon.png"
+icon="res://icon.png"
 
 [input]
 
diff --git a/demos/2d/polygon_path_finder_demo/engine.cfg b/demos/2d/polygon_path_finder_demo/engine.cfg
index 41c4adf701..de5593c417 100644
--- a/demos/2d/polygon_path_finder_demo/engine.cfg
+++ b/demos/2d/polygon_path_finder_demo/engine.cfg
@@ -2,4 +2,4 @@
 
 name="polygon_path_finder_demo"
 main_scene="res://new_scene_poly_with_holes.scn"
-icon="icon.png"
+icon="res://icon.png"
diff --git a/demos/gui/input_mapping/engine.cfg b/demos/gui/input_mapping/engine.cfg
index 959c0ac7d5..6470ec6cd8 100644
--- a/demos/gui/input_mapping/engine.cfg
+++ b/demos/gui/input_mapping/engine.cfg
@@ -2,7 +2,6 @@
 
 name="Input Mapping GUI"
 main_scene="res://controls.scn"
-icon="icon.png"
 
 [display]
 
diff --git a/demos/misc/tween/engine.cfg b/demos/misc/tween/engine.cfg
index f97e540dbd..3d3d639964 100644
--- a/demos/misc/tween/engine.cfg
+++ b/demos/misc/tween/engine.cfg
@@ -2,7 +2,7 @@
 
 name="Tween Demo"
 main_scene="res://main.xml"
-icon="icon.png"
+icon="res://icon.png"
 target_fps=60
 
 [display]
diff --git a/demos/misc/window_management/engine.cfg b/demos/misc/window_management/engine.cfg
index 0a34231673..911d3fd4a1 100644
--- a/demos/misc/window_management/engine.cfg
+++ b/demos/misc/window_management/engine.cfg
@@ -2,7 +2,7 @@
 
 name="Window Management"
 main_scene="res://window_management.scn"
-icon="icon.png"
+icon="res://icon.png"
 
 [display]
 

From b86e3c3402c7a19ad34160ed36a1fae65dc43cca Mon Sep 17 00:00:00 2001
From: romulox_x <romulox_x@yahoo.com>
Date: Wed, 21 Oct 2015 19:23:34 -0700
Subject: [PATCH 15/78] added low_memory_2d_mode, to indicate when 3D post
 processing buffers and viewport depth buffers should not be allocated

---
 drivers/gles2/rasterizer_gles2.cpp | 17 +++++++++++++----
 drivers/gles2/rasterizer_gles2.h   |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp
index d84ee5a758..9bcce156cd 100644
--- a/drivers/gles2/rasterizer_gles2.cpp
+++ b/drivers/gles2/rasterizer_gles2.cpp
@@ -4075,6 +4075,8 @@ void RasterizerGLES2::render_target_set_size(RID p_render_target,int p_width,int
 		glDeleteTextures(1,&rt->color);
 
 		rt->fbo=0;
+		rt->depth=0;
+		rt->color=0;
 		rt->width=0;
 		rt->height=0;
 		rt->texture_ptr->tex_id=0;
@@ -4094,12 +4096,14 @@ void RasterizerGLES2::render_target_set_size(RID p_render_target,int p_width,int
 	glBindFramebuffer(GL_FRAMEBUFFER, rt->fbo);
 
 	//depth
-	glGenRenderbuffers(1, &rt->depth);
-	glBindRenderbuffer(GL_RENDERBUFFER, rt->depth );
+	if (!low_memory_2d) {
+		glGenRenderbuffers(1, &rt->depth);
+		glBindRenderbuffer(GL_RENDERBUFFER, rt->depth );
 
-	glRenderbufferStorage(GL_RENDERBUFFER, use_depth24?_DEPTH_COMPONENT24_OES:GL_DEPTH_COMPONENT16, rt->width,rt->height);
+		glRenderbufferStorage(GL_RENDERBUFFER, use_depth24?_DEPTH_COMPONENT24_OES:GL_DEPTH_COMPONENT16, rt->width,rt->height);
 
-	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rt->depth);
+		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rt->depth);
+	}
 
 	//color
 	glGenTextures(1, &rt->color);
@@ -10293,7 +10297,11 @@ void RasterizerGLES2::_update_framebuffer() {
 		framebuffer.fbo=0;
 	}
 
+#ifdef TOOLS_ENABLED
 	framebuffer.active=use_fbo;
+#else
+	framebuffer.active=use_fbo && !low_memory_2d;
+#endif
 	framebuffer.width=dwidth;
 	framebuffer.height=dheight;
 	framebuffer.scale=scale;
@@ -11203,6 +11211,7 @@ RasterizerGLES2::RasterizerGLES2(bool p_compress_arrays,bool p_keep_ram_copy,boo
 	use_fp16_fb=bool(GLOBAL_DEF("rasterizer/fp16_framebuffer",true));
 	use_shadow_mapping=true;
 	use_fast_texture_filter=!bool(GLOBAL_DEF("rasterizer/trilinear_mipmap_filter",true));
+	low_memory_2d=bool(GLOBAL_DEF("rasterizer/low_memory_2d_mode",false));
 	skel_default.resize(1024*4);
 	for(int i=0;i<1024/3;i++) {
 
diff --git a/drivers/gles2/rasterizer_gles2.h b/drivers/gles2/rasterizer_gles2.h
index 507e46ae75..85e49d4f39 100644
--- a/drivers/gles2/rasterizer_gles2.h
+++ b/drivers/gles2/rasterizer_gles2.h
@@ -105,7 +105,7 @@ class RasterizerGLES2 : public Rasterizer {
 	float anisotropic_level;
 
 	bool use_half_float;
-
+	bool low_memory_2d;
 
 	Vector<float> skel_default;
 

From 4e0511a8a0cb294d330f6fde0640365ae3173ab5 Mon Sep 17 00:00:00 2001
From: Brickcaster <dralon@yahoo.com>
Date: Sat, 24 Oct 2015 21:47:48 -0400
Subject: [PATCH 16/78] Fix for negative coords.  Regarding issue #2665

int() of negative numbers rounds up. Needed to add a condition to account for negative values. Thanks to Romulox_x for providing this solution.
---
 scene/2d/tile_map.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index 418ee192b2..167b637bdc 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -1031,13 +1031,12 @@ Vector2 TileMap::world_to_map(const Vector2& p_pos) const{
 	switch(half_offset) {
 
 		case HALF_OFFSET_X: {
-			if (int(ret.y)&1) {
-
+			if ( ret.y > 0 ? int(ret.y)&1 : (int(ret.y)-1)&1 ) {
 				ret.x-=0.5;
 			}
 		} break;
 		case HALF_OFFSET_Y: {
-			if (int(ret.x)&1) {
+			if ( ret.x > 0 ? int(ret.x)&1 : (int(ret.x)-1)&1) {
 				ret.y-=0.5;
 			}
 		} break;

From cf995d5f0783b9c8fc6c4493e6298e59c559c9d1 Mon Sep 17 00:00:00 2001
From: neikeq <ignalfonsore@gmail.com>
Date: Sun, 25 Oct 2015 18:00:29 +0100
Subject: [PATCH 17/78] Tooltip for the Inspector's history button

---
 tools/editor/editor_node.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index a3d7cbd7cf..ecd4b402c8 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -5173,6 +5173,7 @@ EditorNode::EditorNode() {
 
 
 	editor_history_menu = memnew( MenuButton );
+	editor_history_menu->set_tooltip("History of recently edited objects");
 	editor_history_menu->set_icon( gui_base->get_icon("History","EditorIcons"));
 	prop_editor_hb->add_child(editor_history_menu);
 	editor_history_menu->connect("about_to_show",this,"_prepare_history");

From ca7cfa9b4c5fbd487c9b5bcf9143cbfce35287e7 Mon Sep 17 00:00:00 2001
From: eska <eska@eska.me>
Date: Sun, 25 Oct 2015 23:13:46 +0100
Subject: [PATCH 18/78] Add all collision shapes to a tile when converting
 scenes to TileSets

---
 tools/editor/plugins/tile_set_editor_plugin.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/editor/plugins/tile_set_editor_plugin.cpp b/tools/editor/plugins/tile_set_editor_plugin.cpp
index 39b0ef3c75..09115472a8 100644
--- a/tools/editor/plugins/tile_set_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_set_editor_plugin.cpp
@@ -110,11 +110,15 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
 			if (!child2->cast_to<StaticBody2D>())
 				continue;
 			StaticBody2D *sb = child2->cast_to<StaticBody2D>();
-			if (sb->get_shape_count()==0)
+			int shape_count = sb->get_shape_count();
+			if (shape_count==0)
 				continue;
-			Ref<Shape2D> collision=sb->get_shape(0);
-			if (collision.is_valid()) {
-				collisions.push_back(collision);
+			for (int shape_index=0; shape_index<shape_count; ++shape_index)
+			{
+				Ref<Shape2D> collision=sb->get_shape(shape_index);
+				if (collision.is_valid()) {
+					collisions.push_back(collision);
+				}
 			}
 		}
 

From 3fbaa479e33466394cd243ab652bd1c4c082549a Mon Sep 17 00:00:00 2001
From: volzhs <volzhs@gmail.com>
Date: Wed, 28 Oct 2015 15:48:37 +0900
Subject: [PATCH 19/78] improve android payments

GodotPaymentV3 currently consumes purchased item right after purchasing.
But, some in-app item should not consume like "remove ads permanently"
So, I added "setAutoConsume(boolean)", "requestPurchased()",
"consume(sku_string)".
AutoConsume is true by default as before.

usage:

func _ready():
	var payment = Globals.get_singleton("GodotPayments")
	payment.setPurchaseCallbackId(get_instance_ID())
	payment.setAutoConsume(false) # default : true
	payment.requestPurchased() # callback : has_purchased
	payment.purchase("item_name") # callback : purchase_success,
purchase_fail, purchase_cancel, purchase_owned
	payment.consume("item_name") # callback : consume_success

func purchase_success(receipt, signature, sku):
	print("purchase_success : ", sku)

func purchase_fail():
	print("purchase_fail")

func purchase_cancel():
	print("purchase_cancel")

func purchase_owned(sku):
	print("purchase_owned : ", sku)

func consume_success(receipt, signature, sku):
	print("consume_success : ", sku)

func has_purchased(receipt, signature, sku):
	if sku == "":
		print("has_purchased : nothing")
	else:
		print("has_purchased : ", sku)
---
 .../src/com/android/godot/GodotPaymentV3.java |  60 ++++++---
 .../godot/payments/PaymentsManager.java       | 127 ++++++++++++++----
 .../android/godot/payments/PurchaseTask.java  |   8 +-
 3 files changed, 152 insertions(+), 43 deletions(-)

diff --git a/platform/android/java/src/com/android/godot/GodotPaymentV3.java b/platform/android/java/src/com/android/godot/GodotPaymentV3.java
index 0fd102ac55..0799e1e83d 100644
--- a/platform/android/java/src/com/android/godot/GodotPaymentV3.java
+++ b/platform/android/java/src/com/android/godot/GodotPaymentV3.java
@@ -27,7 +27,7 @@ public class GodotPaymentV3 extends Godot.SingletonBase {
 				activity.getPaymentsManager().requestPurchase(sku, transactionId);				
 			}
 		});
-	};
+	}
 	
 /*	public string requestPurchasedTicket(){
 	    activity.getPaymentsManager()
@@ -42,7 +42,7 @@ public class GodotPaymentV3 extends Godot.SingletonBase {
 	
 	public GodotPaymentV3(Activity p_activity) {
 
-		registerClass("GodotPayments", new String[] {"purchase", "setPurchaseCallbackId", "setPurchaseValidationUrlPrefix", "setTransactionId", "getSignature", "consumeUnconsumedPurchases"});
+		registerClass("GodotPayments", new String[] {"purchase", "setPurchaseCallbackId", "setPurchaseValidationUrlPrefix", "setTransactionId", "getSignature", "consumeUnconsumedPurchases", "requestPurchased", "setAutoConsume", "consume"});
 		activity=(Godot) p_activity;
 	}
 
@@ -54,7 +54,6 @@ public class GodotPaymentV3 extends Godot.SingletonBase {
 				activity.getPaymentsManager().consumeUnconsumedPurchases();				
 			}
 		});
-		
 	}
 
 	private String signature;
@@ -63,25 +62,26 @@ public class GodotPaymentV3 extends Godot.SingletonBase {
 	}
 	
 	
-	public void callbackSuccess(String ticket, String signature){
-//        Log.d(this.getClass().getName(), "PRE-Send callback to purchase success");
-        GodotLib.callobject(purchaseCallbackId, "purchase_success", new Object[]{ticket, signature});
-//    	Log.d(this.getClass().getName(), "POST-Send callback to purchase success");
+	public void callbackSuccess(String ticket, String signature, String sku){
+//		Log.d(this.getClass().getName(), "PRE-Send callback to purchase success");
+		GodotLib.callobject(purchaseCallbackId, "purchase_success", new Object[]{ticket, signature, sku});
+//		Log.d(this.getClass().getName(), "POST-Send callback to purchase success");
 }
 
 	public void callbackSuccessProductMassConsumed(String ticket, String signature, String sku){
-//        Log.d(this.getClass().getName(), "PRE-Send callback to consume success");
-        GodotLib.calldeferred(purchaseCallbackId, "consume_success", new Object[]{ticket, signature, sku});
-//    	Log.d(this.getClass().getName(), "POST-Send callback to consume success");
+//		Log.d(this.getClass().getName(), "PRE-Send callback to consume success");
+		Log.d(this.getClass().getName(), "callbackSuccessProductMassConsumed > "+ticket+","+signature+","+sku);
+        	GodotLib.calldeferred(purchaseCallbackId, "consume_success", new Object[]{ticket, signature, sku});
+//		Log.d(this.getClass().getName(), "POST-Send callback to consume success");
 	}
 
 	public void callbackSuccessNoUnconsumedPurchases(){
-        GodotLib.calldeferred(purchaseCallbackId, "no_validation_required", new Object[]{});
+		GodotLib.calldeferred(purchaseCallbackId, "no_validation_required", new Object[]{});
 	}
 	
 	public void callbackFail(){
-                GodotLib.calldeferred(purchaseCallbackId, "purchase_fail", new Object[]{});
-//                GodotLib.callobject(purchaseCallbackId, "purchase_fail", new Object[]{});
+		GodotLib.calldeferred(purchaseCallbackId, "purchase_fail", new Object[]{});
+//		GodotLib.callobject(purchaseCallbackId, "purchase_fail", new Object[]{});
 	}
 	
 	public void callbackCancel(){
@@ -89,6 +89,10 @@ public class GodotPaymentV3 extends Godot.SingletonBase {
 //		GodotLib.callobject(purchaseCallbackId, "purchase_cancel", new Object[]{});
 	}
 	
+	public void callbackAlreadyOwned(String sku){
+		GodotLib.calldeferred(purchaseCallbackId, "purchase_owned", new Object[]{sku});
+	}
+	
 	public int getPurchaseCallbackId() {
 		return purchaseCallbackId;
 	}
@@ -97,8 +101,6 @@ public class GodotPaymentV3 extends Godot.SingletonBase {
 		this.purchaseCallbackId = purchaseCallbackId;
 	}
 
-
-
 	public String getPurchaseValidationUrlPrefix(){
 		return this.purchaseValidationUrlPrefix ;
 	}
@@ -107,12 +109,10 @@ public class GodotPaymentV3 extends Godot.SingletonBase {
 		this.purchaseValidationUrlPrefix = url;
 	}
 
-
 	public String getAccessToken() {
 		return accessToken;
 	}
 
-
 	public void setAccessToken(String accessToken) {
 		this.accessToken = accessToken;
 	}
@@ -125,4 +125,30 @@ public class GodotPaymentV3 extends Godot.SingletonBase {
 		return this.transactionId;
 	}
 	
+	// request purchased items are not consumed
+	public void requestPurchased(){
+		activity.getPaymentsManager().setBaseSingleton(this);
+		activity.runOnUiThread(new Runnable() {
+			@Override
+			public void run() {
+				activity.getPaymentsManager().requestPurchased();				
+			}
+		});
+	}
+	
+	// callback for requestPurchased()
+	public void callbackPurchased(String receipt, String signature, String sku){
+		GodotLib.calldeferred(purchaseCallbackId, "has_purchased", new Object[]{receipt, signature, sku});
+	}
+	
+	// consume item automatically after purchase. default is true.
+	public void setAutoConsume(boolean autoConsume){
+		activity.getPaymentsManager().setAutoConsume(autoConsume);
+	}
+	
+	// consume a specific item
+	public void consume(String sku){
+		activity.getPaymentsManager().consume(sku);
+	}
 }
+
diff --git a/platform/android/java/src/com/android/godot/payments/PaymentsManager.java b/platform/android/java/src/com/android/godot/payments/PaymentsManager.java
index 5bf86d0b69..189f7108c1 100644
--- a/platform/android/java/src/com/android/godot/payments/PaymentsManager.java
+++ b/platform/android/java/src/com/android/godot/payments/PaymentsManager.java
@@ -25,10 +25,8 @@ import com.android.vending.billing.IInAppBillingService;
 public class PaymentsManager {
 
 	public static final int BILLING_RESPONSE_RESULT_OK = 0;
-
-	
 	public static final int REQUEST_CODE_FOR_PURCHASE = 0x1001;
-	
+	private static boolean auto_consume = true;
 	
 	private Activity activity;
 	IInAppBillingService mService;
@@ -69,13 +67,12 @@ public class PaymentsManager {
 	    }
 
 	    @Override
-	    public void onServiceConnected(ComponentName name, 
-	    		IBinder service) {
-		mService = IInAppBillingService.Stub.asInterface(service);
+	    public void onServiceConnected(ComponentName name, IBinder service) {
+			mService = IInAppBillingService.Stub.asInterface(service);
 	    }
 	};
 	
-	public void requestPurchase(String sku, String transactionId){
+	public void requestPurchase(final String sku, String transactionId){
 		new PurchaseTask(mService, Godot.getInstance()) {
 			
 			@Override
@@ -88,6 +85,12 @@ public class PaymentsManager {
 			protected void canceled() {
 				godotPaymentV3.callbackCancel();
 			}
+			
+			@Override
+			protected void alreadyOwned() {
+				godotPaymentV3.callbackAlreadyOwned(sku);
+			}
+			
 		}.purchase(sku, transactionId);
 
 	}
@@ -114,26 +117,82 @@ public class PaymentsManager {
 		}.consumeItAll();
 	}
 	
+	public void requestPurchased(){
+		try{
+			PaymentsCache pc = new PaymentsCache(Godot.getInstance());
+
+//			Log.d("godot", "requestPurchased for " + activity.getPackageName());
+			Bundle bundle = mService.getPurchases(3, activity.getPackageName(), "inapp",null);
+
+/*			
+			for (String key : bundle.keySet()) {
+			    Object value = bundle.get(key);
+			    Log.d("godot", String.format("%s %s (%s)", key, value.toString(), value.getClass().getName()));
+			}
+*/			
+			
+			if (bundle.getInt("RESPONSE_CODE") == 0){
+
+				final ArrayList<String> myPurchases = bundle.getStringArrayList("INAPP_PURCHASE_DATA_LIST");
+				final ArrayList<String> mySignatures = bundle.getStringArrayList("INAPP_DATA_SIGNATURE_LIST");
+				
+
+				if (myPurchases == null || myPurchases.size() == 0){
+//					Log.d("godot", "No purchases!");
+					godotPaymentV3.callbackPurchased("", "", "");
+					return;
+				}
+		
+//				Log.d("godot", "# products are purchased:" + myPurchases.size());
+				for (int i=0;i<myPurchases.size();i++)
+				{
+					
+					try{
+						String receipt = myPurchases.get(i);
+						JSONObject inappPurchaseData = new JSONObject(receipt);
+						String sku = inappPurchaseData.getString("productId");
+						String token = inappPurchaseData.getString("purchaseToken");
+						String signature = mySignatures.get(i);
+//						Log.d("godot", "purchased item:" + token + "\n" + receipt);
+
+						pc.setConsumableValue("ticket_signautre", sku, signature);
+						pc.setConsumableValue("ticket", sku, receipt);
+						pc.setConsumableFlag("block", sku, true);
+						pc.setConsumableValue("token", sku, token);
+
+						godotPaymentV3.callbackPurchased(receipt, signature, sku);
+					} catch (JSONException e) {
+					}
+				}
+
+			}
+		}catch(Exception e){
+			Log.d("godot", "Error requesting purchased products:" + e.getClass().getName() + ":" + e.getMessage());
+		}
+	}
+	
 	public void processPurchaseResponse(int resultCode, Intent data) {
 		new HandlePurchaseTask(activity){
 
 			@Override
 			protected void success(final String sku, final String signature, final String ticket) {
-				godotPaymentV3.callbackSuccess(ticket, signature);
-				new ConsumeTask(mService, activity) {
-					
-					@Override
-					protected void success(String ticket) {
-//						godotPaymentV3.callbackSuccess("");
-					}
-					
-					@Override
-					protected void error(String message) {
-						godotPaymentV3.callbackFail();
-						
-					}
-				}.consume(sku);
+				godotPaymentV3.callbackSuccess(ticket, signature, sku);
 
+				if (auto_consume){
+					new ConsumeTask(mService, activity) {
+					
+						@Override
+						protected void success(String ticket) {
+//							godotPaymentV3.callbackSuccess("");
+						}
+					
+						@Override
+						protected void error(String message) {
+							godotPaymentV3.callbackFail();
+						
+						}
+					}.consume(sku);
+				}
 				
 //				godotPaymentV3.callbackSuccess(new PaymentsCache(activity).getConsumableValue("ticket", sku),signature);
 //			    godotPaymentV3.callbackSuccess(ticket);
@@ -151,7 +210,7 @@ public class PaymentsManager {
 				godotPaymentV3.callbackCancel();
 				
 			}
-			}.handlePurchaseRequest(resultCode, data);
+		}.handlePurchaseRequest(resultCode, data);
 	}
 	
 	public void validatePurchase(String purchaseToken, final String sku){
@@ -165,7 +224,7 @@ public class PaymentsManager {
 					
 					@Override
 					protected void success(String ticket) {
-						godotPaymentV3.callbackSuccess(ticket, null);
+						godotPaymentV3.callbackSuccess(ticket, null, sku);
 						
 					}
 					
@@ -192,11 +251,31 @@ public class PaymentsManager {
 		}.validatePurchase(sku);
 	}
 	
+	public void setAutoConsume(boolean autoConsume){
+		auto_consume = autoConsume;
+	}
+	
+	public void consume(final String sku){
+		new ConsumeTask(mService, activity) {
+			
+			@Override
+			protected void success(String ticket) {
+				godotPaymentV3.callbackSuccessProductMassConsumed(ticket, "", sku);
+				
+			}
+			
+			@Override
+			protected void error(String message) {
+				godotPaymentV3.callbackFail();
+				
+			}
+		}.consume(sku);
+	}
+	
 	private GodotPaymentV3 godotPaymentV3;
 	
 	public void setBaseSingleton(GodotPaymentV3 godotPaymentV3) {
 		this.godotPaymentV3 = godotPaymentV3;
-		
 	}
 
 }
diff --git a/platform/android/java/src/com/android/godot/payments/PurchaseTask.java b/platform/android/java/src/com/android/godot/payments/PurchaseTask.java
index 75662a442e..c1f9d164a1 100644
--- a/platform/android/java/src/com/android/godot/payments/PurchaseTask.java
+++ b/platform/android/java/src/com/android/godot/payments/PurchaseTask.java
@@ -62,7 +62,11 @@ abstract public class PurchaseTask {
 //		Log.d("XXX", "Buy intent response code: " + responseCode);
 		if(responseCode == 1 || responseCode == 3 || responseCode == 4){
 			canceled();
-			return ;
+			return;
+		}
+		if(responseCode == 7){
+			alreadyOwned();
+			return;
 		}
 			
 		
@@ -92,6 +96,6 @@ abstract public class PurchaseTask {
 
 	abstract protected void error(String message);
 	abstract protected void canceled();
-
+	abstract protected void alreadyOwned();
 	
 }

From 2e1b4ecf4b5286d795b8bdca23b87caa2a326306 Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Wed, 28 Oct 2015 10:34:02 -0300
Subject: [PATCH 20/78] Fix small memory leak

---
 tools/editor/script_editor_debugger.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp
index 8e0e7ddb49..60f2afa2c2 100644
--- a/tools/editor/script_editor_debugger.cpp
+++ b/tools/editor/script_editor_debugger.cpp
@@ -1376,7 +1376,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 	vmem_refresh->connect("pressed",this,"_video_mem_request");
 
 	MarginContainer *vmmc = memnew( MarginContainer );
-	vmmc = memnew( MarginContainer );
 	vmem_tree = memnew( Tree );
 	vmem_tree->set_v_size_flags(SIZE_EXPAND_FILL);
 	vmem_tree->set_h_size_flags(SIZE_EXPAND_FILL);

From 06e0eba4021975824fc7f3230461b7274886f61e Mon Sep 17 00:00:00 2001
From: eska <eska@eska.me>
Date: Wed, 28 Oct 2015 18:21:45 +0100
Subject: [PATCH 21/78] Set World2D default angular damp per global
 `physics_2d/default_angular_damp`

---
 scene/resources/world_2d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp
index d8d9c5b675..3b1f1d2346 100644
--- a/scene/resources/world_2d.cpp
+++ b/scene/resources/world_2d.cpp
@@ -374,7 +374,7 @@ World2D::World2D() {
 	Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_GRAVITY,GLOBAL_DEF("physics_2d/default_gravity",98));
 	Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_GRAVITY_VECTOR,GLOBAL_DEF("physics_2d/default_gravity_vector",Vector2(0,1)));
 	Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_LINEAR_DAMP,GLOBAL_DEF("physics_2d/default_density",0.1));
-	Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_ANGULAR_DAMP,GLOBAL_DEF("physics_2d/default_density",1));
+	Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_ANGULAR_DAMP,GLOBAL_DEF("physics_2d/default_angular_damp",1));
 	Physics2DServer::get_singleton()->space_set_param(space,Physics2DServer::SPACE_PARAM_CONTACT_RECYCLE_RADIUS,1.0);
 	Physics2DServer::get_singleton()->space_set_param(space,Physics2DServer::SPACE_PARAM_CONTACT_MAX_SEPARATION,1.5);
 	Physics2DServer::get_singleton()->space_set_param(space,Physics2DServer::SPACE_PARAM_BODY_MAX_ALLOWED_PENETRATION,0.3);

From b0b0f35e2cc6b2e95672a672ea599a22bb53ebd4 Mon Sep 17 00:00:00 2001
From: neikeq <ignalfonsore@gmail.com>
Date: Thu, 29 Oct 2015 20:37:09 +0100
Subject: [PATCH 22/78] Added some demo icons

---
 demos/2d/area_input/engine.cfg               |   1 +
 demos/2d/area_input/icon.png                 | Bin 0 -> 1684 bytes
 demos/2d/dynamic_collision_shapes/engine.cfg |   1 +
 demos/2d/dynamic_collision_shapes/icon.png   | Bin 0 -> 844 bytes
 demos/2d/hdr/engine.cfg                      |   1 +
 demos/2d/hdr/icon.png                        | Bin 0 -> 2670 bytes
 demos/2d/isometric_light/engine.cfg          |   1 +
 demos/2d/isometric_light/icon.png            | Bin 0 -> 3638 bytes
 demos/2d/light_mask/engine.cfg               |   1 +
 demos/2d/light_mask/icon.png                 | Bin 0 -> 3344 bytes
 demos/2d/lights_shadows/engine.cfg           |   1 +
 demos/2d/lights_shadows/icon.png             | Bin 0 -> 2733 bytes
 demos/2d/navpoly/engine.cfg                  |   1 +
 demos/2d/navpoly/icon.png                    | Bin 0 -> 2420 bytes
 demos/2d/normalmaps/engine.cfg               |   1 +
 demos/2d/normalmaps/icon.png                 | Bin 0 -> 4876 bytes
 demos/2d/screen_space_shaders/engine.cfg     |   1 +
 demos/2d/screen_space_shaders/icon.png       | Bin 0 -> 3341 bytes
 demos/2d/sdf_font/engine.cfg                 |   1 +
 demos/2d/sdf_font/icon.png                   | Bin 0 -> 1534 bytes
 demos/2d/splash/engine.cfg                   |   1 +
 demos/2d/splash/icon.png                     | Bin 0 -> 3408 bytes
 demos/2d/sprite_shaders/engine.cfg           |   1 +
 demos/2d/sprite_shaders/icon.png             | Bin 0 -> 3934 bytes
 demos/3d/navmesh/icon.png                    | Bin 0 -> 2803 bytes
 demos/3d/sat_test/engine.cfg                 |   1 +
 demos/3d/sat_test/icon.png                   | Bin 0 -> 2699 bytes
 demos/gui/rich_text_bbcode/engine.cfg        |   1 +
 demos/gui/rich_text_bbcode/icon.png          | Bin 0 -> 2293 bytes
 demos/misc/instancing/engine.cfg             |   1 +
 demos/misc/instancing/icon.png               | Bin 0 -> 2185 bytes
 31 files changed, 15 insertions(+)
 create mode 100644 demos/2d/area_input/icon.png
 create mode 100644 demos/2d/dynamic_collision_shapes/icon.png
 create mode 100644 demos/2d/hdr/icon.png
 create mode 100644 demos/2d/isometric_light/icon.png
 create mode 100644 demos/2d/light_mask/icon.png
 create mode 100644 demos/2d/lights_shadows/icon.png
 create mode 100644 demos/2d/navpoly/icon.png
 create mode 100644 demos/2d/normalmaps/icon.png
 create mode 100644 demos/2d/screen_space_shaders/icon.png
 create mode 100644 demos/2d/sdf_font/icon.png
 create mode 100644 demos/2d/splash/icon.png
 create mode 100644 demos/2d/sprite_shaders/icon.png
 create mode 100644 demos/3d/navmesh/icon.png
 create mode 100644 demos/3d/sat_test/icon.png
 create mode 100644 demos/gui/rich_text_bbcode/icon.png
 create mode 100644 demos/misc/instancing/icon.png

diff --git a/demos/2d/area_input/engine.cfg b/demos/2d/area_input/engine.cfg
index 3227e9278f..8fa2e15beb 100644
--- a/demos/2d/area_input/engine.cfg
+++ b/demos/2d/area_input/engine.cfg
@@ -2,3 +2,4 @@
 
 name="Area 2D Input Events"
 main_scene="res://input.scn"
+icon="res://icon.png"
diff --git a/demos/2d/area_input/icon.png b/demos/2d/area_input/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9bb88169321f8d5af74c5f0b30d7f1e24b454bd
GIT binary patch
literal 1684
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

literal 0
HcmV?d00001

diff --git a/demos/2d/dynamic_collision_shapes/engine.cfg b/demos/2d/dynamic_collision_shapes/engine.cfg
index 536b75f2f2..76a074f346 100644
--- a/demos/2d/dynamic_collision_shapes/engine.cfg
+++ b/demos/2d/dynamic_collision_shapes/engine.cfg
@@ -2,3 +2,4 @@
 
 name="Run-Time CollisionShape"
 main_scene="res://dynamic_colobjs.scn"
+icon="res://icon.png"
diff --git a/demos/2d/dynamic_collision_shapes/icon.png b/demos/2d/dynamic_collision_shapes/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac01d401ba3d67a101279daf54aba35db9515b65
GIT binary patch
literal 844
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4rT@hhPm4t-!L#R{15O6arN=>v2`tYC@Sjh
z?c?p^`{tLBm#^;=5fN+WB1iW$Th}~$w;Wf`I1jH-4-a2oA5SmufG{_=PyYqnJtI85
zgT1_bqn({!2n)aeD`@FhWbc;k=I7_>>w7?6-qg0l)!W<0%PTa@wXxmovZUm7ad8K?
zOego0$SAjTJG(+Ft1@%*YGdQ>iAF7kh7E>>6ZG`vXlWh4qI6M8>YS9+qjzEtL`9#8
zh<yFe=NXvp<QU-N?cF!iB_qo*!NDQh)^^`1t;MU=kIBm35f?YID)II8Zs>N8PjD$N
zv!AuZx~9Qu_A-;L2Xtp>Yp>X#vE_i$awVmmii#@~71zqj-gqi;`-ON-p??7b0~3d*
zi(^Q{;kVPSZ<}o(;HtVo!|bR;^G3$+Qr{>2_%`j{>;LuMk0eT3m!#;Pah5w&clFc9
zna0g-3hK}IAF;4EH~L%Gc0s4PsUp;IMUm<}od<htIZ9*;tgO%9-pe5Q;?CV(2Qin!
z0*>eQAC}=eJ(Hz`)oC|_-!g-S{Ti9iRx({xvRU;1W~<1Leexg9`-&bjDcRS3U{=kK
zUvEEuIwtg!GeKl)RDyTT`l_ZHhZ}m)ZwfgliLh_s{#d2WZMgM<XeRRnr@+a!d*5-Y
zNU!1%-Xs$G!Q*$Fm{3cu!y-qyuCNa7h?7i5g*$y4mU8t)NH;#am(H`{fl}T)BPLU&
z<3>*wKVY17Y7Il+VS!H<HyoHFTCwc_)6<NO+2?1UG@G*VK$Eh;)D<k}^1g3Rzr)gC
zA}EoSY?$ZxrT)F`lfA2*eL5x5x1Z;*c~F?=!j#=|L46U2v`x`R*98-%JN}W>4t$dT
zZN;Ze=S&%v7~VZTua*Dn38&9RwVvA<gwMQGn{>aaR^~|6T%U%xNbO694<GWE%RZxX
z`^=@;IoXBmhYhRcZ+LdHB}|C=yy5!$@8%D;9NimoRmt#()pxI)=yk87#DyLNUlXx$
zPJ6ZW-5)>GvWZoPCD!j&ejeZ+8d|`lDPaFjdw2Np)4uW!Gpg)+>lB`xouhGf)!cun
zUt|@hJS|i!+k0vkvr)nfS>_bw`q@waOr2lUsNTG}uX#2D0|SGntDnm{r-UW|bOLEh

literal 0
HcmV?d00001

diff --git a/demos/2d/hdr/engine.cfg b/demos/2d/hdr/engine.cfg
index 3d8b4222d5..ab53a022f0 100644
--- a/demos/2d/hdr/engine.cfg
+++ b/demos/2d/hdr/engine.cfg
@@ -2,6 +2,7 @@
 
 name="HDR for 2D"
 main_scene="res://beach_cave.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/2d/hdr/icon.png b/demos/2d/hdr/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2df0ec38e9e67a98f7b0d92f6385280911a2d4bd
GIT binary patch
literal 2670
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
C9wEB`

literal 0
HcmV?d00001

diff --git a/demos/2d/isometric_light/engine.cfg b/demos/2d/isometric_light/engine.cfg
index 08393f1724..a5b053aa95 100644
--- a/demos/2d/isometric_light/engine.cfg
+++ b/demos/2d/isometric_light/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Isometric 2D + Lighting"
 main_scene="res://map.scn"
+icon="res://icon.png"
 
 [input]
 
diff --git a/demos/2d/isometric_light/icon.png b/demos/2d/isometric_light/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3de9749729eda77c7adbfcbc83404eff7fba310b
GIT binary patch
literal 3638
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
W{q@+o<8=%S3=E#GelF{r5}E*;aIH-M

literal 0
HcmV?d00001

diff --git a/demos/2d/light_mask/engine.cfg b/demos/2d/light_mask/engine.cfg
index 8b0ae6f61d..39608669ab 100644
--- a/demos/2d/light_mask/engine.cfg
+++ b/demos/2d/light_mask/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Using Lights As Mask"
 main_scene="res://lightmask.scn"
+icon="res://icon.png"
 
 [rasterizer]
 
diff --git a/demos/2d/light_mask/icon.png b/demos/2d/light_mask/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c12b045e62ef34deb3f4b2482ec91e3b3cf4c8fe
GIT binary patch
literal 3344
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

literal 0
HcmV?d00001

diff --git a/demos/2d/lights_shadows/engine.cfg b/demos/2d/lights_shadows/engine.cfg
index 771288c209..80142633d3 100644
--- a/demos/2d/lights_shadows/engine.cfg
+++ b/demos/2d/lights_shadows/engine.cfg
@@ -2,6 +2,7 @@
 
 name="2D Lighting"
 main_scene="res://light_shadows.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/2d/lights_shadows/icon.png b/demos/2d/lights_shadows/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7f9e13bae9bf2213703973448987e3ba078cc8e
GIT binary patch
literal 2733
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

literal 0
HcmV?d00001

diff --git a/demos/2d/navpoly/engine.cfg b/demos/2d/navpoly/engine.cfg
index 40515dd3d2..b750419915 100644
--- a/demos/2d/navpoly/engine.cfg
+++ b/demos/2d/navpoly/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Navigation Polygon (2D)"
 main_scene="res://navigation.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/2d/navpoly/icon.png b/demos/2d/navpoly/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..df7fb43633f292c0a881d426962211ae9907f4b2
GIT binary patch
literal 2420
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

literal 0
HcmV?d00001

diff --git a/demos/2d/normalmaps/engine.cfg b/demos/2d/normalmaps/engine.cfg
index f0002dc2b8..4f9f4f67f0 100644
--- a/demos/2d/normalmaps/engine.cfg
+++ b/demos/2d/normalmaps/engine.cfg
@@ -2,6 +2,7 @@
 
 name="2D Normal Mapping"
 main_scene="res://normalmap.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/2d/normalmaps/icon.png b/demos/2d/normalmaps/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e5d835005653fb24498adf8a4fb82baf6791067
GIT binary patch
literal 4876
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

literal 0
HcmV?d00001

diff --git a/demos/2d/screen_space_shaders/engine.cfg b/demos/2d/screen_space_shaders/engine.cfg
index 527e2f8f0a..383ca7bf11 100644
--- a/demos/2d/screen_space_shaders/engine.cfg
+++ b/demos/2d/screen_space_shaders/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Screen-Space Shaders"
 main_scene="res://screen_shaders.scn"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/2d/screen_space_shaders/icon.png b/demos/2d/screen_space_shaders/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..65247f9ae7588542738d4ad6b33b178cf932969b
GIT binary patch
literal 3341
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

literal 0
HcmV?d00001

diff --git a/demos/2d/sdf_font/engine.cfg b/demos/2d/sdf_font/engine.cfg
index bdf26ce741..bf983041fa 100644
--- a/demos/2d/sdf_font/engine.cfg
+++ b/demos/2d/sdf_font/engine.cfg
@@ -2,3 +2,4 @@
 
 name="Signed Distance Field Font"
 main_scene="res://sdf.scn"
+icon="res://icon.png"
diff --git a/demos/2d/sdf_font/icon.png b/demos/2d/sdf_font/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..be9fefa8b0692ff7c8cb7a926e84e358cc2ab358
GIT binary patch
literal 1534
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

literal 0
HcmV?d00001

diff --git a/demos/2d/splash/engine.cfg b/demos/2d/splash/engine.cfg
index cb50c7b1be..e461426305 100644
--- a/demos/2d/splash/engine.cfg
+++ b/demos/2d/splash/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Splash Screen"
 main_scene="res://splash.xml"
+icon="res://icon.png"
 
 [display]
 
diff --git a/demos/2d/splash/icon.png b/demos/2d/splash/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..88620eb35bc308b46f11b91c4c0e8978acbe6a66
GIT binary patch
literal 3408
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4rT@hhPm4t-!L#RGX(gAxH2#>*!#y#S+~R5
zE7Hl?#U!H4-QC?Jyv!`R$|STT#MjH*&bfEho;??D{r~^}tdoUtXsJa)y=6-CB^N8F
zs;Q<?mFBTErV-`VnQb?Z`MWteoN_dGuAOo1u-|1@t1E|mt-XVTeLU}+4EA<)zI4Fn
z{9f;Sr^6il!yU^f-98?0|4c-LzxQ-~^=?fi`;rN#cX>6d$_043ZLu=kYh@4}<bTxO
z)V{FSHn;27&z}#@MO#^zuQS)%X>D}w+&S0a$gNwq#f1b+)KQtyrF7--%Oi&m@7uel
zrKNS_LfflXudZFYHYXu^|9aP5yLPTvvBI@sc6WDob!ElQm5z?KHmhb?`)t4U@y4}d
zM~_aNI5D(-LP}()nY;gTW9=^=KkU79=j6$gjrDcMwz!@2uzB<9)&2tqHg4QFefsn#
zm-?^Ql-We27S$&Q1%)h|Vzt0j_rk>s8S9SBS+Zi`!iA3Uxy@P0fpLiiL4I?3%~l_~
zeCE`t6DLmCcQ0`*?+qwvb17(A@9FUL(W4tTZp3cA<h}M>_T-fweJg@m=J`}kj4vql
z&Me&LY&EsrblTR#OEzpdzGJFmO<#UnkzsYhyuD{@cARluba3_dJ=T*q96Ppb!Tfo<
zCiYv`wMI9#loS<NMizzVB%eJHTh|d29Ub%ZV)Tv;(KWR`uAbh9yd7pwus1hR`TX?B
z*0VP^A2>RD&fLDK)3aJ8ZSL;aT35BEI6o~lEwwCl`rMS&%M)tK9QxYrz1;K@#f2Uo
z*jwE*<#1-w(VZa|4+eKc1XX#tWO}$XnH$yVX)K;DpQ9l4@b>MaXV0D9wsrC1#V4mv
zF0OC(D=#;xDRys5?Vpl3dtSV0R`kro$n2t^Nj?6vgZ(<%Y}PN7KXU!igVQHVSL_a%
zx2<vc=9}x+OrE!-W%|N%^XDv?HS2VH)10P8`_#H?Co7FQQkTpMI~?Y_rpY5G)o609
z;l$bVpIw<ap`swUA%9C$h?%3CgaltCALoUWyLaqczIbWP?sb)mW~3*yhb>>=mzC_d
zZH;e~gVX(mbFW;S9;c@@rCq~YBR_?Kfq}0i$S;_|_n+bZMT_>|zJ2?){r;?df&Um7
zI6r#2IEF+VPMI9<5fvzNe6I4ggKVm)T)SfgWN$j})2!a{qhS5Y7io)D=+9bEEwNB6
z`IV8!Ts6(&NZo5!PAOdYl&ERvvG3RoH%Gz1K>gmmJl{6G%`~|2US{hRyQ+uf_0MbU
zpWmt1IkR?M_1#>boavixzI}F5ZesMwCAZV>yxw&*tLV31x%I|3$wv|-+l@>cBXpi!
z|F+9|NAd2BHTBO=+><)T&v!`e(r=~{${ZKAUasd}fB(McuR`1Z92(aP=J9ug@3Kzc
z^uGCl-{U3xE5c8jb}ZiG&~S<A#3#Y6CDnV>=hZWaUnp;mQSN8e;Hy02^LoucyF3e-
zedk~8nmB*Qx$d7V2lE-8)*bh`;VS-G?|avcVjsy*8oGf}aba3hdkvf2Lc}M0<-A=R
zlXtmr`qfGDF^3;KRXw%1SzP#KU4)wL#K`*>xE&ojekOgn&+a@q`(Ucr{i;1xXE)d#
z%w4J<d~vdi@ISBF3)nADZ_asqi}$smUWtY6^@5!<BY7Pssn~U>cqK-hUDR@D#w|BC
z)r!J=n^U=^YhD*hymgV-t$1SL8iu>OBW)z+Zm!z<Gs9n-olWs(!I>CNi_$7D3%;L=
zBlzbO?WtUUHM`f{qN0$&_f!w3W8*(VKW3E!DvG=U`X2)xBqb_7Y;>;s_xR4^!c)S_
z_h`P5*YIT7SX}A+ftCA5vgC^8U0JQyR))^VF`Iq=Nq|MovL8y(fvpQm_X;SSn#0F9
zL9~OF=`Ul*QR8i$MH)VKr<N84noVvl`Wd{CNtwUEV!9|N$B&a~UB@4pKA7@gv2wpf
zz)FAFDW}f=h*|YAbL#2i0a{&!(&fIlxFvcuTa^}m*d&=PIOU;gaGrCjW{br2EvM2J
zPiXkGI>heSL%w&jL_R9Y`A2PRevm#}L1@~?N!A}uP87YeN^ghcl%+XSPCwoJaL*yx
zFUDP0UT55RZF0bL!qSz?9K?7pZ`saLxG!R}?&Omd&vUjf-mrW1tZg&@)a^eNs-Yv|
zaKK{AyD8@RTkFI-9X1*(AKsvJ++^)pCn=uf_<+~!x6igXEwq$wHDq;OsPLFiQ{>j<
zD|4=9{aq}m*qSlFowagSnWKb)%VwjMAzIp1exh!R4VNbPd=QWfk(PZ|xihS8+9sy`
zyh=F=rz0LLeHm}zC-7}=hX_Z7*jz_}6HklQhG}1SlD#tT%<89E{xy6Z{hlr}=7=Oj
zX8w{r!Wi`VxkXP^w4i^}S-%xmU#S;Z1irPI`F(}G=u+o~lEZQ4ZxR?|4%y47b3T3l
zcyinfL0z%wX49t~n?B8KyV>#M^A*mC>Cbzq)^5;V#%bnp!LobV%lrv$8p6lJ-aBt`
zONdx*Jp1gfhgn;*%<P%B#ktxa{xw-+^P-6f%_<i}93nXE59`gHUv1SegNI@D>eceP
zVyD|D2HyQtRFc5)OKxZS>K%(V-c~)akw-R6MQG!j2~I6VmO?LOcO*SiHu(JNW&1?I
z*sb?AoyeWi`E%WIri*e}8><>m&I#a%4*K^d_tV$6zfV4Vcv0}oixuZ`4!&K%F6Z+o
zpnv-W83$bf2Ik*N0k7t7=eW1;R*lg=A9Eh5A1^l~JlJaZ!j3y%!&GW_nq=t)hG3_r
z!&QHmT^Fjbkmp)GH>=>lT9yq5Hce=n{^+dt(zws!Pd7fOzy4I}Qi#N{kE|Elo6_Z<
zEzdoYBL6MXy5QP2i;`=%7Oj4^t7p^JiMe-=#VpNUyd@??L~3TjwP^uCx7=K#OqNMJ
zQ}xtUJngjTlhd-Y{SMz(%=>Pep7Ph_{O-p;|Id3~d%u{?T{GZc?cugJpPyPBdbQU!
zTw8l}S6rTxvv}x}wYsMQwB|oDKYi@+@l!J0;c~%U9&YZQUO!Wv%gV}jOkbg;r6;Om
zAJaNdX3x|jF1@^Sv0E1HSmm+u&PGA`lj_e8@g0A(UNZCGy{^EbKf8nq=WNt|`&4xM
zbKTRCh2oZB7p}HezFDwq$Er;kxd(&x?5&n>`TSY7&)m>aQB&`J_V(M?_0%j5wHK_}
zQ}V>=+^4xMd+wYqVbZ>KYij6J+nuxh=k58jbd8P--*bD3y~*kxdGlZO9!*M@`PuSe
z=Iy7FlKtD>+i%EFU#hOp|9w*x|GF@pvQ@jJj;HDiOu5sWIzdjQv{bI&-As6*r>I)<
z!347zKFcm$3ff#bt>I>lntX+onSxrYlh)KKj?&UeGg%DZORm<|d{}9`ljrfeNza~b
z-_xz;&0!;Ztv9f_!$nQ_k<rX8H+dOimdu{-y6W>;W*LSGcJCOQ_phD_ykEe5lil7|
z?PyBljPM-RF6%DNo(7L4_5v4N8$U_3?@rjNc(;j()kL35>EJ)dhP#YwjCm%kc>g{>
zgXzVUmpOqF884+DF1WWWx|wOt5qsGQd#<!JU7OvzJz>6{0LPAphNo}j@Z4q)NS&c^
z=huZFi5#;e?jG8raJTVI{K3>4M_-g2HfX4ny_WV`@zAE}oe#prO*WbZE;wNF)*;8y
zYuSaDJgj>I`kPoxHq3Bmy!@`sOk|CD+S96!I-7eqGPpAvcd*=OERSw!_S2DN$VilQ
zJW%E&&vi#opPl<wWZFCphh`^%3pSzxR>ij^*jNvK5xJ#&p@E4@Jawk;|Fw*&cMp2l
z9zQF4@RkhEMxJEl)fI<%|7!fWaqrqS_h-|^0@OHLa#IQ}if=JE!=S^tX+^@#Z@v$<
z8Sd!lHP1KGYj4Sw6Xjq#T5mq-`&Pf}yzeIGZrgs~Z1vr?kJDuC1V{@nZMxR|Ky<sI
zExXc$zoI5AF*QundS1l%9>~3IVlrj(J>GXhMe66)o{J87(0a9zwW(oAD__PuiET~0
z>%`9YGj89||9m!sg}I)M$_K?qyFW4?f4DMDE<bgWxS(9R=G`-ECukf!e&LVAj_nmW
zal9T$H+<w?Bq|j6CZ`=%SfghB;^Pz{m9WKO*=III=+wE)juhr<{dMekbe=#|)4_xn
z$NRP0C(gV6`0>JP*RBa1U3JweTSqE>S@0y!4Ou!;jfb=&BP0F(h;m-b2sz5GDYmy@
z?NyKdsQpKSGD^KpMDCr~rYqLFYQwP%*EtynwIYtMk23$AAXs!^k=k^wfJV2+##ySD
zdpo8c6ZBmepRJPcC1aK_Q{~JjHENyNo^2dgE~{SdIOBPkgR93+U01GVYwHKDdKSBj
z$5;zezGR2keKk2LV!0?ZGlXfMly(zW_J^6@?)|NJ75pdC=BuUL|C)ERWCB-zomsV2
z%Du{7Z;{-6ndOr%YfUV*+aLGFu)=n#&0MS5UH9wfSJmlNn*FSqT4VGoO2>Tao{B{i
zxJ)`ug?GDZ+z(R=zWMR<d-X@}CkvnKJbLo;6Z=o0ELFa`(-!OR58j|Vl|wLreaX>$
z{^#fGZ(O|S$oKi<g+Mi*#(#p=GnDq#_=jHp#<?#_NuBNQ`=9@f4A~F9Dtg1@{^{1r
zi1?IKTO=jKSe*J<q$cdI4&O2TQ{K6hG#}wp{~4eCNiWqfeQL?Tz`)??>gTe~DWM4f
Dp<-_H

literal 0
HcmV?d00001

diff --git a/demos/2d/sprite_shaders/engine.cfg b/demos/2d/sprite_shaders/engine.cfg
index 09f9a59566..17bdada188 100644
--- a/demos/2d/sprite_shaders/engine.cfg
+++ b/demos/2d/sprite_shaders/engine.cfg
@@ -2,3 +2,4 @@
 
 name="2D Shaders for Sprites"
 main_scene="res://sprite_shaders.scn"
+icon="res://icon.png"
diff --git a/demos/2d/sprite_shaders/icon.png b/demos/2d/sprite_shaders/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b044b31f931ff49ad301567bb69b942fce247b96
GIT binary patch
literal 3934
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

literal 0
HcmV?d00001

diff --git a/demos/3d/navmesh/icon.png b/demos/3d/navmesh/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b354f931cf6dbd6582c4c880fad25a7f0feb5d7
GIT binary patch
literal 2803
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

literal 0
HcmV?d00001

diff --git a/demos/3d/sat_test/engine.cfg b/demos/3d/sat_test/engine.cfg
index cc215c83e8..82c688635d 100644
--- a/demos/3d/sat_test/engine.cfg
+++ b/demos/3d/sat_test/engine.cfg
@@ -2,3 +2,4 @@
 
 name="SAT Collision Test"
 main_scene="res://sat_test.xml"
+icon="res://icon.png"
diff --git a/demos/3d/sat_test/icon.png b/demos/3d/sat_test/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b89c5a7467de41aaa96e179c1886d83c5343e501
GIT binary patch
literal 2699
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

literal 0
HcmV?d00001

diff --git a/demos/gui/rich_text_bbcode/engine.cfg b/demos/gui/rich_text_bbcode/engine.cfg
index e0ea296f6d..5f68b6a0e6 100644
--- a/demos/gui/rich_text_bbcode/engine.cfg
+++ b/demos/gui/rich_text_bbcode/engine.cfg
@@ -2,3 +2,4 @@
 
 name="Rich Text Label (BBCode)"
 main_scene="res://rich_text_bbcode.scn"
+icon="res://icon.png"
diff --git a/demos/gui/rich_text_bbcode/icon.png b/demos/gui/rich_text_bbcode/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..78358ba71b27b9de3d800aa1cec1cacb61519481
GIT binary patch
literal 2293
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4rT@hhPm4t-!L#Rtq<@CaaC2-QdZXZ|Nnnu
zV~c`<s+yXXl9IZ*y3U(7Z=|Ia?%lg5UR|fFYa}bHq@!bCWMux}!2?ZAy*qdAXld!o
z%d3QkM>#pUIykr(7?{3%`QrTf3jqPauU@^fwRJQzvtGDxv6_NvM@N^3hqscswThO$
zq@=vCu;isnmx_u?V`38A+`JT=+*H+d)MS;OJbAKd)8;vI=1%CJ*xlV56cp^|7ieN)
zsj8&T@aNC-=g-fcJ-cDU#>B)F8*2x3X~n;P|Ni{>^WD35^XAQ;HEYg{88b7|vr|&i
zlakUbENmJ6|Nr{+EAzYeuU@@;{P^+Bn>VjtzkcY@;eGq|ZQZ(U%9Lr+(FxJfalygi
zK0X01uAUkqQon!yW_|kf>eZ{um#=7PX|1nstf;8Y%F0Pg%S=c}aB*?Bva++bwh<SX
z`S<VNhYuefJ$iKN)M=g_JGXD&xn|AURjXFFwRPm?7G!7VE7~~f>zk;H%N##;eAlks
z>(;GbvSjJRiIem5i^9S}y}f-+Ow1U+e`mdSpLhMnnwt93(uySua+>Pn@^YhO14ES!
zOsf)gzJLG5^yw4F`3syUPaipQl&^0;|Ee_t3l`6xzficRfA!K#(Zr0h;+V+Dn3$NT
z<fI7i!0?!84_8-@0Dre~OY0gPtyv->FSqbIg@69^=~Je}2bIS6<*YB+wmoOReuMqe
z<vi~5+y@V32p!<rx_!mMO*?n5Su$^xWaG+({fpye<_gZ7J+*Dd@6Xd0O_*@+dRtpt
ztM!8BsZ$yn>g)GxuMW_tkSH$OyQ5_Dx{~Dc1x=0lRTarmTN3@9<Grn7ZFIw;0)yk@
z0-GDXGMrtqV(nc$_2X^zbF_8l-BGeIR4}rZsg9IzixgiaCBFQi*qWtcyI+dVUn+98
zOL+Y{fd@<Yk3Z(C<l}oag?IlxuDjB#ubwf_oW^{co#D*sA8QyG*cd%s977@wpPB5L
zf7wBzE&WKvn~i&p`{kquYo)FZFbmS0t)M!4mD<@wEG<G(N&&6`x0X4HL=`f2Dzod!
zSbXCD(QaYJsVJDV`-9iKx0k<1ynk)@L%&7P>B6keS8pmetx<^H|7L!R)57g?KINAR
zHiieQ6{yT<*O^<K;9KI^F3n)7u~Fys?TPJ<yN{?#o?6+V8#XDzl_gutFmnrQ!ryg{
zN%L1#Gj`3jFH)U3x4rP*ssNdQnhA@4{HUDT{?TG-_-5h9Yuxe~nI=qgGqPS3CoyTE
zs%re?o!hcqKDIKxkz7{jxs=ym|9XX@DSwNugK6DNiPP@uzZ_w2(dC|y-TQ&-z;ic?
z!>=~{TvW<7&mgnTnz?OaRe&8=TJO%uji-GUi7t3@y8M%`;5SvVe=5zf@4txVGnN(S
z8<sKLec#Zq{_^TCEOxeEGr1Y|^Jc7YcH5w{<3>&CzU`a}Ia~f0D%pPvy>&k0?sdIK
z@{E5ZKeNQkq&zvI$uadbd-FNwQ%g&79B%ALZna21<-hoo&PSWF0^c~J?dJQK>^fI;
z^tS{)VG&%?{&O-%)S6t^HKva``;<>usR=e6I{(p)<EnK1s&0A459e9`*`F=#2<tmm
zdnZ3<$C|I#Cf(opNyq0+>XxPAuR^}wi4eLn)7!U^*WuOYTYuM2ee37{Suu`DV}|A~
zhLS=iUJtpzEqmDxNNGqHY+qBX_v7uBvK5Z2x17HBgYAHLf8W$})`)Jgd8`lf#It^X
zu!@?|s{YgI_In1QWkzcbMof_n6JvN|I(6C>mKB?;=d^H&KRr>(+Gb?%by*@;%Zp$S
zjuHm9XAvhKPpiB*_uW<gt&?Ar$V4$_Xc}ZFmzXv_*u-~BYHIzS_gkf;b0#uBn9a&K
z-%Z|F@`CxZqt3l)yH=&A9$dTNqr~Sf_6vufZz>87P;&2ejecn%-{j38!@KzmuYpBP
zHlxL}99{wciNS)0(;E6`CNA_nlA@yM#3JydTXw;1hGXx|d@ap|jdseOW-{!PlAq2{
zQrcaT%>3!!*{g+J*PZ?>me35@BGGm9^|QS<?6x?cdAdZ7&&zGI@AVp~_=!cGscauO
zS&uAYFDl%x<213knrTA*SMLkL-@A4MuuNl$+WKz$rCsr7xf+VO8_r$(n^*XE)s6GF
z<gA!WPg+*L37LCx<==TBAFltpzJFTL{%0D0<r$Wi&p+}*{O9`n|3e=It7~tZo%2xH
zd-F<`Y_HSb!YtX`95)?07-Hg*bMD&7hi{(jw7s*WYWDkg&cDl#o}QH2aOY?B=jYSi
zyrj}1)fgsgylnV?WRLpimN(injNYjFvYh<Tc=G7!@79mLC|#a8W5%SD1_!q6dVH>l
zkB?bdkMa2*sYlHdV<TpWMr<?sAj7-9?$3)U%lESO$83`M`0HnyoW0t)<x5nwx2=4C
zqIWi<kB`izLn=R_3)1dCT3VgG=1Xr*nBJVC)L50^sx}?Yl?~@Bo^MiJeZBnF(%a0@
z-a+%qe0(G?KaKG0_~k9mmlu(JoQ36O*@Fk^ucoG{t3Ek@Z?Bp2Tu#X;-4iEq-dHMs
zhwrTGwfuNp$Dnhz+aFYASWc?*ch;R$WAOdqTH{L|Yz!&S*BtQ*`ZlxrtI7Tng%eL@
zWadtkEOX+tS)zJhL^b%Pg=cjsdo#=HJrccZTr7P|(*h3husHZ^d1QX`{JB#R`?gu!
zQ3$p2l)B8ED=Z=*(N$FvI_>&(_tNc#8s)DSv@M>te(J`c9NpbBlCvTv8K!Ztr8Dzh
z=-U)(7_Qg(;M=9ZZ%)Pu+jg<-7Yk&|FgBPnV|9YWf>ecLZd(|+B6w!JRXHstr>*XB
zp<!3;!Qd(>2?HLE`-waftA9UC%iP%Mz`W$6<c7*1=Vqp5jE~sAX?&bNN7XicmC*k$
zVufx?G?JK)AJUq@_|-vQL{p<=YqG=vg+S$HN2AW<U%I5Dd;69R^U6o!<;*jeC9J!<
z?vA}DqYRtyH3N-uQBhIN<ZH);9woh5^C!upm2+{T@)7=0Ik~@9JPFJtHX&1N8xmUe
zwrR<>OsrK{%DSi|*ZWM4cS&ifa*iX50HY(PwqfL60TH&hcOn`k4<|4%c%5-A+|BI!
Rhk=2C!PC{xWt~$(69As#Ajkj!

literal 0
HcmV?d00001

diff --git a/demos/misc/instancing/engine.cfg b/demos/misc/instancing/engine.cfg
index 52a28a3fce..76b0c97721 100644
--- a/demos/misc/instancing/engine.cfg
+++ b/demos/misc/instancing/engine.cfg
@@ -2,6 +2,7 @@
 
 name="Scene Instancing Demo"
 main_scene="res://container.scn"
+icon="res://icon.png"
 
 [physics_2d]
 
diff --git a/demos/misc/instancing/icon.png b/demos/misc/instancing/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a6de677c5f07f5779df9b8d0050863e40bb61da
GIT binary patch
literal 2185
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

literal 0
HcmV?d00001


From 18392e28b6ab689ce334bc112f259b5d8be5c2ce Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Thu, 29 Oct 2015 20:44:12 -0300
Subject: [PATCH 23/78] Fix "Align with view" undo, fixes #1443

---
 tools/editor/plugins/spatial_editor_plugin.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index 3ab9339265..dadd8c3050 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -1957,11 +1957,11 @@ void SpatialEditorViewport::_menu_option(int p_option) {
 				if (!se)
 					continue;
 
-				Vector3 original_scale = sp->get_scale();
-				sp->set_global_transform(camera_transform);
-				sp->set_scale(original_scale);
-				undo_redo->add_do_method(sp,"set_global_transform",sp->get_global_transform());
-				undo_redo->add_undo_method(sp,"set_global_transform",se->original);
+				Transform xform = camera_transform;
+				xform.scale_basis(sp->get_scale());
+
+				undo_redo->add_do_method(sp,"set_global_transform",xform);
+				undo_redo->add_undo_method(sp,"set_global_transform",sp->get_global_transform());
 			}
 			undo_redo->commit_action();
 		} break;

From 8c0c279280015391e5620bd59428ccab99683224 Mon Sep 17 00:00:00 2001
From: Phobos Tro <phobos_tro@yahoo.com>
Date: Fri, 30 Oct 2015 19:56:07 +0800
Subject: [PATCH 24/78] Fixing memleaks in main/main.cpp

---
 main/main.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main/main.cpp b/main/main.cpp
index 9cd190a0e8..ef056d3219 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -796,7 +796,6 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 	main_args.clear();
 	
 	print_help(execpath);
-	
 
 	if (performance)
 		memdelete(performance);
@@ -812,6 +811,8 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 		memdelete(packed_data);
 	if (file_access_network_client)
 		memdelete(file_access_network_client);
+	if(path_remap)
+		memdelete(path_remap);
 
 // Note 1: *zip_packed_data live into *packed_data
 // Note 2: PackedData::~PackedData destroy this.
@@ -820,7 +821,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 //		memdelete( zip_packed_data );
 //#endif
 
-
+	unregister_core_driver_types();
 	unregister_core_types();
 	
 	OS::get_singleton()->_cmdline.clear();

From 825bc8b2932acf779703fbfa541725ce432546b1 Mon Sep 17 00:00:00 2001
From: eska <eska@eska.me>
Date: Sun, 1 Nov 2015 10:33:28 +0100
Subject: [PATCH 25/78] Add default focus StyleBox to MenuButton

---
 scene/resources/default_theme/default_theme.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 7e36366e74..ce042eac99 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -311,6 +311,7 @@ void make_default_theme() {
 	t->set_stylebox("pressed","MenuButton", sb_button_pressed );
 	t->set_stylebox("hover","MenuButton", sb_button_pressed );
 	t->set_stylebox("disabled","MenuButton", make_empty_stylebox(0,0,0,0) );
+	t->set_stylebox("focus","MenuButton", sb_button_focus );
 
 	t->set_font("font","MenuButton", default_font );
 

From fc2c3bda5c637b82d00b42e5da948a09b8bd9aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sun, 1 Nov 2015 17:50:44 +0100
Subject: [PATCH 26/78] Fix arguments parsing in the main function

Fixes #2611 which was a regression from 692216b86ab97db91e7ff3903ffc9ac8e37433f6.
The bogus behaviour considered that if there were more than one arguments left to parse,
they would be a pair of arguments (switch and its parameter), and thus skipped the next
argument in all cases (thus potentially skipping a "-editor", which triggered #2611).

This is fixed by checking first for arguments that don't expect a parameter, and only
afterwards for arguments that expect a parameter. And if a "pair" of arguments is not
valid, we no longer increment the counter.
---
 main/main.cpp | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/main/main.cpp b/main/main.cpp
index 9cd190a0e8..3ef357e253 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1007,8 +1007,21 @@ bool Main::start() {
 	bool export_debug=false;
 	List<String> args = OS::get_singleton()->get_cmdline_args();
 	for (int i=0;i<args.size();i++) {
+		//parameters that do not have an argument to the right
+		if (args[i]=="-nodocbase") {
+			doc_base=false;
+		} else if (args[i]=="-noquit") {
+			noquit=true;
+		} else if (args[i]=="-convert_old") {
+			convert_old=true;
+		} else if (args[i]=="-editor" || args[i]=="-e") {
+			editor=true;
+		} else if (args[i].length() && args[i][0] != '-' && game_path == "") {
+			game_path=args[i];
+		}
 		//parameters that have an argument to the right
-		if (i < (args.size()-1)) {
+		else if (i < (args.size()-1)) {
+			bool parsed_pair=true;
 			if (args[i]=="-doctool") {
 				doc_tool=args[i+1];
 			} else if (args[i]=="-script" || args[i]=="-s") {
@@ -1037,20 +1050,13 @@ bool Main::start() {
 			} else if (args[i]=="-dumpstrings") {
 				editor=true; //needs editor
 				dumpstrings=args[i+1];
+			} else {
+				// The parameter does not match anything known, don't skip the next argument
+				parsed_pair=false;
+			}
+			if (parsed_pair) {
+				i++;
 			}
-			i++;
-		}
-		//parameters that do not have an argument to the right
-		if (args[i]=="-nodocbase") {
-			doc_base=false;
-		} else if (args[i]=="-noquit") {
-			noquit=true;
-		} else if (args[i]=="-convert_old") {
-			convert_old=true;
-		} else if (args[i]=="-editor" || args[i]=="-e") {
-			editor=true;
-		} else if (args[i].length() && args[i][0] != '-' && game_path == "") {
-			game_path=args[i];
 		}
 	}
 

From 399b1b047498d154440f5cda4a5ceb08ea3de68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sun, 1 Nov 2015 20:53:26 +0100
Subject: [PATCH 27/78] Cosmetic fixes to SCons buildsystem

- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
---
 SConstruct                          | 51 +++++++++++++++--------------
 bin/tests/SCsub                     |  2 --
 core/SCsub                          |  2 --
 core/bind/SCsub                     |  2 --
 core/io/SCsub                       |  2 --
 core/math/SCsub                     |  2 --
 core/os/SCsub                       |  2 --
 drivers/SCsub                       |  1 -
 drivers/alsa/SCsub                  |  2 --
 drivers/builtin_zlib/SCsub          |  2 +-
 drivers/chibi/SCsub                 |  2 --
 drivers/dds/SCsub                   |  1 -
 drivers/etc1/SCsub                  |  1 -
 drivers/gl_context/SCsub            |  1 -
 drivers/gles2/shaders/SCsub         |  2 --
 drivers/jpg/SCsub                   |  1 -
 drivers/mpc/SCsub                   |  1 -
 drivers/nedmalloc/SCsub             |  1 -
 drivers/nrex/SCsub                  |  2 --
 drivers/ogg/SCsub                   |  1 -
 drivers/openssl/SCsub               |  2 --
 drivers/png/SCsub                   |  1 -
 drivers/squish/SCsub                |  1 -
 drivers/theora/SCsub                |  3 --
 drivers/unix/SCsub                  |  2 --
 drivers/vorbis/SCsub                |  2 --
 drivers/webp/SCsub                  |  1 -
 drivers/windows/SCsub               |  2 --
 main/SCsub                          |  2 --
 modules/SCsub                       |  2 --
 modules/gdscript/SCsub              |  2 --
 modules/gridmap/SCsub               |  3 --
 platform/android/SCsub              |  4 +--
 platform/bb10/SCsub                 |  1 -
 platform/flash/SCsub                |  2 --
 platform/windows/SCsub              |  2 +-
 scene/2d/SCsub                      |  2 --
 scene/3d/SCsub                      |  4 +--
 scene/SCsub                         |  2 --
 scene/animation/SCsub               |  2 --
 scene/audio/SCsub                   |  2 --
 scene/gui/SCsub                     |  2 --
 scene/io/SCsub                      |  2 --
 scene/main/SCsub                    |  2 --
 scene/resources/SCsub               |  1 -
 scene/resources/default_theme/SCsub |  2 --
 servers/SCsub                       |  2 --
 servers/audio/SCsub                 |  2 --
 servers/physics/SCsub               |  2 --
 servers/physics/joints/SCsub        |  3 --
 servers/physics_2d/SCsub            |  1 -
 servers/spatial_sound/SCsub         |  2 --
 servers/spatial_sound_2d/SCsub      |  2 --
 servers/visual/SCsub                |  2 --
 tools/SCsub                         |  2 --
 tools/collada/SCsub                 |  2 --
 tools/doc/SCsub                     |  2 --
 tools/docdump/SCsub                 |  2 --
 tools/editor/SCsub                  | 11 +++----
 tools/editor/fileserver/SCsub       |  4 ---
 tools/editor/icons/SCsub            | 19 +++++------
 tools/editor/io_plugins/SCsub       |  4 ---
 tools/editor/plugins/SCsub          |  4 ---
 tools/freetype/SCsub                |  4 +--
 tools/pck/SCsub                     |  1 -
 65 files changed, 46 insertions(+), 159 deletions(-)

diff --git a/SConstruct b/SConstruct
index 0087d97af3..05c53a15fc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -59,7 +59,7 @@ platform_arg = ARGUMENTS.get("platform", False)
 if (os.name=="posix"):
 	pass
 elif (os.name=="nt"):
-    if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
+	if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
 		custom_tools=['mingw']
 
 env_base=Environment(tools=custom_tools,ENV = {'PATH' : os.environ['PATH']});
@@ -185,7 +185,7 @@ if selected_platform in platform_list:
 	if env['vsproj']=="yes":
 		env.vs_incs = []
 		env.vs_srcs = []
-		
+
 		def AddToVSProject( sources ):
 			for x in sources:
 				if type(x) == type(""):
@@ -197,12 +197,12 @@ if selected_platform in platform_list:
 					basename = pieces[0]
 					basename = basename.replace('\\\\','/')
 					env.vs_srcs = env.vs_srcs + [basename + ".cpp"]
-					env.vs_incs = env.vs_incs + [basename + ".h"]					
-					#print basename	
-		env.AddToVSProject = AddToVSProject				
-		
+					env.vs_incs = env.vs_incs + [basename + ".h"]
+					#print basename
+		env.AddToVSProject = AddToVSProject
+
 	env.extra_suffix=""
-	
+
 	if env["extra_suffix"] != '' :
 		env.extra_suffix += '.'+env["extra_suffix"]
 
@@ -229,7 +229,7 @@ if selected_platform in platform_list:
 	#must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11)
 	detect.configure(env)
 
-        #env['platform_libsuffix'] = env['LIBSUFFIX']
+	#env['platform_libsuffix'] = env['LIBSUFFIX']
 
 	suffix="."+selected_platform
 
@@ -284,10 +284,11 @@ if selected_platform in platform_list:
 
 	if (env['musepack']=='yes'):
 		env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']);
-        if (env['openssl']!='no'):
-            env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
-            if (env['openssl']=="builtin"):
-                env.Append(CPPPATH=['#drivers/builtin_openssl2'])
+
+	if (env['openssl']!='no'):
+		env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
+		if (env['openssl']=="builtin"):
+			env.Append(CPPPATH=['#drivers/builtin_openssl2'])
 
 	if (env["builtin_zlib"]=='yes'):
 		env.Append(CPPPATH=['#drivers/builtin_zlib/zlib'])
@@ -337,7 +338,7 @@ if selected_platform in platform_list:
 
 	if (env['colored']=='yes'):
 		methods.colored(sys,env)
-		
+
 	if (env['etc1']=='yes'):
 		env.Append(CPPFLAGS=['-DETC1_ENABLED'])
 
@@ -356,22 +357,22 @@ if selected_platform in platform_list:
 	SConscript("main/SCsub")
 
 	SConscript("platform/"+selected_platform+"/SCsub"); # build selected platform
-	
-	# Microsoft Visual Studio Project Generation			
-	if (env['vsproj'])=="yes":		
-	
+
+	# Microsoft Visual Studio Project Generation
+	if (env['vsproj'])=="yes":
+
 		AddToVSProject(env.core_sources)
 		AddToVSProject(env.main_sources)
-		AddToVSProject(env.modules_sources)	
+		AddToVSProject(env.modules_sources)
 		AddToVSProject(env.scene_sources)
 		AddToVSProject(env.servers_sources)
 		AddToVSProject(env.tool_sources)
-		
+
 		#env['MSVS_VERSION']='9.0'
 		env['MSVSBUILDCOM'] = "scons platform=" + selected_platform + " target=" + env["target"] + " bits=" + env["bits"] + " tools=yes"
 		env['MSVSREBUILDCOM'] = "scons platform=" + selected_platform + " target=" + env["target"] + " bits=" + env["bits"] + " tools=yes vsproj=true"
 		env['MSVSCLEANCOM'] = "scons --clean platform=" + selected_platform + " target=" + env["target"] + " bits=" + env["bits"] + " tools=yes"
-			
+
 		debug_variants = ['Debug|Win32']+['Debug|x64']
 		release_variants = ['Release|Win32']+['Release|x64']
 		release_debug_variants = ['Release_Debug|Win32']+['Release_Debug|x64']
@@ -382,11 +383,11 @@ if selected_platform in platform_list:
 		targets = debug_targets + release_targets + release_debug_targets
 		msvproj = env.MSVSProject(target = ['#godot' + env['MSVSPROJECTSUFFIX'] ],
 								incs = env.vs_incs,
-								srcs = env.vs_srcs, 
-								runfile = targets, 
-								buildtarget = targets, 
-								auto_build_solution=1, 
-								variant = variants) 		
+								srcs = env.vs_srcs,
+								runfile = targets,
+								buildtarget = targets,
+								auto_build_solution=1,
+								variant = variants)
 
 else:
 
diff --git a/bin/tests/SCsub b/bin/tests/SCsub
index 6613df9c05..57c9bc63b2 100644
--- a/bin/tests/SCsub
+++ b/bin/tests/SCsub
@@ -10,5 +10,3 @@ Export('env')
 lib = env.Library("tests",env.tests_sources)
 
 env.Prepend(LIBS=[lib])
-
-
diff --git a/core/SCsub b/core/SCsub
index d04041141c..4ce91c794f 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -63,5 +63,3 @@ SConscript('bind/SCsub');
 lib = env.Library("core",env.core_sources)
 
 env.Prepend(LIBS=[lib])
-
-
diff --git a/core/bind/SCsub b/core/bind/SCsub
index c6ba1fa537..7b4a6acbc0 100644
--- a/core/bind/SCsub
+++ b/core/bind/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.core_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/core/io/SCsub b/core/io/SCsub
index 5aecb4b915..3ff9b355a4 100644
--- a/core/io/SCsub
+++ b/core/io/SCsub
@@ -5,5 +5,3 @@ env.add_source_files(env.core_sources,"*.c")
 #env.core_sources.append("io/fastlz.c")
 
 Export('env')
-
-
diff --git a/core/math/SCsub b/core/math/SCsub
index c6ba1fa537..7b4a6acbc0 100644
--- a/core/math/SCsub
+++ b/core/math/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.core_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/core/os/SCsub b/core/os/SCsub
index c6ba1fa537..7b4a6acbc0 100644
--- a/core/os/SCsub
+++ b/core/os/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.core_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/drivers/SCsub b/drivers/SCsub
index bc46bf2cec..b9567dec1a 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -93,4 +93,3 @@ env.Prepend(LIBS=lib_list)
 
 #lib = env.Library("drivers",env.drivers_sources)
 #env.Prepend(LIBS=[lib])
-
diff --git a/drivers/alsa/SCsub b/drivers/alsa/SCsub
index bcd231579c..9fbb467baa 100644
--- a/drivers/alsa/SCsub
+++ b/drivers/alsa/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.drivers_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/drivers/builtin_zlib/SCsub b/drivers/builtin_zlib/SCsub
index c322b236ab..e5c81c0b3b 100644
--- a/drivers/builtin_zlib/SCsub
+++ b/drivers/builtin_zlib/SCsub
@@ -1,7 +1,7 @@
 Import('env')
 
 zlib_sources = [
-	
+
 	"builtin_zlib/zlib/adler32.c",
 	"builtin_zlib/zlib/compress.c",
 	"builtin_zlib/zlib/crc32.c",
diff --git a/drivers/chibi/SCsub b/drivers/chibi/SCsub
index bcd231579c..9fbb467baa 100644
--- a/drivers/chibi/SCsub
+++ b/drivers/chibi/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.drivers_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/drivers/dds/SCsub b/drivers/dds/SCsub
index e475de1dba..159829384f 100644
--- a/drivers/dds/SCsub
+++ b/drivers/dds/SCsub
@@ -8,4 +8,3 @@ dds_sources = [
 env.drivers_sources+=dds_sources
 
 #env.add_source_files(env.drivers_sources, dds_sources)
-
diff --git a/drivers/etc1/SCsub b/drivers/etc1/SCsub
index 251c3ffb86..4ce921ad9f 100644
--- a/drivers/etc1/SCsub
+++ b/drivers/etc1/SCsub
@@ -12,4 +12,3 @@ if (env["etc1"] != "no"):
 #env.add_source_files(env.drivers_sources, etc_sources)
 
 Export('env')
-
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub
index 0177eec6a2..7cf8629fe1 100644
--- a/drivers/gl_context/SCsub
+++ b/drivers/gl_context/SCsub
@@ -3,4 +3,3 @@ Export('env');
 
 env.add_source_files(env.drivers_sources,"*.cpp")
 env.add_source_files(env.drivers_sources,"*.c")
-
diff --git a/drivers/gles2/shaders/SCsub b/drivers/gles2/shaders/SCsub
index 9679223b16..38177d725f 100644
--- a/drivers/gles2/shaders/SCsub
+++ b/drivers/gles2/shaders/SCsub
@@ -6,5 +6,3 @@ if env['BUILDERS'].has_key('GLSL120GLES'):
 	env.GLSL120GLES('canvas_shadow.glsl');
 	env.GLSL120GLES('blur.glsl');
 	env.GLSL120GLES('copy.glsl');
-
-
diff --git a/drivers/jpg/SCsub b/drivers/jpg/SCsub
index e1fcc5ea89..df91b10a02 100644
--- a/drivers/jpg/SCsub
+++ b/drivers/jpg/SCsub
@@ -10,4 +10,3 @@ jpg_sources = [
 env.drivers_sources+=jpg_sources
 
 #env.add_source_files(env.drivers_sources, jpg_sources)
-
diff --git a/drivers/mpc/SCsub b/drivers/mpc/SCsub
index af61d95e4c..32ffdb863f 100644
--- a/drivers/mpc/SCsub
+++ b/drivers/mpc/SCsub
@@ -19,4 +19,3 @@ env.add_source_files(env.drivers_sources,"*.cpp")
 #env.add_source_files(env.drivers_sources, mpc_sources)
 
 Export('env')
-
diff --git a/drivers/nedmalloc/SCsub b/drivers/nedmalloc/SCsub
index 8c0028b41d..8e6edd1f96 100644
--- a/drivers/nedmalloc/SCsub
+++ b/drivers/nedmalloc/SCsub
@@ -3,4 +3,3 @@ Export('env');
 
 env.add_source_files(env.drivers_sources,"*.cpp")
 #env.add_source_files(env.drivers_sources,"*.c")
-
diff --git a/drivers/nrex/SCsub b/drivers/nrex/SCsub
index 2441d3061b..a00c7b86f4 100644
--- a/drivers/nrex/SCsub
+++ b/drivers/nrex/SCsub
@@ -1,4 +1,3 @@
-
 Import('env')
 
 sources = [
@@ -6,4 +5,3 @@ sources = [
 	'regex.cpp',
 ]
 env.add_source_files(env.drivers_sources, sources)
-
diff --git a/drivers/ogg/SCsub b/drivers/ogg/SCsub
index dd59890064..c85d4404f3 100644
--- a/drivers/ogg/SCsub
+++ b/drivers/ogg/SCsub
@@ -8,4 +8,3 @@ ogg_sources = [
 
 if env['theora'] != "yes" or env['use_theoraplayer_binary'] != "yes":
 	env.drivers_sources+=ogg_sources
-
diff --git a/drivers/openssl/SCsub b/drivers/openssl/SCsub
index 7197364e01..6d3e7e6732 100644
--- a/drivers/openssl/SCsub
+++ b/drivers/openssl/SCsub
@@ -4,5 +4,3 @@ env.add_source_files(env.drivers_sources,"*.cpp")
 env.add_source_files(env.drivers_sources,"*.c")
 
 Export('env')
-
-
diff --git a/drivers/png/SCsub b/drivers/png/SCsub
index 7b937d4dfb..9ee066cbb2 100644
--- a/drivers/png/SCsub
+++ b/drivers/png/SCsub
@@ -38,4 +38,3 @@ env.drivers_sources+=png_sources
 #env.add_source_files(env.drivers_sources, png_sources)
 
 Export('env')
-
diff --git a/drivers/squish/SCsub b/drivers/squish/SCsub
index d55a32ad5e..da39dc1ebc 100644
--- a/drivers/squish/SCsub
+++ b/drivers/squish/SCsub
@@ -21,4 +21,3 @@ if (env["tools"]=="yes"):
 #env.add_source_files(env.drivers_sources, squish_sources)
 
 Export('env')
-
diff --git a/drivers/theora/SCsub b/drivers/theora/SCsub
index ecabce6c9d..faa1ede6a7 100644
--- a/drivers/theora/SCsub
+++ b/drivers/theora/SCsub
@@ -1,4 +1,3 @@
-
 Import('env')
 
 sources = [
@@ -34,5 +33,3 @@ sources = [
 
 if env['use_theoraplayer_binary'] != "yes":
 	env.drivers_sources += sources
-
-
diff --git a/drivers/unix/SCsub b/drivers/unix/SCsub
index bcd231579c..9fbb467baa 100644
--- a/drivers/unix/SCsub
+++ b/drivers/unix/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.drivers_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/drivers/vorbis/SCsub b/drivers/vorbis/SCsub
index 2c137629ac..4a16e80dfc 100644
--- a/drivers/vorbis/SCsub
+++ b/drivers/vorbis/SCsub
@@ -1,4 +1,3 @@
-
 Import('env')
 
 sources = [
@@ -37,4 +36,3 @@ env.drivers_sources += sources
 
 if env['theora'] != "yes" or env['use_theoraplayer_binary'] != "yes":
 	env.drivers_sources += sources_lib
-
diff --git a/drivers/webp/SCsub b/drivers/webp/SCsub
index 3ae046ff79..5596edbe09 100644
--- a/drivers/webp/SCsub
+++ b/drivers/webp/SCsub
@@ -61,4 +61,3 @@ env.drivers_sources+=webp_sources
 #env.add_source_files(env.drivers_sources, webp_sources)
 
 Export('env')
-
diff --git a/drivers/windows/SCsub b/drivers/windows/SCsub
index bcd231579c..9fbb467baa 100644
--- a/drivers/windows/SCsub
+++ b/drivers/windows/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.drivers_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/main/SCsub b/main/SCsub
index 795c427c8d..fa60ffc3e8 100644
--- a/main/SCsub
+++ b/main/SCsub
@@ -8,5 +8,3 @@ Export('env')
 lib = env.Library("main",env.main_sources)
 
 env.Prepend(LIBS=[lib])
-
-
diff --git a/modules/SCsub b/modules/SCsub
index d215f72c08..9215bfd48f 100644
--- a/modules/SCsub
+++ b/modules/SCsub
@@ -19,5 +19,3 @@ for x in env.module_list:
 lib = env_modules.Library("modules",env.modules_sources)
 
 env.Prepend(LIBS=[lib])
-
-
diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub
index d20da72b72..403fe68f66 100644
--- a/modules/gdscript/SCsub
+++ b/modules/gdscript/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.modules_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/modules/gridmap/SCsub b/modules/gridmap/SCsub
index 4cb47e7e67..211a043468 100644
--- a/modules/gridmap/SCsub
+++ b/modules/gridmap/SCsub
@@ -1,6 +1,3 @@
 Import('env')
 
 env.add_source_files(env.modules_sources,"*.cpp")
-
-
-
diff --git a/platform/android/SCsub b/platform/android/SCsub
index 6feeb8b365..834ee58adc 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -62,10 +62,10 @@ pp_baseout.write( manifest )
 
 
 for x in env.android_source_files:
-	shutil.copy(x,abspath+"/java/src/com/android/godot")	
+	shutil.copy(x,abspath+"/java/src/com/android/godot")
 
 for x in env.android_module_libraries:
-	shutil.copy(x,abspath+"/java/libs")	
+	shutil.copy(x,abspath+"/java/libs")
 
 
 env_android.SharedLibrary("#bin/libgodot",[android_objects],SHLIBSUFFIX=env["SHLIBSUFFIX"])
diff --git a/platform/bb10/SCsub b/platform/bb10/SCsub
index 24f2b5d242..81f6e726e4 100644
--- a/platform/bb10/SCsub
+++ b/platform/bb10/SCsub
@@ -19,4 +19,3 @@ if env['bb10_lgles_override'] == "yes":
 
 prog = None
 prog = env_bps.Program('#bin/godot', bb10_lib)
-
diff --git a/platform/flash/SCsub b/platform/flash/SCsub
index b7aef3b65d..4e5f26d52a 100644
--- a/platform/flash/SCsub
+++ b/platform/flash/SCsub
@@ -36,5 +36,3 @@ java -jar $ALCHEMY/usr/lib/asc2.jar -md -strict -optimize -AS3 \
 -import ../platform/flash/lib/libGL.abc \
 ../platform/flash/Console.as
 """
-
-
diff --git a/platform/windows/SCsub b/platform/windows/SCsub
index 1ad32e7989..e7d7285b43 100644
--- a/platform/windows/SCsub
+++ b/platform/windows/SCsub
@@ -13,7 +13,7 @@ common_win=[
 
 env.Program('#bin/godot',['godot_win.cpp']+common_win,PROGSUFFIX=env["PROGSUFFIX"])
 
-# Microsoft Visual Studio Project Generation			
+# Microsoft Visual Studio Project Generation
 if (env['vsproj'])=="yes":
 	env.vs_srcs = env.vs_srcs + ["platform/windows/godot_win.cpp"]
 	for x in common_win:
diff --git a/scene/2d/SCsub b/scene/2d/SCsub
index 055d2f2474..bbe59b3054 100644
--- a/scene/2d/SCsub
+++ b/scene/2d/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.scene_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/scene/3d/SCsub b/scene/3d/SCsub
index 3c2144bedc..116e641593 100644
--- a/scene/3d/SCsub
+++ b/scene/3d/SCsub
@@ -4,10 +4,8 @@ Import('env')
 if (env["disable_3d"]=="yes"):
 
 	env.scene_sources.append("3d/spatial.cpp")
-	env.scene_sources.append("3d/skeleton.cpp")        
+	env.scene_sources.append("3d/skeleton.cpp")
 else:
 	env.add_source_files(env.scene_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/scene/SCsub b/scene/SCsub
index 8c4f0499c4..6d1dd0044f 100644
--- a/scene/SCsub
+++ b/scene/SCsub
@@ -18,5 +18,3 @@ SConscript('io/SCsub');
 lib = env.Library("scene",env.scene_sources)
 
 env.Prepend(LIBS=[lib])
-
-
diff --git a/scene/animation/SCsub b/scene/animation/SCsub
index 055d2f2474..bbe59b3054 100644
--- a/scene/animation/SCsub
+++ b/scene/animation/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.scene_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/scene/audio/SCsub b/scene/audio/SCsub
index 055d2f2474..bbe59b3054 100644
--- a/scene/audio/SCsub
+++ b/scene/audio/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.scene_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/scene/gui/SCsub b/scene/gui/SCsub
index 055d2f2474..bbe59b3054 100644
--- a/scene/gui/SCsub
+++ b/scene/gui/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.scene_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/scene/io/SCsub b/scene/io/SCsub
index 055d2f2474..bbe59b3054 100644
--- a/scene/io/SCsub
+++ b/scene/io/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.scene_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/scene/main/SCsub b/scene/main/SCsub
index 055d2f2474..bbe59b3054 100644
--- a/scene/main/SCsub
+++ b/scene/main/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.scene_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/scene/resources/SCsub b/scene/resources/SCsub
index eaa282ae1a..bb9766e1ca 100644
--- a/scene/resources/SCsub
+++ b/scene/resources/SCsub
@@ -6,4 +6,3 @@ env.add_source_files(env.scene_sources,"*.c")
 Export('env')
 
 SConscript("default_theme/SCsub");
-
diff --git a/scene/resources/default_theme/SCsub b/scene/resources/default_theme/SCsub
index 055d2f2474..bbe59b3054 100644
--- a/scene/resources/default_theme/SCsub
+++ b/scene/resources/default_theme/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.scene_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/servers/SCsub b/servers/SCsub
index 3871c30cfa..d861847101 100644
--- a/servers/SCsub
+++ b/servers/SCsub
@@ -15,5 +15,3 @@ SConscript('spatial_sound_2d/SCsub');
 lib = env.Library("servers",env.servers_sources)
 
 env.Prepend(LIBS=[lib])
-
-
diff --git a/servers/audio/SCsub b/servers/audio/SCsub
index 16fe3a59ac..d31af2c1c4 100644
--- a/servers/audio/SCsub
+++ b/servers/audio/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.servers_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/servers/physics/SCsub b/servers/physics/SCsub
index 3b84c5ef18..95296eadbe 100644
--- a/servers/physics/SCsub
+++ b/servers/physics/SCsub
@@ -5,5 +5,3 @@ env.add_source_files(env.servers_sources,"*.cpp")
 Export('env')
 
 SConscript("joints/SCsub")
-
-
diff --git a/servers/physics/joints/SCsub b/servers/physics/joints/SCsub
index 97d6edea21..d31af2c1c4 100644
--- a/servers/physics/joints/SCsub
+++ b/servers/physics/joints/SCsub
@@ -3,6 +3,3 @@ Import('env')
 env.add_source_files(env.servers_sources,"*.cpp")
 
 Export('env')
-
-
-
diff --git a/servers/physics_2d/SCsub b/servers/physics_2d/SCsub
index a2c2b51a61..ebb7f8be00 100644
--- a/servers/physics_2d/SCsub
+++ b/servers/physics_2d/SCsub
@@ -1,4 +1,3 @@
 Import('env')
 
 env.add_source_files(env.servers_sources,"*.cpp")
-
diff --git a/servers/spatial_sound/SCsub b/servers/spatial_sound/SCsub
index 16fe3a59ac..d31af2c1c4 100644
--- a/servers/spatial_sound/SCsub
+++ b/servers/spatial_sound/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.servers_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/servers/spatial_sound_2d/SCsub b/servers/spatial_sound_2d/SCsub
index 16fe3a59ac..d31af2c1c4 100644
--- a/servers/spatial_sound_2d/SCsub
+++ b/servers/spatial_sound_2d/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.servers_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/servers/visual/SCsub b/servers/visual/SCsub
index 16fe3a59ac..d31af2c1c4 100644
--- a/servers/visual/SCsub
+++ b/servers/visual/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.servers_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/tools/SCsub b/tools/SCsub
index ce7df2c35b..5613d8a6c9 100644
--- a/tools/SCsub
+++ b/tools/SCsub
@@ -17,5 +17,3 @@ if (env["tools"]!="no"):
 	lib = env.Library("tool",env.tool_sources)
 
 	env.Prepend(LIBS=[lib])
-
-
diff --git a/tools/collada/SCsub b/tools/collada/SCsub
index c8eaa596d1..34524f10ef 100644
--- a/tools/collada/SCsub
+++ b/tools/collada/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.tool_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/tools/doc/SCsub b/tools/doc/SCsub
index c8eaa596d1..34524f10ef 100644
--- a/tools/doc/SCsub
+++ b/tools/doc/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.tool_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/tools/docdump/SCsub b/tools/docdump/SCsub
index c8eaa596d1..34524f10ef 100644
--- a/tools/docdump/SCsub
+++ b/tools/docdump/SCsub
@@ -3,5 +3,3 @@ Import('env')
 env.add_source_files(env.tool_sources,"*.cpp")
 
 Export('env')
-
-
diff --git a/tools/editor/SCsub b/tools/editor/SCsub
index 73ec530177..cd46ff8353 100644
--- a/tools/editor/SCsub
+++ b/tools/editor/SCsub
@@ -28,7 +28,7 @@ def make_doc_header(target,source,env):
 
 
 
-	
+
 
 if (env["tools"]=="yes"):
 
@@ -43,17 +43,16 @@ if (env["tools"]=="yes"):
 	f.write(reg_exporters_inc)
 	f.write(reg_exporters)
 	f.close()
-	
+
 	env.Depends("#tools/editor/doc_data_compressed.h","#doc/base/classes.xml")
 	env.Command("#tools/editor/doc_data_compressed.h","#doc/base/classes.xml",make_doc_header)
 
 	#make_doc_header(env.File("#tools/editor/doc_data_raw.h").srcnode().abspath,env.File("#doc/base/classes.xml").srcnode().abspath,env)
-	
+
 	env.add_source_files(env.tool_sources,"*.cpp")
-	
+
 	Export('env')
-	SConscript('icons/SCsub');	
+	SConscript('icons/SCsub');
 	SConscript('plugins/SCsub');
 	SConscript('fileserver/SCsub');
 	SConscript('io_plugins/SCsub');
-
diff --git a/tools/editor/fileserver/SCsub b/tools/editor/fileserver/SCsub
index b525fb3f75..363a2ce4c0 100644
--- a/tools/editor/fileserver/SCsub
+++ b/tools/editor/fileserver/SCsub
@@ -1,7 +1,3 @@
 Import('env')
 Export('env')
 env.add_source_files(env.tool_sources,"*.cpp")
-
-
-
-
diff --git a/tools/editor/icons/SCsub b/tools/editor/icons/SCsub
index aea053d22b..addf6879a2 100644
--- a/tools/editor/icons/SCsub
+++ b/tools/editor/icons/SCsub
@@ -9,30 +9,30 @@ def make_editor_icons_action(target, source, env):
 	pixmaps = source
 
 	s = cStringIO.StringIO()
-	
+
 	s.write("#include \"editor_icons.h\"\n\n")
 	s.write("#include \"scene/resources/theme.h\"\n\n")
 
 	for x in pixmaps:
-	
+
 		x=str(x)
 		var_str=os.path.basename(x)[:-4]+"_png";
 		#print(var_str)
-		
+
 		s.write("static const unsigned char "+ var_str +"[]={\n");
-		
+
 		pngf=open(x,"rb");
-		
+
 		b=pngf.read(1);
 		while(len(b)==1):
 			s.write(hex(ord(b)))
 			b=pngf.read(1);
 			if (len(b)==1):
 				s.write(",")
-				
+
 		s.write("\n};\n\n\n");
 		pngf.close();
-	  
+
 	s.write("static Ref<ImageTexture> make_icon(const uint8_t* p_png) {\n")
 	s.write("\tRef<ImageTexture> texture( memnew( ImageTexture ) );\n")
 	s.write("\ttexture->create_from_image( Image(p_png),ImageTexture::FLAG_FILTER );\n")
@@ -42,14 +42,14 @@ def make_editor_icons_action(target, source, env):
 	s.write("void editor_register_icons(Ref<Theme> p_theme) {\n\n")
 
 	for x in pixmaps:
-	
+
 		x=os.path.basename(str(x))
 		type=x[5:-4].title().replace("_","");
 		var_str=x[:-4]+"_png";
 		s.write("\tp_theme->set_icon(\""+type+"\",\"EditorIcons\",make_icon("+var_str+"));\n");
 
 	s.write("\n\n}\n\n");
-	
+
 	f = open(dst,"wb")
 	f.write(s.getvalue())
 	f.close()
@@ -63,4 +63,3 @@ env.Alias('editor_icons',[env.MakeEditorIconsBuilder('#tools/editor/editor_icons
 
 env.tool_sources.append("#tools/editor/editor_icons.cpp")
 Export('env')
-
diff --git a/tools/editor/io_plugins/SCsub b/tools/editor/io_plugins/SCsub
index b525fb3f75..363a2ce4c0 100644
--- a/tools/editor/io_plugins/SCsub
+++ b/tools/editor/io_plugins/SCsub
@@ -1,7 +1,3 @@
 Import('env')
 Export('env')
 env.add_source_files(env.tool_sources,"*.cpp")
-
-
-
-
diff --git a/tools/editor/plugins/SCsub b/tools/editor/plugins/SCsub
index b525fb3f75..363a2ce4c0 100644
--- a/tools/editor/plugins/SCsub
+++ b/tools/editor/plugins/SCsub
@@ -1,7 +1,3 @@
 Import('env')
 Export('env')
 env.add_source_files(env.tool_sources,"*.cpp")
-
-
-
-
diff --git a/tools/freetype/SCsub b/tools/freetype/SCsub
index a31b8c4602..65b4827f9c 100644
--- a/tools/freetype/SCsub
+++ b/tools/freetype/SCsub
@@ -65,7 +65,5 @@ if (env["freetype"]=="builtin"):
 
 #   lib = env.Library("freetype_builtin",ft_sources)
 #   env.Prepend(LIBS=[lib])
- 
+
 Export('env')
-
-
diff --git a/tools/pck/SCsub b/tools/pck/SCsub
index b1fed9a472..cf98ae145d 100644
--- a/tools/pck/SCsub
+++ b/tools/pck/SCsub
@@ -2,4 +2,3 @@ Import('env')
 
 if env["tools"] == "yes":
 	env.add_source_files(env.tool_sources, "*.cpp")
-

From b54d96ceba19801f3ec59e1a611f74b428cdebe2 Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Mon, 2 Nov 2015 13:16:28 +0000
Subject: [PATCH 28/78] Added ability to write directly to 4-dimensional
 position vector from within custom vertex shader code. Bugfixes to shader
 graph code generation concerning xforms.

---
 drivers/gles2/rasterizer_gles2.cpp      |   3 +
 drivers/gles2/shader_compiler_gles2.cpp | 224 ++++++++++++------------
 drivers/gles2/shader_compiler_gles2.h   |   3 +
 scene/resources/shader_graph.cpp        |  26 ++-
 servers/visual/shader_language.cpp      |   1 +
 5 files changed, 143 insertions(+), 114 deletions(-)

diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp
index d84ee5a758..44175c2cc3 100644
--- a/drivers/gles2/rasterizer_gles2.cpp
+++ b/drivers/gles2/rasterizer_gles2.cpp
@@ -4641,6 +4641,9 @@ void RasterizerGLES2::_update_shader( Shader* p_shader) const {
 			enablers.push_back("#define USE_TIME\n");
 			uses_time=true;
 		}
+		if (vertex_flags.vertex_code_writes_position) {
+			enablers.push_back("#define VERTEX_SHADER_WRITE_POSITION\n");
+		}
 
 		material_shader.set_custom_shader_code(p_shader->custom_code_id,vertex_code, vertex_globals,fragment_code, light_code, fragment_globals,uniform_names,enablers);
 	} else if (p_shader->mode==VS::SHADER_CANVAS_ITEM) {
diff --git a/drivers/gles2/shader_compiler_gles2.cpp b/drivers/gles2/shader_compiler_gles2.cpp
index d57512c936..c8f59ce22b 100644
--- a/drivers/gles2/shader_compiler_gles2.cpp
+++ b/drivers/gles2/shader_compiler_gles2.cpp
@@ -154,6 +154,9 @@ String ShaderCompilerGLES2::dump_node_code(SL::Node *p_node,int p_level,bool p_a
 				if (vnode->name==vname_vertex && p_assign_left) {
 					vertex_code_writes_vertex=true;
 				}
+				if (vnode->name == vname_position && p_assign_left) {
+					vertex_code_writes_position = true;
+				}
 				if (vnode->name==vname_color_interp) {
 					flags->use_color_interp=true;
 				}
@@ -659,6 +662,7 @@ Error ShaderCompilerGLES2::compile(const String& p_code, ShaderLanguage::ShaderT
 	uses_texpixel_size=false;
 	uses_worldvec=false;
 	vertex_code_writes_vertex=false;
+	vertex_code_writes_position = false;
 	uses_shadow_color=false;
 	uniforms=r_uniforms;
 	flags=&r_flags;
@@ -690,6 +694,7 @@ Error ShaderCompilerGLES2::compile(const String& p_code, ShaderLanguage::ShaderT
 	r_flags.uses_texscreen=uses_texscreen;
 	r_flags.uses_texpos=uses_texpos;
 	r_flags.vertex_code_writes_vertex=vertex_code_writes_vertex;
+	r_flags.vertex_code_writes_position=vertex_code_writes_position;
 	r_flags.uses_discard=uses_discard;
 	r_flags.uses_screen_uv=uses_screen_uv;
 	r_flags.uses_light=uses_light;
@@ -778,125 +783,127 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() {
 	replace_table["texscreen"]= "texscreen";
 	replace_table["texpos"]= "texpos";
 
-	mode_replace_table[0]["SRC_VERTEX"]="vertex_in.xyz";
-	mode_replace_table[0]["SRC_NORMAL"]="normal_in";
-	mode_replace_table[0]["SRC_TANGENT"]="tangent_in";
-	mode_replace_table[0]["SRC_BINORMALF"]="binormalf";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["POSITION"] = "gl_Position";
 
-	mode_replace_table[0]["VERTEX"]="vertex_interp";
-	mode_replace_table[0]["NORMAL"]="normal_interp";
-	mode_replace_table[0]["TANGENT"]="tangent_interp";
-	mode_replace_table[0]["BINORMAL"]="binormal_interp";
-	mode_replace_table[0]["UV"]="uv_interp.xy";
-	mode_replace_table[0]["UV2"]="uv_interp.zw";
-	mode_replace_table[0]["COLOR"]="color_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SRC_VERTEX"] = "vertex_in.xyz";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SRC_NORMAL"] = "normal_in";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SRC_TANGENT"]="tangent_in";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SRC_BINORMALF"]="binormalf";
+
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["VERTEX"]="vertex_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["NORMAL"]="normal_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["TANGENT"]="tangent_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["BINORMAL"]="binormal_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["UV"]="uv_interp.xy";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["UV2"]="uv_interp.zw";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["COLOR"]="color_interp";
 	//@TODO convert to glsl stuff
-	mode_replace_table[0]["SPEC_EXP"]="vertex_specular_exp";
-	mode_replace_table[0]["WORLD_MATRIX"]="world_transform";
-	mode_replace_table[0]["INV_CAMERA_MATRIX"]="camera_inverse_transform";
-	mode_replace_table[0]["PROJECTION_MATRIX"]="projection_transform";
-	mode_replace_table[0]["MODELVIEW_MATRIX"]="modelview";
-	mode_replace_table[0]["POINT_SIZE"]="gl_PointSize";
-	mode_replace_table[0]["VAR1"]="var1_interp";
-	mode_replace_table[0]["VAR2"]="var2_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SPEC_EXP"]="vertex_specular_exp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["WORLD_MATRIX"]="world_transform";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["INV_CAMERA_MATRIX"]="camera_inverse_transform";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["PROJECTION_MATRIX"]="projection_transform";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["MODELVIEW_MATRIX"]="modelview";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["POINT_SIZE"]="gl_PointSize";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["VAR1"]="var1_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["VAR2"]="var2_interp";
 
-//	mode_replace_table[0]["SCREEN_POS"]="SCREEN_POS";
-//	mode_replace_table[0]["SCREEN_SIZE"]="SCREEN_SIZE";
-	mode_replace_table[0]["INSTANCE_ID"]="instance_id";
-	mode_replace_table[0]["TIME"]="time";
+//	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SCREEN_POS"]="SCREEN_POS";
+//	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SCREEN_SIZE"]="SCREEN_SIZE";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["INSTANCE_ID"]="instance_id";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["TIME"]="time";
 
-	mode_replace_table[1]["VERTEX"]="vertex";
-	//mode_replace_table[1]["POSITION"]="IN_POSITION";
-	mode_replace_table[1]["NORMAL"]="normal";
-	mode_replace_table[1]["TANGENT"]="tangent";
-	mode_replace_table[1]["POSITION"]="gl_Position";
-	mode_replace_table[1]["BINORMAL"]="binormal";
-	mode_replace_table[1]["NORMALMAP"]="normalmap";
-	mode_replace_table[1]["NORMALMAP_DEPTH"]="normaldepth";
-	mode_replace_table[1]["VAR1"]="var1_interp";
-	mode_replace_table[1]["VAR2"]="var2_interp";
-	mode_replace_table[1]["UV"]="uv";
-	mode_replace_table[1]["UV2"]="uv2";
-	mode_replace_table[1]["SCREEN_UV"]="screen_uv";
-	mode_replace_table[1]["VAR1"]="var1_interp";
-	mode_replace_table[1]["VAR2"]="var2_interp";
-	mode_replace_table[1]["COLOR"]="color";
-	mode_replace_table[1]["DIFFUSE"]="diffuse.rgb";
-	mode_replace_table[1]["DIFFUSE_ALPHA"]="diffuse";
-	mode_replace_table[1]["SPECULAR"]="specular";
-	mode_replace_table[1]["EMISSION"]="emission";
-	mode_replace_table[1]["SHADE_PARAM"]="shade_param";
-	mode_replace_table[1]["SPEC_EXP"]="specular_exp";
-	mode_replace_table[1]["GLOW"]="glow";
-	mode_replace_table[1]["DISCARD"]="discard_";
-	mode_replace_table[1]["POINT_COORD"]="gl_PointCoord";
-	mode_replace_table[1]["INV_CAMERA_MATRIX"]="camera_inverse_transform";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VERTEX"]="vertex";
+	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["POSITION"]="IN_POSITION";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["NORMAL"]="normal";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["TANGENT"]="tangent";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["POSITION"]="gl_Position";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["BINORMAL"]="binormal";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["NORMALMAP"]="normalmap";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["NORMALMAP_DEPTH"]="normaldepth";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VAR1"]="var1_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VAR2"]="var2_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["UV"]="uv";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["UV2"]="uv2";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SCREEN_UV"]="screen_uv";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VAR1"]="var1_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VAR2"]="var2_interp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["COLOR"]="color";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["DIFFUSE"]="diffuse.rgb";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["DIFFUSE_ALPHA"]="diffuse";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SPECULAR"]="specular";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["EMISSION"]="emission";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SHADE_PARAM"]="shade_param";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SPEC_EXP"]="specular_exp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["GLOW"]="glow";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["DISCARD"]="discard_";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["POINT_COORD"]="gl_PointCoord";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["INV_CAMERA_MATRIX"]="camera_inverse_transform";
 
-	//mode_replace_table[1]["SCREEN_POS"]="SCREEN_POS";
-	//mode_replace_table[1]["SCREEN_TEXEL_SIZE"]="SCREEN_TEXEL_SIZE";
-	mode_replace_table[1]["TIME"]="time";
+	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SCREEN_POS"]="SCREEN_POS";
+	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SCREEN_TEXEL_SIZE"]="SCREEN_TEXEL_SIZE";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["TIME"]="time";
 
 	//////////////
 
-	mode_replace_table[2]["NORMAL"]="normal";
-	//mode_replace_table[2]["POSITION"]="IN_POSITION";
-	mode_replace_table[2]["LIGHT_DIR"]="light_dir";
-	mode_replace_table[2]["LIGHT_DIFFUSE"]="light_diffuse";
-	mode_replace_table[2]["LIGHT_SPECULAR"]="light_specular";
-	mode_replace_table[2]["EYE_VEC"]="eye_vec";
-	mode_replace_table[2]["DIFFUSE"]="mdiffuse";
-	mode_replace_table[2]["SPECULAR"]="specular";
-	mode_replace_table[2]["SPECULAR_EXP"]="specular_exp";
-	mode_replace_table[2]["SHADE_PARAM"]="shade_param";
-	mode_replace_table[2]["LIGHT"]="light";
-	mode_replace_table[2]["POINT_COORD"]="gl_PointCoord";
-	mode_replace_table[2]["TIME"]="time";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["NORMAL"]="normal";
+	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["POSITION"]="IN_POSITION";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["LIGHT_DIR"]="light_dir";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["LIGHT_DIFFUSE"]="light_diffuse";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["LIGHT_SPECULAR"]="light_specular";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["EYE_VEC"]="eye_vec";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["DIFFUSE"]="mdiffuse";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["SPECULAR"]="specular";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["SPECULAR_EXP"]="specular_exp";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["SHADE_PARAM"]="shade_param";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["LIGHT"]="light";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["POINT_COORD"]="gl_PointCoord";
+	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["TIME"]="time";
 
-	mode_replace_table[3]["SRC_VERTEX"]="src_vtx";
-	mode_replace_table[3]["VERTEX"]="outvec.xy";
-	mode_replace_table[3]["WORLD_VERTEX"]="outvec.xy";
-	mode_replace_table[3]["UV"]="uv_interp";
-	mode_replace_table[3]["COLOR"]="color_interp";
-	mode_replace_table[3]["VAR1"]="var1_interp";
-	mode_replace_table[3]["VAR2"]="var2_interp";
-	mode_replace_table[3]["POINT_SIZE"]="gl_PointSize";
-	mode_replace_table[3]["WORLD_MATRIX"]="modelview_matrix";
-	mode_replace_table[3]["PROJECTION_MATRIX"]="projection_matrix";
-	mode_replace_table[3]["EXTRA_MATRIX"]="extra_matrix";
-	mode_replace_table[3]["TIME"]="time";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["SRC_VERTEX"]="src_vtx";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["VERTEX"]="outvec.xy";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["WORLD_VERTEX"]="outvec.xy";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["UV"]="uv_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["COLOR"]="color_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["VAR1"]="var1_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["VAR2"]="var2_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["POINT_SIZE"]="gl_PointSize";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["WORLD_MATRIX"]="modelview_matrix";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["PROJECTION_MATRIX"]="projection_matrix";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["EXTRA_MATRIX"]="extra_matrix";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["TIME"]="time";
 
-	mode_replace_table[4]["POSITION"]="gl_Position";
-	mode_replace_table[4]["NORMAL"]="normal";
-	mode_replace_table[4]["NORMALMAP"]="normal_map";
-	mode_replace_table[4]["NORMALMAP_DEPTH"]="normal_depth";
-	mode_replace_table[4]["UV"]="uv_interp";
-	mode_replace_table[4]["SRC_COLOR"]="color_interp";
-	mode_replace_table[4]["COLOR"]="color";
-	mode_replace_table[4]["TEXTURE"]="texture";
-	mode_replace_table[4]["TEXTURE_PIXEL_SIZE"]="texpixel_size";
-	mode_replace_table[4]["VAR1"]="var1_interp";
-	mode_replace_table[4]["VAR2"]="var2_interp";
-	mode_replace_table[4]["SCREEN_UV"]="screen_uv";
-	mode_replace_table[4]["POINT_COORD"]="gl_PointCoord";
-	mode_replace_table[4]["TIME"]="time";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["POSITION"]="gl_Position";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMAL"]="normal";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMALMAP"]="normal_map";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMALMAP_DEPTH"]="normal_depth";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["UV"]="uv_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["SRC_COLOR"]="color_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["COLOR"]="color";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["TEXTURE"]="texture";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["TEXTURE_PIXEL_SIZE"]="texpixel_size";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["VAR1"]="var1_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["VAR2"]="var2_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["SCREEN_UV"]="screen_uv";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["POINT_COORD"]="gl_PointCoord";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["TIME"]="time";
 
-	mode_replace_table[5]["POSITION"]="gl_Position";
-	mode_replace_table[5]["NORMAL"]="normal";
-	mode_replace_table[5]["UV"]="uv_interp";
-	mode_replace_table[5]["COLOR"]="color";
-	mode_replace_table[5]["TEXTURE"]="texture";
-	mode_replace_table[5]["TEXTURE_PIXEL_SIZE"]="texpixel_size";
-	mode_replace_table[5]["VAR1"]="var1_interp";
-	mode_replace_table[5]["VAR2"]="var2_interp";
-	mode_replace_table[5]["LIGHT_VEC"]="light_vec";
-	mode_replace_table[5]["LIGHT_HEIGHT"]="light_height";
-	mode_replace_table[5]["LIGHT_COLOR"]="light";
-	mode_replace_table[5]["LIGHT_UV"]="light_uv";
-	mode_replace_table[5]["LIGHT"]="light_out";
-	mode_replace_table[5]["SHADOW"]="shadow_color";
-	mode_replace_table[5]["SCREEN_UV"]="screen_uv";
-	mode_replace_table[5]["POINT_COORD"]="gl_PointCoord";
-	mode_replace_table[5]["TIME"]="time";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["POSITION"]="gl_Position";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["NORMAL"]="normal";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["UV"]="uv_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["COLOR"]="color";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["TEXTURE"]="texture";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["TEXTURE_PIXEL_SIZE"]="texpixel_size";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["VAR1"]="var1_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["VAR2"]="var2_interp";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_VEC"]="light_vec";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_HEIGHT"]="light_height";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_COLOR"]="light";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_UV"]="light_uv";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT"]="light_out";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["SHADOW"]="shadow_color";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["SCREEN_UV"]="screen_uv";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["POINT_COORD"]="gl_PointCoord";
+	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["TIME"]="time";
 
 
 
@@ -917,6 +924,7 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() {
 	vname_var1_interp="VAR1";
 	vname_var2_interp="VAR2";
 	vname_vertex="VERTEX";
+	vname_position = "POSITION";
 	vname_light="LIGHT";
 	vname_time="TIME";
 	vname_normalmap="NORMALMAP";
diff --git a/drivers/gles2/shader_compiler_gles2.h b/drivers/gles2/shader_compiler_gles2.h
index 43902a7536..77532e03ff 100644
--- a/drivers/gles2/shader_compiler_gles2.h
+++ b/drivers/gles2/shader_compiler_gles2.h
@@ -55,6 +55,7 @@ private:
 	bool uses_texpixel_size;
 	bool uses_worldvec;
 	bool vertex_code_writes_vertex;
+	bool vertex_code_writes_position;
 	bool uses_shadow_color;
 
 	bool sinh_used;
@@ -76,6 +77,7 @@ private:
 	StringName vname_var1_interp;
 	StringName vname_var2_interp;
 	StringName vname_vertex;
+	StringName vname_position;
 	StringName vname_light;
 	StringName vname_time;
 	StringName vname_normalmap;
@@ -107,6 +109,7 @@ public:
 		bool uses_texpos;
 		bool uses_normalmap;
 		bool vertex_code_writes_vertex;
+		bool vertex_code_writes_position;
 		bool uses_discard;
 		bool uses_screen_uv;
 		bool use_color_interp;
diff --git a/scene/resources/shader_graph.cpp b/scene/resources/shader_graph.cpp
index 49a1bdccb1..d5204f45d5 100644
--- a/scene/resources/shader_graph.cpp
+++ b/scene/resources/shader_graph.cpp
@@ -2083,7 +2083,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
 #define DEF_MATRIX(slot) \
 	if (p_inputs[slot].ends_with("def")){\
 		Transform xf = p_node->defaults[slot]; \
-		code+=String(typestr[3])+" "+p_inputs[slot]+"=mat4(\n";\
+		code+=String(typestr[2])+" "+p_inputs[slot]+"=mat4(\n";\
 		code+="\tvec4(vec3("+rtos(xf.basis.get_axis(0).x)+","+rtos(xf.basis.get_axis(0).y)+","+rtos(xf.basis.get_axis(0).z)+"),0),\n";\
 		code+="\tvec4(vec3("+rtos(xf.basis.get_axis(1).x)+","+rtos(xf.basis.get_axis(1).y)+","+rtos(xf.basis.get_axis(1).z)+"),0),\n";\
 		code+="\tvec4(vec3("+rtos(xf.basis.get_axis(2).x)+","+rtos(xf.basis.get_axis(2).y)+","+rtos(xf.basis.get_axis(2).z)+"),0),\n";\
@@ -2393,15 +2393,29 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
 			DEF_VEC(1);
 			DEF_VEC(2);
 			DEF_VEC(3);
-			code += OUTNAME(p_node->id,0)+"=xform("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+","+","+p_inputs[3]+");\n";
+			code += OUTNAME(p_node->id, 0) + "=mat4(" +
+				"vec4(" + p_inputs[0] + ".x," + p_inputs[0] + ".y," + p_inputs[0] + ".z, 0.0),"
+				"vec4(" + p_inputs[1] + ".x," + p_inputs[1] + ".y," + p_inputs[1] + ".z, 0.0),"
+				"vec4(" + p_inputs[2] + ".x," + p_inputs[2] + ".y," + p_inputs[2] + ".z, 0.0),"
+				"vec4(" + p_inputs[3] + ".x," + p_inputs[3] + ".y," + p_inputs[3] + ".z, 1.0));\n";
 
 		}break;
 		case NODE_XFORM_TO_VEC: {
 			DEF_MATRIX(0);
-			code += OUTNAME(p_node->id,0)+"="+p_inputs[0]+".x;\n";
-			code += OUTNAME(p_node->id,1)+"="+p_inputs[0]+".y;\n";
-			code += OUTNAME(p_node->id,2)+"="+p_inputs[0]+".z;\n";
-			code += OUTNAME(p_node->id,3)+"="+p_inputs[0]+".o;\n";
+			code += OUTNAME(p_node->id, 0) + ";\n";
+			code += OUTNAME(p_node->id, 1) + ";\n";
+			code += OUTNAME(p_node->id, 2) + ";\n";
+			code += OUTNAME(p_node->id, 3) + ";\n";
+			code += "{\n";
+			code += "\tvec4 xform_row_01=" + p_inputs[0] + ".x;\n";
+			code += "\tvec4 xform_row_02=" + p_inputs[0] + ".y;\n";
+			code += "\tvec4 xform_row_03=" + p_inputs[0] + ".z;\n";
+			code += "\tvec4 xform_row_04=" + p_inputs[0] + ".w;\n";
+			code += "\t" + OUTVAR(p_node->id, 0) + "=vec3(xform_row_01.x, xform_row_01.y, xform_row_01.z);\n";
+			code += "\t" + OUTVAR(p_node->id, 1) + "=vec3(xform_row_02.x, xform_row_02.y, xform_row_02.z);\n";
+			code += "\t" + OUTVAR(p_node->id, 2) + "=vec3(xform_row_03.x, xform_row_03.y, xform_row_03.z);\n";
+			code += "\t" + OUTVAR(p_node->id, 3) + "=vec3(xform_row_04.x, xform_row_04.y, xform_row_04.z);\n";
+			code += "}\n";
 		}break;
 		case NODE_SCALAR_INTERP: {
 			DEF_SCALAR(0);
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index ea56306241..6532c3f0ac 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -1043,6 +1043,7 @@ const ShaderLanguage::BuiltinsDef ShaderLanguage::vertex_builtins_defs[]={
 	{ "SRC_TANGENT", TYPE_VEC3},
 	{ "SRC_BINORMALF", TYPE_FLOAT},
 
+	{ "POSITION", TYPE_VEC4 },
 	{ "VERTEX", TYPE_VEC3},
 	{ "NORMAL", TYPE_VEC3},
 	{ "TANGENT", TYPE_VEC3},

From 56b7567b55df24ef0e78ecea6d2eea427d0ed066 Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Mon, 19 Oct 2015 20:40:24 +0100
Subject: [PATCH 29/78] Added missing saving support to animation editor.

---
 .../animation_player_editor_plugin.cpp        | 180 +++++++++++++++---
 .../plugins/animation_player_editor_plugin.h  |  22 ++-
 2 files changed, 172 insertions(+), 30 deletions(-)

diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index f8c484e886..6ab5af539a 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -27,7 +27,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "animation_player_editor_plugin.h"
+#include "globals.h"
 #include "io/resource_loader.h"
+#include "io/resource_saver.h"
 #include "os/keyboard.h"
 #include "tools/editor/editor_settings.h"
 
@@ -98,6 +100,8 @@ void AnimationPlayerEditor::_notification(int p_what) {
 		duplicate_anim->set_icon( get_icon("Duplicate","EditorIcons") );
 		autoplay->set_icon( get_icon("AutoPlay","EditorIcons") );
 		load_anim->set_icon( get_icon("Folder","EditorIcons") );
+		save_anim->set_icon(get_icon("Save", "EditorIcons"));
+		save_anim->get_popup()->connect("item_pressed", this, "_animation_save_menu");
 		remove_anim->set_icon( get_icon("Remove","EditorIcons") );
 		edit_anim->set_icon( get_icon("Edit","EditorIcons") );
 		blend_anim->set_icon( get_icon("Blend","EditorIcons") );
@@ -367,8 +371,78 @@ void AnimationPlayerEditor::_animation_load() {
 	}
 
 	file->popup_centered_ratio();
+	current_option = RESOURCE_LOAD;
+}
 
 
+void AnimationPlayerEditor::_animation_save_in_path(const Ref<Resource>& p_resource, const String& p_path) {
+
+	int flg = 0;
+	if (EditorSettings::get_singleton()->get("on_save/compress_binary_resources"))
+		flg |= ResourceSaver::FLAG_COMPRESS;
+	if (EditorSettings::get_singleton()->get("on_save/save_paths_as_relative"))
+		flg |= ResourceSaver::FLAG_RELATIVE_PATHS;
+
+	String path = Globals::get_singleton()->localize_path(p_path);
+	Error err = ResourceSaver::save(path, p_resource, flg | ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS);
+
+	if (err != OK) {
+		accept->set_text("Error saving resource!");
+		accept->popup_centered_minsize();
+		return;
+	}
+	//	EditorFileSystem::get_singleton()->update_file(path,p_resource->get_type());
+
+	((Resource*)p_resource.ptr())->set_path(path);
+	editor->emit_signal("resource_saved", p_resource);
+
+}
+
+void AnimationPlayerEditor::_animation_save(const Ref<Resource>& p_resource) {
+
+	if (p_resource->get_path().is_resource_file()) {
+		_animation_save_in_path(p_resource, p_resource->get_path());
+	}
+	else {
+		_animation_save_as(p_resource);
+	}
+}
+
+void AnimationPlayerEditor::_animation_save_as(const Ref<Resource>& p_resource) {
+
+	file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+	bool relpaths = (p_resource->has_meta("__editor_relpaths__") && p_resource->get_meta("__editor_relpaths__").operator bool());
+
+	List<String> extensions;
+	ResourceSaver::get_recognized_extensions(p_resource, &extensions);
+	file->clear_filters();
+	for (int i = 0; i<extensions.size(); i++) {
+
+		file->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
+	}
+
+	//file->set_current_path(current_path);
+	if (p_resource->get_path() != "") {
+		file->set_current_path(p_resource->get_path());
+		if (extensions.size()) {
+			String ext = p_resource->get_path().extension().to_lower();
+			if (extensions.find(ext) == NULL) {
+				file->set_current_path(p_resource->get_path().replacen("." + ext, "." + extensions.front()->get()));
+			}
+		}
+	}
+	else {
+
+		String existing;
+		if (extensions.size()) {
+			existing = "new_" + p_resource->get_type().to_lower() + "." + extensions.front()->get().to_lower();
+		}
+		file->set_current_path(existing);
+
+	}
+	file->popup_centered_ratio();
+	file->set_title("Save Resource As..");
+	current_option = RESOURCE_SAVE;
 }
 void AnimationPlayerEditor::_animation_remove() {
 
@@ -635,38 +709,55 @@ void AnimationPlayerEditor::_animation_edit() {
 	//get_scene()->get_root_node()->call("_resource_selected",anim,"");
 
 }
-void AnimationPlayerEditor::_file_selected(String p_file) {
+void AnimationPlayerEditor::_dialog_action(String p_file) {
 
-	ERR_FAIL_COND(!player);
+	switch (current_option) {
+		case RESOURCE_LOAD: {
+			ERR_FAIL_COND(!player);
 
-	Ref<Resource> res = ResourceLoader::load(p_file,"Animation");
-	ERR_FAIL_COND(res.is_null());
-	ERR_FAIL_COND( !res->is_type("Animation") );
-	if (p_file.find_last("/")!=-1) {
+			Ref<Resource> res = ResourceLoader::load(p_file, "Animation");
+			ERR_FAIL_COND(res.is_null());
+			ERR_FAIL_COND(!res->is_type("Animation"));
+			if (p_file.find_last("/") != -1) {
 
-		p_file=p_file.substr( p_file.find_last("/")+1, p_file.length() );
+				p_file = p_file.substr(p_file.find_last("/") + 1, p_file.length());
 
+			}
+			if (p_file.find_last("\\") != -1) {
+
+				p_file = p_file.substr(p_file.find_last("\\") + 1, p_file.length());
+
+			}
+
+			if (p_file.find(".") != -1)
+				p_file = p_file.substr(0, p_file.find("."));
+
+			undo_redo->create_action("Load Animation");
+			undo_redo->add_do_method(player, "add_animation", p_file, res);
+			undo_redo->add_undo_method(player, "remove_animation", p_file);
+			if (player->has_animation(p_file)) {
+				undo_redo->add_undo_method(player, "add_animation", p_file, player->get_animation(p_file));
+
+			}
+			undo_redo->add_do_method(this, "_animation_player_changed", player);
+			undo_redo->add_undo_method(this, "_animation_player_changed", player);
+			undo_redo->commit_action();
+			break;
+		}
+		case RESOURCE_SAVE: {
+
+			String current = animation->get_item_text(animation->get_selected());
+			if (current != "") {
+				Ref<Animation> anim = player->get_animation(current);
+				
+				ERR_FAIL_COND(!anim->cast_to<Resource>())
+
+					RES current_res = RES(anim->cast_to<Resource>());
+
+				_animation_save_in_path(current_res, p_file);
+			}
+		}
 	}
-	if (p_file.find_last("\\")!=-1) {
-
-		p_file=p_file.substr( p_file.find_last("\\")+1, p_file.length() );
-
-	}
-
-	if (p_file.find(".")!=-1)
-		p_file=p_file.substr(0,p_file.find("."));
-
-	undo_redo->create_action("Load Animation");
-	undo_redo->add_do_method(player,"add_animation",p_file,res);
-	undo_redo->add_undo_method(player,"remove_animation",p_file);
-	if (player->has_animation(p_file)) {
-		undo_redo->add_undo_method(player,"add_animation",p_file,player->get_animation(p_file));
-
-	}
-	undo_redo->add_do_method(this,"_animation_player_changed",player);
-	undo_redo->add_undo_method(this,"_animation_player_changed",player);
-	undo_redo->commit_action();
-
 }
 
 void AnimationPlayerEditor::_scale_changed(const String& p_scale) {
@@ -730,6 +821,8 @@ void AnimationPlayerEditor::_update_player() {
 	blend_anim->set_disabled(animlist.size()==0);
 	remove_anim->set_disabled(animlist.size()==0);
 	resource_edit_anim->set_disabled(animlist.size()==0);
+	save_anim->set_disabled(animlist.size() == 0);
+
 
 	int active_idx=-1;
 	for (List<StringName>::Element *E=animlist.front();E;E=E->next()) {
@@ -1072,6 +1165,23 @@ void AnimationPlayerEditor::_animation_tool_menu(int p_option) {
 	}
 }
 
+void AnimationPlayerEditor::_animation_save_menu(int p_option) {
+
+	String current = animation->get_item_text(animation->get_selected());
+	if (current != "") {
+		Ref<Animation> anim = player->get_animation(current);
+
+		switch (p_option) {
+		case ANIM_SAVE:
+			_animation_save(anim);
+			break;
+		case ANIM_SAVE_AS:
+			_animation_save_as(anim);
+			break;
+		}
+	}
+}
+
 void AnimationPlayerEditor::_unhandled_key_input(const InputEvent& p_ev) {
 
 	if (is_visible() && p_ev.type==InputEvent::KEY && p_ev.key.pressed && !p_ev.key.echo && !p_ev.key.mod.alt && !p_ev.key.mod.control && !p_ev.key.mod.meta) {
@@ -1117,7 +1227,7 @@ void AnimationPlayerEditor::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_animation_blend"),&AnimationPlayerEditor::_animation_blend);
 	ObjectTypeDB::bind_method(_MD("_animation_edit"),&AnimationPlayerEditor::_animation_edit);
 	ObjectTypeDB::bind_method(_MD("_animation_resource_edit"),&AnimationPlayerEditor::_animation_resource_edit);
-	ObjectTypeDB::bind_method(_MD("_file_selected"),&AnimationPlayerEditor::_file_selected);
+	ObjectTypeDB::bind_method(_MD("_dialog_action"),&AnimationPlayerEditor::_dialog_action);
 	ObjectTypeDB::bind_method(_MD("_seek_value_changed"),&AnimationPlayerEditor::_seek_value_changed);
 	ObjectTypeDB::bind_method(_MD("_animation_player_changed"),&AnimationPlayerEditor::_animation_player_changed);
 	ObjectTypeDB::bind_method(_MD("_blend_edited"),&AnimationPlayerEditor::_blend_edited);
@@ -1133,6 +1243,7 @@ void AnimationPlayerEditor::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_blend_editor_next_changed"),&AnimationPlayerEditor::_blend_editor_next_changed);
 	ObjectTypeDB::bind_method(_MD("_unhandled_key_input"),&AnimationPlayerEditor::_unhandled_key_input);
 	ObjectTypeDB::bind_method(_MD("_animation_tool_menu"),&AnimationPlayerEditor::_animation_tool_menu);
+	ObjectTypeDB::bind_method(_MD("_animation_save_menu"), &AnimationPlayerEditor::_animation_save_menu);
 
 
 
@@ -1170,6 +1281,17 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 	load_anim->set_tooltip("Load an animation from disk.");
 	hb->add_child(load_anim);
 
+	save_anim = memnew(MenuButton);
+	save_anim->set_tooltip("Save the current animation");
+	save_anim->get_popup()->add_item("Save", ANIM_SAVE);
+	save_anim->get_popup()->add_item("Save As..", ANIM_SAVE_AS);
+	save_anim->set_focus_mode(Control::FOCUS_NONE);
+	hb->add_child(save_anim);
+
+	accept = memnew(AcceptDialog);
+	add_child(accept);
+	accept->connect("confirmed", this, "_menu_confirm_current");
+
 	duplicate_anim = memnew( ToolButton );
 	hb->add_child(duplicate_anim);
 	duplicate_anim->set_tooltip("Duplicate Animation");
@@ -1339,7 +1461,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 	remove_anim->connect("pressed", this,"_animation_remove");
 	animation->connect("item_selected", this,"_animation_selected",Vector<Variant>(),true);
 	resource_edit_anim->connect("pressed", this,"_animation_resource_edit");
-	file->connect("file_selected", this,"_file_selected");
+	file->connect("file_selected", this,"_dialog_action");
 	 seek->connect("value_changed", this, "_seek_value_changed",Vector<Variant>(),true);
 	 scale->connect("text_entered", this, "_scale_changed",Vector<Variant>(),true);
 	 editor->get_animation_editor()->connect("timeline_changed",this,"_animation_key_editor_seek");
diff --git a/tools/editor/plugins/animation_player_editor_plugin.h b/tools/editor/plugins/animation_player_editor_plugin.h
index 5705742565..ac4d1ab6ba 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.h
+++ b/tools/editor/plugins/animation_player_editor_plugin.h
@@ -55,6 +55,17 @@ class AnimationPlayerEditor : public VBoxContainer {
 		TOOL_EDIT_RESOURCE
 	};
 
+	enum {
+		ANIM_SAVE,
+		ANIM_SAVE_AS
+	};
+
+	enum {
+		RESOURCE_LOAD,
+		RESOURCE_SAVE
+	};
+
+
 	OptionButton *animation;
 	Button *stop;
 	Button *play;
@@ -70,6 +81,7 @@ class AnimationPlayerEditor : public VBoxContainer {
 	Button *edit_anim;
 	Button *resource_edit_anim;
 	Button *load_anim;
+	MenuButton *save_anim;
 	Button *blend_anim;
 	Button *remove_anim;
 	MenuButton *tool_anim;
@@ -85,6 +97,8 @@ class AnimationPlayerEditor : public VBoxContainer {
 	bool last_active;
 
 	EditorFileDialog *file;
+	AcceptDialog *accept;
+	int current_option;
 
 	struct BlendEditor {
 
@@ -116,13 +130,18 @@ class AnimationPlayerEditor : public VBoxContainer {
 	void _animation_rename();
 	void _animation_name_edited();
 	void _animation_load();
+
+	void _animation_save_in_path(const Ref<Resource>& p_resource, const String& p_path);
+	void _animation_save(const Ref<Resource>& p_resource);
+	void _animation_save_as(const Ref<Resource>& p_resource);
+
 	void _animation_remove();
 	void _animation_blend();
 	void _animation_edit();
 	void _animation_duplicate();
 	void _animation_resource_edit();
 	void _scale_changed(const String& p_scale);
-	void _file_selected(String p_file);
+	void _dialog_action(String p_file);
 	void _seek_frame_changed(const String& p_frame);
 	void _seek_value_changed(float p_value);
 	void _blend_editor_next_changed(const String& p_string);
@@ -141,6 +160,7 @@ class AnimationPlayerEditor : public VBoxContainer {
 	void _animation_key_editor_anim_len_changed(float p_new);
 	void _unhandled_key_input(const InputEvent& p_ev);
 	void _animation_tool_menu(int p_option);
+	void _animation_save_menu(int p_option);
 
 	AnimationPlayerEditor();
 protected:

From 53c9e8301c41b8ede999a7596643e33e36d2ca40 Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Fri, 18 Sep 2015 15:23:00 +0100
Subject: [PATCH 30/78] Ignore alpha materials in baked light ray-tracer.

---
 tools/editor/plugins/baked_light_baker.cpp | 174 +++++++++++++--------
 tools/editor/plugins/baked_light_baker.h   |   6 +-
 2 files changed, 110 insertions(+), 70 deletions(-)

diff --git a/tools/editor/plugins/baked_light_baker.cpp b/tools/editor/plugins/baked_light_baker.cpp
index 4599dbfb54..261d862b37 100644
--- a/tools/editor/plugins/baked_light_baker.cpp
+++ b/tools/editor/plugins/baked_light_baker.cpp
@@ -115,6 +115,8 @@ void BakedLightBaker::_add_mesh(const Ref<Mesh>& p_mesh,const Ref<Material>& p_m
 			if (!mat_map.has(mat)) {
 
 				MeshMaterial mm;
+				mm.is_double_sided = mat->get_flag(Material::FLAG_DOUBLE_SIDED);
+				mm.use_alpha = false;
 
 				Ref<FixedMaterial> fm = mat;
 				if (fm.is_valid()) {
@@ -128,6 +130,8 @@ void BakedLightBaker::_add_mesh(const Ref<Mesh>& p_mesh,const Ref<Material>& p_m
 						mm.specular.color=mm.specular.color.to_linear();
 
 					mm.specular.tex=_get_mat_tex(fm->get_texture(FixedMaterial::PARAM_SPECULAR));
+
+					mm.use_alpha = fm->get_fixed_flag(FixedMaterial::FLAG_USE_ALPHA);
 				} else {
 
 					mm.diffuse.color=Color(1,1,1,1);
@@ -311,7 +315,12 @@ void BakedLightBaker::_parse_geometry(Node* p_node) {
 			lights.push_back(dirl);
 		}
 
-	} else if (p_node->cast_to<Spatial>()){
+	}
+	else if (p_node->cast_to<BakedLightSampler>()){
+		// Ignore meshes and lights contained in baked light samplers
+		return;
+	}
+	else if (p_node->cast_to<Spatial>()){
 
 		Spatial *sp = p_node->cast_to<Spatial>();
 
@@ -472,6 +481,7 @@ BakedLightBaker::BVH* BakedLightBaker::_parse_bvh(BVH** p_children, int p_size,
 	BVH* right = _parse_bvh(&p_children[p_size/2],p_size-p_size/2,p_depth+1,max_depth);
 
 	BVH *_new = memnew(BVH);
+	_new->id=-1;
 	_new->aabb=aabb;
 	_new->center=aabb.pos+aabb.size*0.5;
 	_new->children[0]=left;
@@ -488,6 +498,7 @@ void BakedLightBaker::_make_bvh() {
 	int max_depth=0;
 	for(int i=0;i<triangles.size();i++) {
 		bases[i]=memnew( BVH );
+		bases[i]->id=i;
 		bases[i]->leaf=&triangles[i];
 		bases[i]->aabb.pos=triangles[i].vertices[0];
 		bases[i]->aabb.expand_to(triangles[i].vertices[1]);
@@ -949,7 +960,7 @@ void BakedLightBaker::_plot_light(ThreadStack& thread_stack,const Vector3& p_plo
 }
 
 
-float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,const Vector3& p_begin, const Vector3& p_end,float p_rest,const Color& p_light,float *p_att_curve,float p_att_pos,int p_att_curve_len,int p_bounces,bool p_first_bounce,bool p_only_dist) {
+float BakedLightBaker::_throw_ray(ThreadStack& thread_stack, bool p_bake_direct, const Vector3& p_begin, const Vector3& p_end, float p_rest, const Color& p_light, float *p_att_curve, float p_att_pos, int p_att_curve_len, int p_bounces, bool p_first_bounce, bool p_only_dist, Vector<int> &p_ignore_list) {
 
 
 	uint32_t* stack = thread_stack.ray_stack;
@@ -978,6 +989,7 @@ float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,c
 	Vector3 r_point;
 	Vector3 end=p_end;
 
+	int triangle_id = -1;
 	Triangle *triangle=NULL;
 
 	//for(int i=0;i<max_depth;i++)
@@ -986,7 +998,7 @@ float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,c
 	int level=0;
 	//AABB ray_aabb;
 	//ray_aabb.pos=p_begin;
-	//ray_aabb.expand_to(p_end);
+	//ray_aabb.expand_to(end);
 
 
 	const BVH *bvhptr = bvh;
@@ -1004,47 +1016,53 @@ float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,c
 		switch(mode) {
 			case TEST_AABB_BIT: {
 
-				if (b.leaf) {
+				if (p_ignore_list.find(b.id)==-1) {
+					if (b.leaf) {
 
 
-					Face3 f3(b.leaf->vertices[0],b.leaf->vertices[1],b.leaf->vertices[2]);
+						Face3 f3(b.leaf->vertices[0],b.leaf->vertices[1],b.leaf->vertices[2]);
 
 
-					Vector3 res;
+						Vector3 res;
 
-					if (f3.intersects_segment(p_begin,end,&res)) {
+						if (f3.intersects_segment(p_begin,end,&res)) {
 
 
-						float nd = n.dot(res);
-						if (nd<d) {
+							float nd = n.dot(res);
+							if (nd<d) {
+
+								d=nd;
+								r_point=res;
+								end=res;
+								len=(p_begin-end).length();
+								r_normal=f3.get_plane().get_normal();
+								triangle=b.leaf;
+								triangle_id=b.id;
+								inters=true;
+							}
 
-							d=nd;
-							r_point=res;
-							end=res;
-							len=(p_begin-end).length();
-							r_normal=f3.get_plane().get_normal();
-							triangle=b.leaf;
-							inters=true;
 						}
 
-					}
-
-					stack[level]=VISIT_DONE_BIT;
-				} else {
-
-
-					bool valid = b.aabb.smits_intersect_ray(p_begin,n,0,len);
-					//bool valid = b.aabb.intersects_segment(p_begin,p_end);
-	//				bool valid = b.aabb.intersects(ray_aabb);
-
-					if (!valid) {
-
 						stack[level]=VISIT_DONE_BIT;
-
 					} else {
 
-						stack[level]=VISIT_LEFT_BIT;
-					}
+
+						bool valid = b.aabb.smits_intersect_ray(p_begin,n,0,len);
+						//bool valid = b.aabb.intersects_segment(p_begin,end);
+		//				bool valid = b.aabb.intersects(ray_aabb);
+
+						if (!valid) {
+
+							stack[level]=VISIT_DONE_BIT;
+
+						} else {
+
+							stack[level]=VISIT_LEFT_BIT;
+						}
+					}	
+				}
+				else {
+					stack[level] = VISIT_DONE_BIT;
 				}
 
 			} continue;
@@ -1099,17 +1117,36 @@ float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,c
 
 		}
 
-		if (n.dot(r_normal)>0)
-			return -1;
-
-		if (n.dot(r_normal)>0)
-			r_normal=-r_normal;
+		bool passthrough = false;
 
 
 		//ok...
 		Color diffuse_at_point(0.8,0.8,0.8);
 		Color specular_at_point(0.0,0.0,0.0);
 
+		if (triangle->material) {
+
+			if ((triangle->material->is_double_sided == true || triangle->material->use_alpha == true) && use_translucency == true) {
+				if (n.dot(r_normal)>0)
+					r_normal = -r_normal;
+
+				if (triangle->material->use_alpha == true)
+					passthrough = true;
+			}
+			else {
+				if (n.dot(r_normal)>0)
+					return -1;
+			}
+
+			//triangle->get_uv(r_point);
+
+			diffuse_at_point = triangle->material->diffuse.get_color(uv);
+			specular_at_point = triangle->material->specular.get_color(uv);
+		}
+		else {
+			if (n.dot(r_normal)>0)
+				return -1;
+		}
 
 		float dist = p_begin.distance_to(r_point);
 
@@ -1139,23 +1176,18 @@ float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,c
 		//the multiplication can happen with more detail in the shader
 
 
-
-		if (triangle->material) {
-
-			//triangle->get_uv(r_point);
-
-			diffuse_at_point=triangle->material->diffuse.get_color(uv);
-			specular_at_point=triangle->material->specular.get_color(uv);
-		}
-
-
 		diffuse_at_point.r=res_light.r*diffuse_at_point.r;
 		diffuse_at_point.g=res_light.g*diffuse_at_point.g;
 		diffuse_at_point.b=res_light.b*diffuse_at_point.b;
 
 		float ret=1e6;
 
-		if (p_bounces>0) {
+		if (passthrough == true && triangle_id !=-1)
+		{
+			p_ignore_list.push_back(triangle_id);
+			ret=_throw_ray(thread_stack, p_bake_direct, r_point, p_end, p_rest, p_light, p_att_curve, p_att_pos, p_att_curve_len, p_bounces, p_first_bounce, p_only_dist, p_ignore_list);
+		}
+		else if (p_bounces>0 ) {
 
 
 			p_rest-=dist;
@@ -1226,33 +1258,37 @@ float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,c
 
 		bool skip=false;
 
-		if (!p_first_bounce || p_bake_direct) {
+		if (passthrough == false) {
+			if (!p_first_bounce || p_bake_direct) {
 
 
-			float r = plot_size * cell_size*2;
-			if (dist<r) {
-				//avoid accumulaiton of light on corners
-				//plot_light=plot_light.linear_interpolate(Color(0,0,0,0),1.0-sd/plot_size*plot_size);
-				skip=true;
-
-			} else {
-
-
-				Vector3 c1=r_normal.cross(n).normalized();
-				Vector3 c2=r_normal.cross(c1).normalized();
-				double r1 = double(rand())/RAND_MAX;
-				double r2 = double(rand())/RAND_MAX;
-				double r3 = double(rand())/RAND_MAX;
-				Vector3 rn = ((c1*(r1-0.5)) + (c2*(r2-0.5)) + (r_normal*r3*0.25)).normalized();
-				float d =_throw_ray(thread_stack,p_bake_direct,r_point,r_point+rn*p_rest,p_rest,diffuse_at_point,p_att_curve,p_att_pos,p_att_curve_len,p_bounces-1,false,true);
-				r = plot_size*cell_size*ao_radius;
-				if (d>0 && d<r) {
+				float r = plot_size * cell_size * 2;
+				if (dist < r) {
 					//avoid accumulaiton of light on corners
 					//plot_light=plot_light.linear_interpolate(Color(0,0,0,0),1.0-sd/plot_size*plot_size);
-					skip=true;
+					skip = true;
 
-				} else {
-					//plot_light=Color(0,0,0,0);
+				}
+				else {
+
+
+					Vector3 c1 = r_normal.cross(n).normalized();
+					Vector3 c2 = r_normal.cross(c1).normalized();
+					double r1 = double(rand()) / RAND_MAX;
+					double r2 = double(rand()) / RAND_MAX;
+					double r3 = double(rand()) / RAND_MAX;
+					Vector3 rn = ((c1*(r1 - 0.5)) + (c2*(r2 - 0.5)) + (r_normal*r3*0.25)).normalized();
+					float d = _throw_ray(thread_stack, p_bake_direct, r_point, r_point + rn*p_rest, p_rest, diffuse_at_point, p_att_curve, p_att_pos, p_att_curve_len, p_bounces - 1, false, true);
+					r = plot_size*cell_size*ao_radius;
+					if (d > 0 && d < r) {
+						//avoid accumulaiton of light on corners
+						//plot_light=plot_light.linear_interpolate(Color(0,0,0,0),1.0-sd/plot_size*plot_size);
+						skip = true;
+
+					}
+					else {
+						//plot_light=Color(0,0,0,0);
+					}
 				}
 			}
 		}
diff --git a/tools/editor/plugins/baked_light_baker.h b/tools/editor/plugins/baked_light_baker.h
index 8fbeeddc6a..58197283a2 100644
--- a/tools/editor/plugins/baked_light_baker.h
+++ b/tools/editor/plugins/baked_light_baker.h
@@ -92,6 +92,9 @@ public:
 		Param diffuse;
 		Param specular;
 		Param emission;
+		
+		bool is_double_sided;
+		bool use_alpha;
 	};
 
 	struct Triangle {
@@ -154,6 +157,7 @@ public:
 
 	struct BVH {
 
+		int id;
 		AABB aabb;
 		Vector3 center;
 		Triangle *leaf;
@@ -307,7 +311,7 @@ public:
 	void _plot_light(ThreadStack& thread_stack,const Vector3& p_plot_pos,const AABB& p_plot_aabb,const Color& p_light,const Color& p_tint_light,bool p_only_full,const Plane& p_plane);
 	//void _plot_light_point(const Vector3& p_plot_pos, Octant *p_octant, const AABB& p_aabb,const Color& p_light);
 
-	float _throw_ray(ThreadStack& thread_stack,bool p_bake_direct,const Vector3& p_begin, const Vector3& p_end,float p_rest,const Color& p_light,float *p_att_curve,float p_att_pos,int p_att_curve_len,int p_bounces,bool p_first_bounce=false,bool p_only_dist=false);
+	float _throw_ray(ThreadStack& thread_stack,bool p_bake_direct,const Vector3& p_begin, const Vector3& p_end,float p_rest,const Color& p_light,float *p_att_curve,float p_att_pos,int p_att_curve_len,int p_bounces,bool p_first_bounce=false,bool p_only_dist=false, Vector<int>&p_ignore_list=Vector<int>());
 
 
 	float total_light_area;

From e723488aa3933ec0e56b8e09e44256f6dc5da344 Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Sat, 31 Oct 2015 08:59:29 +0000
Subject: [PATCH 31/78] Moved deleting sample player in OS finalize methods to
 before deleting audio server to prevent crash when exiting.

---
 platform/bb10/os_bb10.cpp       | 3 ++-
 platform/haiku/os_haiku.cpp     | 3 ++-
 platform/server/os_server.cpp   | 3 ++-
 platform/windows/os_windows.cpp | 3 ++-
 platform/winrt/os_winrt.cpp     | 3 ++-
 platform/x11/os_x11.cpp         | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/platform/bb10/os_bb10.cpp b/platform/bb10/os_bb10.cpp
index d89033b1df..c8e7ae561e 100644
--- a/platform/bb10/os_bb10.cpp
+++ b/platform/bb10/os_bb10.cpp
@@ -195,9 +195,10 @@ void OSBB10::finalize() {
 //		memdelete(debugger_connection_console);
 //}
 
+	memdelete(sample_manager);
+
 	audio_server->finish();
 	memdelete(audio_server);
-	memdelete(sample_manager);
 
 	visual_server->finish();
 	memdelete(visual_server);
diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp
index 1edb23d504..ef483657ca 100644
--- a/platform/haiku/os_haiku.cpp
+++ b/platform/haiku/os_haiku.cpp
@@ -137,9 +137,10 @@ void OS_Haiku::finalize() {
 	spatial_sound_2d_server->finish();
 	memdelete(spatial_sound_2d_server);
 
+	memdelete(sample_manager);
+	
 	audio_server->finish();
 	memdelete(audio_server);
-	memdelete(sample_manager);
 
 	visual_server->finish();
 	memdelete(visual_server);
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index 75e0878bac..8b831140d6 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -107,9 +107,10 @@ void OS_Server::finalize() {
 //		memdelete(debugger_connection_console);
 //}
 
+	memdelete(sample_manager);
+
 	audio_server->finish();
 	memdelete(audio_server);
-	memdelete(sample_manager);
 
 	visual_server->finish();
 	memdelete(visual_server);
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 438a5a6903..c6dae86222 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1373,9 +1373,10 @@ void OS_Windows::finalize() {
 //		memdelete(debugger_connection_console);
 //}
 
+	memdelete(sample_manager);
+
 	audio_server->finish();
 	memdelete(audio_server);
-	memdelete(sample_manager);
 
 	memdelete(input);
 
diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp
index 3e06d9d59b..02de262508 100644
--- a/platform/winrt/os_winrt.cpp
+++ b/platform/winrt/os_winrt.cpp
@@ -326,10 +326,11 @@ void OSWinrt::finalize() {
 	//if (debugger_connection_console) {
 //		memdelete(debugger_connection_console);
 //}
+	
+	memdelete(sample_manager);
 
 	audio_server->finish();
 	memdelete(audio_server);
-	memdelete(sample_manager);
 
 	memdelete(input);
 
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 34bd1184a1..3218230d0b 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -452,9 +452,10 @@ void OS_X11::finalize() {
 //		memdelete(debugger_connection_console);
 //}
 
+	memdelete(sample_manager);
+
 	audio_server->finish();
 	memdelete(audio_server);
-	memdelete(sample_manager);
 
 	visual_server->finish();
 	memdelete(visual_server);

From 957baf48dc86c6f4c6d00b74d384d7d7e636104b Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Sun, 9 Aug 2015 17:43:44 +0100
Subject: [PATCH 32/78] BoneAttachment fix.

---
 scene/3d/skeleton.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp
index 4712ba308a..cb81228dff 100644
--- a/scene/3d/skeleton.cpp
+++ b/scene/3d/skeleton.cpp
@@ -250,7 +250,7 @@ void Skeleton::_notification(int p_what) {
 					ERR_CONTINUE(!obj);
 					Spatial *sp = obj->cast_to<Spatial>();
 					ERR_CONTINUE(!sp);
-					sp->set_transform(b.pose_global * b.rest_global_inverse);
+					sp->set_transform(b.pose_global);
 				}
 			}
 

From e011bcf16291f55e1692a4d3092010c97923fcfc Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Wed, 2 Sep 2015 13:11:34 +0100
Subject: [PATCH 33/78] Experimental retooling of AnimationTreePlayer to allow
 manual advancement.

---
 scene/animation/animation_tree_player.cpp | 96 +++++++++++++++++++++--
 scene/animation/animation_tree_player.h   | 19 ++++-
 2 files changed, 105 insertions(+), 10 deletions(-)

diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 14f2110915..c7e259c3c6 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -29,6 +29,42 @@
 #include "animation_tree_player.h"
 #include "animation_player.h"
 
+#include "scene/scene_string_names.h"
+
+
+void AnimationTreePlayer::set_animation_process_mode(AnimationProcessMode p_mode) {
+
+	if (animation_process_mode == p_mode)
+		return;
+
+	bool pr = processing;
+	if (pr)
+		_set_process(false);
+	animation_process_mode = p_mode;
+	if (pr)
+		_set_process(true);
+
+}
+
+AnimationTreePlayer::AnimationProcessMode AnimationTreePlayer::get_animation_process_mode() const{
+
+	return animation_process_mode;
+}
+
+void AnimationTreePlayer::_set_process(bool p_process, bool p_force)
+{
+	if (processing == p_process && !p_force)
+		return;
+
+	switch (animation_process_mode) {
+
+	case ANIMATION_PROCESS_FIXED: set_fixed_process(p_process && active); break;
+	case ANIMATION_PROCESS_IDLE: set_process(p_process && active); break;
+	}
+
+	processing = p_process;
+}
+
 
 bool AnimationTreePlayer::_set(const StringName& p_name, const Variant& p_value) {
 
@@ -42,6 +78,11 @@ bool AnimationTreePlayer::_set(const StringName& p_name, const Variant& p_value)
 		return true;
 	}
 
+	if(String(p_name) == SceneStringNames::get_singleton()->playback_active) {
+		set_active(p_value);
+		return true;
+	}
+
 	if (String(p_name)!="data")
 		return false;
 
@@ -190,6 +231,11 @@ bool AnimationTreePlayer::_get(const StringName& p_name,Variant &r_ret) const {
 		return true;
 	}
 
+	if (String(p_name) == "playback/active") {
+		r_ret=is_active();
+		return true;
+	}
+
 	if (String(p_name)!="data")
 		return false;
 
@@ -342,11 +388,24 @@ void AnimationTreePlayer::_get_property_list( List<PropertyInfo> *p_list) const
 	p_list->push_back( PropertyInfo(Variant::DICTIONARY,"data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_STORAGE|PROPERTY_USAGE_NETWORK) );
 }
 
+void AnimationTreePlayer::advance(float p_time) {
+
+	_process_animation(p_time);
+}
 
 void AnimationTreePlayer::_notification(int p_what) {
 
 	switch(p_what) {
 
+		case NOTIFICATION_ENTER_TREE: {
+
+			if (!processing) {
+				//make sure that a previous process state was not saved
+				//only process if "processing" is set
+				set_fixed_process(false);
+				set_process(false);
+			}
+		} break;
 		case NOTIFICATION_READY: {
 			dirty_caches=true;
 			if (master!=NodePath()) {
@@ -354,7 +413,19 @@ void AnimationTreePlayer::_notification(int p_what) {
 			}
 		} break;
 		case NOTIFICATION_PROCESS: {
-			_process_animation();
+			if (animation_process_mode==ANIMATION_PROCESS_FIXED)
+				break;
+
+			if (processing)
+				_process_animation( get_process_delta_time() );
+		} break;
+		case NOTIFICATION_FIXED_PROCESS: {
+		
+			if (animation_process_mode==ANIMATION_PROCESS_IDLE)
+				break;
+
+			if (processing)
+				_process_animation(get_fixed_process_delta_time());
 		} break;
 	}
 
@@ -656,10 +727,7 @@ float AnimationTreePlayer::_process_node(const StringName& p_node,AnimationNode
 }
 
 
-void AnimationTreePlayer::_process_animation() {
-
-	if (!active)
-		return;
+void AnimationTreePlayer::_process_animation(float p_delta) {
 
 	if (last_error!=CONNECT_OK)
 		return;
@@ -675,7 +743,7 @@ void AnimationTreePlayer::_process_animation() {
 		_process_node(out_name,&prev, 1.0, 0, true );
 		reset_request=false;
 	} else
-		_process_node(out_name,&prev, 1.0, get_process_delta_time(), false );
+		_process_node(out_name,&prev, 1.0, p_delta, false );
 
 	if (dirty_caches) {
 		//some animation changed.. ignore this pass
@@ -1520,8 +1588,12 @@ void AnimationTreePlayer::recompute_caches() {
 
 void AnimationTreePlayer::set_active(bool p_active) {
 
-	active=p_active;
-	set_process(active);
+	if (active == p_active)
+		return;
+
+	active = p_active;
+	processing = active;
+	_set_process(processing, true);
 }
 
 bool AnimationTreePlayer::is_active() const {
@@ -1743,13 +1815,18 @@ void AnimationTreePlayer::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("get_node_list"),&AnimationTreePlayer::_get_node_list);
 
+	ObjectTypeDB::bind_method(_MD("set_animation_process_mode","mode"),&AnimationTreePlayer::set_animation_process_mode);
+	ObjectTypeDB::bind_method(_MD("get_animation_process_mode"),&AnimationTreePlayer::get_animation_process_mode);
 
+	ObjectTypeDB::bind_method(_MD("advance", "delta"), &AnimationTreePlayer::advance);
 
 
 	ObjectTypeDB::bind_method(_MD("reset"),&AnimationTreePlayer::reset);
 
 	ObjectTypeDB::bind_method(_MD("recompute_caches"),&AnimationTreePlayer::recompute_caches);	
 
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "playback/process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), _SCS("set_animation_process_mode"), _SCS("get_animation_process_mode"));
+
 	BIND_CONSTANT( NODE_OUTPUT );
 	BIND_CONSTANT( NODE_ANIMATION );
 	BIND_CONSTANT( NODE_ONESHOT );
@@ -1770,6 +1847,9 @@ AnimationTreePlayer::AnimationTreePlayer() {
 	out_name="out";
 	out->pos=Point2(40,40);
 	node_map.insert( out_name , out);
+	AnimationProcessMode animation_process_mode;
+	animation_process_mode = ANIMATION_PROCESS_IDLE;
+	processing = false;
 	active=false;
 	dirty_caches=true;
 	reset_request=false;
diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h
index 9e936304c6..9ea5ccf330 100644
--- a/scene/animation/animation_tree_player.h
+++ b/scene/animation/animation_tree_player.h
@@ -34,6 +34,7 @@
 #include "scene/3d/spatial.h"
 #include "scene/3d/skeleton.h"
 #include "scene/main/misc.h"
+#include "animation_player.h"
 
 
 class AnimationTreePlayer : public Node {
@@ -42,7 +43,10 @@ class AnimationTreePlayer : public Node {
 	OBJ_CATEGORY("Animation Nodes");
 
 public:
-
+	enum AnimationProcessMode {
+		ANIMATION_PROCESS_FIXED,
+		ANIMATION_PROCESS_IDLE,
+	};
 
 	enum NodeType {
 
@@ -256,13 +260,15 @@ private:
 
 	ConnectError last_error;
 	AnimationNode *active_list;
+	AnimationProcessMode animation_process_mode;
+	bool processing;
 	bool active;
 	bool dirty_caches;
 	Map<StringName,NodeBase*> node_map;
 
 	// return time left to finish animation
 	float _process_node(const StringName& p_node,AnimationNode **r_prev_anim, float p_weight,float p_step, bool p_seek=false,const HashMap<NodePath,bool> *p_filter=NULL, float p_reverse_weight=0);
-	void _process_animation();
+	void _process_animation(float p_delta);
 	bool reset_request;
 
 	ConnectError _cycle_test(const StringName &p_at_node);
@@ -409,12 +415,21 @@ public:
 
 	ConnectError get_last_error() const;
 
+	void set_animation_process_mode(AnimationProcessMode p_mode);
+	AnimationProcessMode get_animation_process_mode() const;
+
+	void _set_process(bool p_process, bool p_force = false);
+
+	void advance(float p_time);
+
 	AnimationTreePlayer();
 	~AnimationTreePlayer();
 
 };
 
 VARIANT_ENUM_CAST( AnimationTreePlayer::NodeType );
+VARIANT_ENUM_CAST( AnimationTreePlayer::AnimationProcessMode );
+
 #endif // ANIMATION_TREE_PLAYER_H
 
 

From 539bbd66549545ce67bd46d49a6693d854bea634 Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Mon, 3 Aug 2015 19:36:20 +0100
Subject: [PATCH 34/78] Disable baked lighting sampling on shadeless materials.

---
 drivers/gles2/rasterizer_gles2.cpp | 118 +++++++++++++++--------------
 1 file changed, 61 insertions(+), 57 deletions(-)

diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp
index d84ee5a758..b602cf33f0 100644
--- a/drivers/gles2/rasterizer_gles2.cpp
+++ b/drivers/gles2/rasterizer_gles2.cpp
@@ -6526,80 +6526,84 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans
 			material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP,false);
 			material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_DP_SAMPLER,false);
 
-			if (e->instance->sampled_light.is_valid()) {
+			if (material->flags[VS::MATERIAL_FLAG_UNSHADED] == false && current_debug != VS::SCENARIO_DEBUG_SHADELESS) {
 
-				SampledLight *sl = sampled_light_owner.get(e->instance->sampled_light);
-				if (sl) {
+				if (e->instance->sampled_light.is_valid()) {
 
-					baked_light=NULL; //can't mix
-					material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_DP_SAMPLER,true);
-					glActiveTexture(GL_TEXTURE0+max_texture_units-3);
-					glBindTexture(GL_TEXTURE_2D,sl->texture); //bind the texture
-					sampled_light_dp_multiplier=sl->multiplier;
-					bind_dp_sampler=true;
-				}
-			}
-
-
-			if (!additive && baked_light) {
-
-				if (baked_light->mode==VS::BAKED_LIGHT_OCTREE && baked_light->octree_texture.is_valid() && e->instance->baked_light_octree_xform) {
-					material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_OCTREE,true);
-					bind_baked_light_octree=true;
-					if (prev_baked_light!=baked_light) {
-						Texture *tex=texture_owner.get(baked_light->octree_texture);
-						if (tex) {
-
-							glActiveTexture(GL_TEXTURE0+max_texture_units-3);
-							glBindTexture(tex->target,tex->tex_id); //bind the texture
-						}
-						if (baked_light->light_texture.is_valid()) {
-							Texture *texl=texture_owner.get(baked_light->light_texture);
-							if (texl) {
-								glActiveTexture(GL_TEXTURE0+max_texture_units-4);
-								glBindTexture(texl->target,texl->tex_id); //bind the light texture
-							}
-						}
+					SampledLight *sl = sampled_light_owner.get(e->instance->sampled_light);
+					if (sl) {
 
+						baked_light = NULL; //can't mix
+						material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_DP_SAMPLER, true);
+						glActiveTexture(GL_TEXTURE0 + max_texture_units - 3);
+						glBindTexture(GL_TEXTURE_2D, sl->texture); //bind the texture
+						sampled_light_dp_multiplier = sl->multiplier;
+						bind_dp_sampler = true;
 					}
-				} else if (baked_light->mode==VS::BAKED_LIGHT_LIGHTMAPS) {
+				}
 
 
-					int lightmap_idx = e->instance->baked_lightmap_id;
+				if (!additive && baked_light) {
 
-					material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP,false);
-					bind_baked_lightmap=false;
-
-
-					if (baked_light->lightmaps.has(lightmap_idx)) {
-
-
-						RID texid = baked_light->lightmaps[lightmap_idx];
-
-						if (prev_baked_light!=baked_light || texid!=prev_baked_light_texture) {
-
-
-							Texture *tex = texture_owner.get(texid);
+					if (baked_light->mode == VS::BAKED_LIGHT_OCTREE && baked_light->octree_texture.is_valid() && e->instance->baked_light_octree_xform) {
+						material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_OCTREE, true);
+						bind_baked_light_octree = true;
+						if (prev_baked_light != baked_light) {
+							Texture *tex = texture_owner.get(baked_light->octree_texture);
 							if (tex) {
 
-								glActiveTexture(GL_TEXTURE0+max_texture_units-3);
-								glBindTexture(tex->target,tex->tex_id); //bind the texture
+								glActiveTexture(GL_TEXTURE0 + max_texture_units - 3);
+								glBindTexture(tex->target, tex->tex_id); //bind the texture
+							}
+							if (baked_light->light_texture.is_valid()) {
+								Texture *texl = texture_owner.get(baked_light->light_texture);
+								if (texl) {
+									glActiveTexture(GL_TEXTURE0 + max_texture_units - 4);
+									glBindTexture(texl->target, texl->tex_id); //bind the light texture
+								}
 							}
 
-							prev_baked_light_texture=texid;
 						}
+					}
+					else if (baked_light->mode == VS::BAKED_LIGHT_LIGHTMAPS) {
+
+
+						int lightmap_idx = e->instance->baked_lightmap_id;
+
+						material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP, false);
+						bind_baked_lightmap = false;
+
+
+						if (baked_light->lightmaps.has(lightmap_idx)) {
+
+
+							RID texid = baked_light->lightmaps[lightmap_idx];
+
+							if (prev_baked_light != baked_light || texid != prev_baked_light_texture) {
+
+
+								Texture *tex = texture_owner.get(texid);
+								if (tex) {
+
+									glActiveTexture(GL_TEXTURE0 + max_texture_units - 3);
+									glBindTexture(tex->target, tex->tex_id); //bind the texture
+								}
+
+								prev_baked_light_texture = texid;
+							}
+
+							if (texid.is_valid()) {
+								material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP, true);
+								bind_baked_lightmap = true;
+							}
 
-						if (texid.is_valid()) {
-							material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP,true);
-							bind_baked_lightmap=true;
 						}
-
 					}
 				}
-			}
 
-			if (int(prev_baked_light!=NULL) ^ int(baked_light!=NULL)) {
-				rebind=true;
+				if (int(prev_baked_light != NULL) ^ int(baked_light != NULL)) {
+					rebind = true;
+				}
 			}
 		}
 

From 0006f035ebb020227ad5b67faf4e04b723b1e0ec Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Sat, 15 Aug 2015 07:47:22 +0100
Subject: [PATCH 35/78] Added alignment to LineEdit GUI control.

---
 scene/gui/line_edit.cpp | 119 +++++++++++++++++++++++++++++++++++-----
 scene/gui/line_edit.h   |  21 ++++++-
 2 files changed, 124 insertions(+), 16 deletions(-)

diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 2b4d7db01e..310e2fee8b 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -145,6 +145,13 @@ void LineEdit::_input_event(InputEvent p_event) {
 
 							int old_cursor_pos = cursor_pos;
 							text = undo_text;
+
+							Ref<Font> font = get_font("font");
+
+							cached_width = 0;
+							for (int i = 0; i<text.length(); i++)
+								cached_width += font->get_char_size(text[i]).width;
+
 							if(old_cursor_pos > text.length()) {
 								set_cursor_pos(text.length());
 							} else {
@@ -164,6 +171,13 @@ void LineEdit::_input_event(InputEvent p_event) {
 							selection_clear();
 							undo_text = text;
 							text = text.substr(cursor_pos,text.length()-cursor_pos);
+
+							Ref<Font> font = get_font("font");
+
+							cached_width = 0;
+							for (int i = 0; i<text.length(); i++)
+								cached_width += font->get_char_size(text[i]).width;
+
 							set_cursor_pos(0);
 							emit_signal("text_changed",text);
 							_change_notify("text");
@@ -303,6 +317,18 @@ void LineEdit::_input_event(InputEvent p_event) {
 	}
 }
 
+void LineEdit::set_align(Align p_align) {
+
+	ERR_FAIL_INDEX(p_align, 4);
+	align = p_align;
+	update();
+}
+
+LineEdit::Align LineEdit::get_align() const{
+
+	return align;
+}
+
 Variant LineEdit::get_drag_data(const Point2& p_point) {
 
 	if (selection.drag_attempt && selection.enabled) {
@@ -325,7 +351,13 @@ void LineEdit::drop_data(const Point2& p_point,const Variant& p_data){
 	if (p_data.get_type()==Variant::STRING) {
 		set_cursor_at_pixel_pos(p_point.x);
 		int selected = selection.end - selection.begin;
+
+		Ref<Font> font = get_font("font");
+		for (int i = selection.begin; i<selection.end; i++)
+			cached_width -= font->get_char_size(text[i]).width;
+
 		text.erase(selection.begin, selected);
+
 		append_at_cursor(p_data);
 		selection.begin = cursor_pos-selected;
 		selection.end = cursor_pos;
@@ -365,8 +397,25 @@ void LineEdit::_notification(int p_what) {
 				get_stylebox("focus")->draw( ci, Rect2( Point2(), size ) );
 			}
 
-						
-			int ofs=style->get_offset().x;
+			int x_ofs=0;
+
+			switch (align) {
+				
+				case ALIGN_FILL:
+				case ALIGN_LEFT: {
+
+					x_ofs=style->get_offset().x;
+				} break;
+				case ALIGN_CENTER: {
+
+					x_ofs=x_ofs=int(size.width-(cached_width))/2;
+				} break;
+				case ALIGN_RIGHT: {
+
+					x_ofs=x_ofs=int(size.width-style->get_offset().x-(cached_width));
+				} break;
+			}
+
 			int ofs_max=width-style->get_minimum_size().width;
 			int char_ofs=window_pos;
 			
@@ -391,29 +440,29 @@ void LineEdit::_notification(int p_what) {
 				int char_width=font->get_char_size( cchar,next ).width;
 								
 		// end of widget, break!
-				if ( (ofs+char_width) > ofs_max )
+				if ((x_ofs + char_width) > ofs_max)
 					break;
 				
 				
 				bool selected=selection.enabled && char_ofs>=selection.begin && char_ofs<selection.end;
 				
 				if (selected)
-					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2( Point2( ofs , y_ofs ),Size2( char_width, y_area )),selection_color);
+					VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(Point2(x_ofs, y_ofs), Size2(char_width, y_area)), selection_color);
 				
 
-				font->draw_char(ci,Point2( ofs , y_ofs+font_ascent ), cchar, next,selected?font_color_selected:font_color );
+				font->draw_char(ci, Point2(x_ofs, y_ofs + font_ascent), cchar, next, selected ? font_color_selected : font_color);
 				
 				if (char_ofs==cursor_pos && has_focus())
 					VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(
-						Point2( ofs , y_ofs ), Size2( 1, y_area ) ), cursor_color );
+						Point2( x_ofs , y_ofs ), Size2( 1, y_area ) ), cursor_color );
 				
-				ofs+=char_width;
+				x_ofs+=char_width;
 				char_ofs++;
 			}
 
 			if (char_ofs==cursor_pos && has_focus()) //may be at the end
 				VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(
-					Point2( ofs , y_ofs ), Size2( 1, y_area ) ), cursor_color );		
+					Point2( x_ofs , y_ofs ), Size2( 1, y_area ) ), cursor_color );		
 			
 		} break;
 		case NOTIFICATION_FOCUS_ENTER: {
@@ -484,9 +533,29 @@ void LineEdit::shift_selection_check_post(bool p_shift) {
 
 void LineEdit::set_cursor_at_pixel_pos(int p_x) {
 	
-	int ofs=window_pos;
-	int pixel_ofs=get_stylebox("normal")->get_offset().x;
-	Ref<Font> font=get_font("font");
+	Ref<Font> font = get_font("font");
+	int ofs = window_pos;
+	Ref<StyleBox> style = get_stylebox("normal");
+	int pixel_ofs = 0;
+	Size2 size = get_size();
+
+	switch (align) {
+				
+		case ALIGN_FILL:
+		case ALIGN_LEFT: {
+			
+			pixel_ofs = int(style->get_offset().x);
+		} break;
+		case ALIGN_CENTER: {
+
+			pixel_ofs=int(size.width-(cached_width))/2;
+		} break;
+		case ALIGN_RIGHT: {
+
+			pixel_ofs=int(size.width-style->get_offset().x-(cached_width));
+		} break;
+	}
+
 
 	while (ofs<text.length()) {
 		
@@ -523,6 +592,8 @@ void LineEdit::delete_char() {
 	
 	if ((text.length()<=0) || (cursor_pos==0)) return;
 	
+	Ref<Font> font = get_font("font");
+	cached_width -= font->get_char_size(text[cursor_pos - 1]).width;
 	
 	text.erase( cursor_pos-1, 1 );
 	
@@ -626,17 +697,22 @@ void LineEdit::append_at_cursor(String p_text) {
 	if ( ( max_length <= 0 ) || (text.length()+p_text.length() <= max_length)) {
 		
 		undo_text = text;
+
+		Ref<Font> font = get_font("font");
+
+		for (int i = 0; i<p_text.length(); i++)
+			cached_width += font->get_char_size(p_text[i]).width;
+
 		String pre = text.substr( 0, cursor_pos );
 		String post = text.substr( cursor_pos, text.length()-cursor_pos );
 		text=pre+p_text+post;
 		set_cursor_pos(cursor_pos+p_text.length());
-		
 	}
-	
 }
 
 void LineEdit::clear_internal() {
 	
+	cached_width = 0;
 	cursor_pos=0;
 	window_pos=0;
 	undo_text="";
@@ -676,6 +752,12 @@ void LineEdit::selection_delete() {
 	if (selection.enabled) {
 		
 		undo_text = text;
+
+		Ref<Font> font = get_font("font");
+
+		for (int i = selection.begin; i<selection.end; i++)
+			cached_width -= font->get_char_size(text[i]).width;
+
 		text.erase(selection.begin,selection.end-selection.begin);
 		cursor_pos-=CLAMP( cursor_pos-selection.begin, 0, selection.end-selection.begin);
 		
@@ -789,6 +871,8 @@ bool LineEdit::is_text_field() const {
 
 void LineEdit::_bind_methods() {
 	
+	ObjectTypeDB::bind_method(_MD("set_align", "align"), &LineEdit::set_align);
+	ObjectTypeDB::bind_method(_MD("get_align"), &LineEdit::get_align);
 
 	ObjectTypeDB::bind_method(_MD("_input_event"),&LineEdit::_input_event);
 	ObjectTypeDB::bind_method(_MD("clear"),&LineEdit::clear);	
@@ -809,15 +893,22 @@ void LineEdit::_bind_methods() {
 	ADD_SIGNAL( MethodInfo("text_changed", PropertyInfo( Variant::STRING, "text" )) );
 	ADD_SIGNAL( MethodInfo("text_entered", PropertyInfo( Variant::STRING, "text" )) );
 
+	BIND_CONSTANT(ALIGN_LEFT);
+	BIND_CONSTANT(ALIGN_CENTER);
+	BIND_CONSTANT(ALIGN_RIGHT);
+	BIND_CONSTANT(ALIGN_FILL);
+
 	ADD_PROPERTY( PropertyInfo( Variant::STRING, "text" ), _SCS("set_text"),_SCS("get_text") );
+	ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "align", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), _SCS("set_align"), _SCS("get_align"));
 	ADD_PROPERTY( PropertyInfo( Variant::INT, "max_length" ), _SCS("set_max_length"),_SCS("get_max_length") );
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "editable" ), _SCS("set_editable"),_SCS("is_editable") );
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "secret" ), _SCS("set_secret"),_SCS("is_secret") );
-
 }
 
 LineEdit::LineEdit() {
 	
+	align = ALIGN_LEFT;
+	cached_width = 0;
 	cursor_pos=0;
 	window_pos=0;
 	max_length = 0;
diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h
index b1c4c8f616..f28136d66e 100644
--- a/scene/gui/line_edit.h
+++ b/scene/gui/line_edit.h
@@ -36,7 +36,18 @@
 class LineEdit : public Control {
 	
 	OBJ_TYPE( LineEdit, Control );
-	
+
+public:
+	enum Align {
+
+		ALIGN_LEFT,
+		ALIGN_CENTER,
+		ALIGN_RIGHT,
+		ALIGN_FILL
+	};
+private:
+	Align align;
+
 	bool editable;
 	bool pass;
 	
@@ -46,6 +57,8 @@ class LineEdit : public Control {
 	int cursor_pos;
 	int window_pos;
 	int max_length; // 0 for no maximum
+
+	int cached_width;
 	
 	struct Selection {
 		
@@ -83,7 +96,8 @@ class LineEdit : public Control {
 protected:	
 	static void _bind_methods();	
 public:
-	
+	void set_align(Align p_align);
+	Align get_align() const;
 		
 	virtual Variant get_drag_data(const Point2& p_point);
 	virtual bool can_drop_data(const Point2& p_point,const Variant& p_data) const;
@@ -119,4 +133,7 @@ public:
 	
 };
 
+
+VARIANT_ENUM_CAST(LineEdit::Align);
+
 #endif

From e3c50ac63d57e484ae39761be54213cac8b4de4b Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Wed, 2 Sep 2015 12:36:52 +0100
Subject: [PATCH 36/78] Aligned line edit fix.

---
 scene/gui/line_edit.cpp | 61 ++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 310e2fee8b..8cf761bd82 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -175,8 +175,10 @@ void LineEdit::_input_event(InputEvent p_event) {
 							Ref<Font> font = get_font("font");
 
 							cached_width = 0;
-							for (int i = 0; i<text.length(); i++)
-								cached_width += font->get_char_size(text[i]).width;
+							if (font != NULL) {
+								for (int i = 0; i < text.length(); i++)
+									cached_width += font->get_char_size(text[i]).width;
+							}
 
 							set_cursor_pos(0);
 							emit_signal("text_changed",text);
@@ -353,8 +355,10 @@ void LineEdit::drop_data(const Point2& p_point,const Variant& p_data){
 		int selected = selection.end - selection.begin;
 
 		Ref<Font> font = get_font("font");
-		for (int i = selection.begin; i<selection.end; i++)
-			cached_width -= font->get_char_size(text[i]).width;
+		if (font != NULL) {
+			for (int i = selection.begin; i < selection.end; i++)
+				cached_width -= font->get_char_size(text[i]).width;
+		}
 
 		text.erase(selection.begin, selected);
 
@@ -559,7 +563,10 @@ void LineEdit::set_cursor_at_pixel_pos(int p_x) {
 
 	while (ofs<text.length()) {
 		
-		int char_w=font->get_char_size( text[ofs] ).width;
+		int char_w = 0;
+		if (font != NULL) {
+			int char_w = font->get_char_size(text[ofs]).width;
+		}
 		pixel_ofs+=char_w;
 		
 		if (pixel_ofs > p_x) { //found what we look for
@@ -593,7 +600,9 @@ void LineEdit::delete_char() {
 	if ((text.length()<=0) || (cursor_pos==0)) return;
 	
 	Ref<Font> font = get_font("font");
-	cached_width -= font->get_char_size(text[cursor_pos - 1]).width;
+	if (font != NULL) {
+		cached_width -= font->get_char_size(text[cursor_pos - 1]).width;
+	}
 	
 	text.erase( cursor_pos-1, 1 );
 	
@@ -664,13 +673,15 @@ void LineEdit::set_cursor_pos(int p_pos) {
 		int width_to_cursor=0;
 		int wp=window_pos;
 		
-		for (int i=window_pos;i<cursor_pos;i++)
-			width_to_cursor+=font->get_char_size( text[i] ).width;
+		if (font != NULL) {
+			for (int i=window_pos;i<cursor_pos;i++)
+				width_to_cursor+=font->get_char_size( text[i] ).width;
 		
-		while(width_to_cursor>=window_width && wp<text.length()) {			
-			
-			width_to_cursor-=font->get_char_size( text[ wp ] ).width;
-			wp++;
+			while (width_to_cursor >= window_width && wp < text.length()) {
+
+				width_to_cursor -= font->get_char_size(text[wp]).width;
+				wp++;
+			}
 		}
 		
 		if (wp!=window_pos)
@@ -699,9 +710,13 @@ void LineEdit::append_at_cursor(String p_text) {
 		undo_text = text;
 
 		Ref<Font> font = get_font("font");
-
-		for (int i = 0; i<p_text.length(); i++)
-			cached_width += font->get_char_size(p_text[i]).width;
+		if (font != NULL) {
+			for (int i = 0; i < p_text.length(); i++)
+				cached_width += font->get_char_size(p_text[i]).width;
+		}
+		else {
+			cached_width = 0;
+		}
 
 		String pre = text.substr( 0, cursor_pos );
 		String post = text.substr( cursor_pos, text.length()-cursor_pos );
@@ -753,10 +768,18 @@ void LineEdit::selection_delete() {
 		
 		undo_text = text;
 
-		Ref<Font> font = get_font("font");
-
-		for (int i = selection.begin; i<selection.end; i++)
-			cached_width -= font->get_char_size(text[i]).width;
+		if (text.size() > 0)
+		{
+			Ref<Font> font = get_font("font");
+			if (font != NULL) {
+				for (int i = selection.begin; i < selection.end; i++)
+					cached_width -= font->get_char_size(text[i]).width;
+			}
+		}
+		else
+		{
+			cached_width = 0;
+		}
 
 		text.erase(selection.begin,selection.end-selection.begin);
 		cursor_pos-=CLAMP( cursor_pos-selection.begin, 0, selection.end-selection.begin);

From 6bcc2e1f835c5e4f1c788f026e870019a4defff6 Mon Sep 17 00:00:00 2001
From: Saracen <SaracenOne@gmail.com>
Date: Wed, 28 Oct 2015 20:03:10 +0000
Subject: [PATCH 37/78] Fixed broken set_loop_restart_time method in
 AudioStreamPlaybackOGGVorbis class.

---
 drivers/vorbis/audio_stream_ogg_vorbis.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/vorbis/audio_stream_ogg_vorbis.h b/drivers/vorbis/audio_stream_ogg_vorbis.h
index 827d8b0be3..5dbada962a 100644
--- a/drivers/vorbis/audio_stream_ogg_vorbis.h
+++ b/drivers/vorbis/audio_stream_ogg_vorbis.h
@@ -85,7 +85,7 @@ public:
 	virtual void stop();
 	virtual bool is_playing() const;
 
-	virtual void set_loop_restart_time(float p_time) { loop_restart_time=0; }
+	virtual void set_loop_restart_time(float p_time) { loop_restart_time=p_time; }
 
 	virtual void set_paused(bool p_paused);
 	virtual bool is_paused(bool p_paused) const;

From 467ee040c485f317048d5aec97d5d6d0af1f54e7 Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Wed, 4 Nov 2015 15:38:02 -0300
Subject: [PATCH 38/78] Fix Range exp_edit property

---
 scene/gui/range.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp
index ad708d16f0..7103ee651f 100644
--- a/scene/gui/range.cpp
+++ b/scene/gui/range.cpp
@@ -243,7 +243,7 @@ void Range::_bind_methods() {
 	ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/step" ), _SCS("set_step"), _SCS("get_step") );
 	ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/page" ), _SCS("set_page"), _SCS("get_page") );
 	ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/value" ), _SCS("set_val"), _SCS("get_val") );
-	ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/exp_edit" ), _SCS("set_exp_unit_value"), _SCS("is_unit_value_exp") );
+	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "range/exp_edit" ), _SCS("set_exp_unit_value"), _SCS("is_unit_value_exp") );
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "rounded_values" ), _SCS("set_rounded_values"), _SCS("get_rounded_values") );
 
 }

From 8d48cf95b9408a0a54bb741c6b795d2e5179503d Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Thu, 5 Nov 2015 12:20:45 -0300
Subject: [PATCH 39/78] Add Tree checkbox check/uncheck behavior when pressing
 enter

---
 scene/gui/tree.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index 5df6f2ced9..9789c83806 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -2266,9 +2266,12 @@ bool Tree::edit_selected() {
 
 	TreeItem::Cell &c = s->cells[col];
 
+	if (c.mode==TreeItem::CELL_MODE_CHECK) {
 
-
-	if (c.mode==TreeItem::CELL_MODE_CUSTOM) {
+		s->set_checked(col, !c.checked);
+		item_edited(col,s);
+		return true;
+	} else if (c.mode==TreeItem::CELL_MODE_CUSTOM) {
 
 		edited_item=s;
 		edited_col=col;

From 03d4c05150deb7e78444a8c7f893855c07c0f775 Mon Sep 17 00:00:00 2001
From: George Marques <george@gmarqu.es>
Date: Fri, 6 Nov 2015 16:07:34 -0200
Subject: [PATCH 40/78] Fix Opus driver build for VS2010 and VS2012

Fix #2744
---
 drivers/opus/opus_config.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/opus/opus_config.h b/drivers/opus/opus_config.h
index c6470e92c3..98c3e87cc6 100644
--- a/drivers/opus/opus_config.h
+++ b/drivers/opus/opus_config.h
@@ -7,12 +7,16 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
+#if (!defined( _MSC_VER ) || ( _MSC_VER >= 1800 ))
+
 /* Define to 1 if you have the `lrint' function. */
 #define HAVE_LRINT 1
 
 /* Define to 1 if you have the `lrintf' function. */
 #define HAVE_LRINTF 1
 
+#endif
+
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
@@ -109,7 +113,11 @@
 /* Define to the equivalent of the C99 'restrict' keyword, or to
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
+#if (!defined( _MSC_VER ) || ( _MSC_VER >= 1800 ))
 #define restrict __restrict
+#else
+#undef restrict
+#endif
 /* Work around a bug in Sun C++: it does not support _Restrict or
    __restrict__, even though the corresponding Sun C compiler ends up with
    "#define restrict _Restrict" or "#define restrict __restrict__" in the

From d5fbd1d262fe8d38d550e23169af748e84667881 Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Fri, 6 Nov 2015 18:52:15 -0300
Subject: [PATCH 41/78] Fix String content test

---
 core/variant_op.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/variant_op.cpp b/core/variant_op.cpp
index 1cdf6d7319..763b8c11b4 100644
--- a/core/variant_op.cpp
+++ b/core/variant_op.cpp
@@ -2573,7 +2573,7 @@ bool Variant::in(const Variant& p_index, bool *r_valid) const {
 				String idx=p_index;
 				const String *str=reinterpret_cast<const String*>(_data._mem);
 
-				return str->find("idx")!=-1;
+				return str->find(idx)!=-1;
 			}
 
 		} break;

From 7828986b1c8583078038093ae9ab1b77f21ddde4 Mon Sep 17 00:00:00 2001
From: MarianoGNU <marianognu.easyrpg@gmail.com>
Date: Fri, 6 Nov 2015 17:24:39 -0300
Subject: [PATCH 42/78] Add <Select All>(Ctrl+A) shortcut to LineEdit.

---
 scene/gui/line_edit.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 2b4d7db01e..7e64c0998f 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -192,6 +192,9 @@ void LineEdit::_input_event(InputEvent p_event) {
 						}
 
 					} break;
+					case (KEY_A): { //Select All
+						select();
+					} break;
 					default: { handled=false;}
 				}
 

From 8766d3100d72f4315457485506ec7ff9e8df3efa Mon Sep 17 00:00:00 2001
From: Zher Huei Lee <lee.zh.92@gmail.com>
Date: Mon, 19 Oct 2015 04:45:45 +0100
Subject: [PATCH 43/78] Updated nrex for LookAhead support

---
 drivers/nrex/nrex.cpp | 44 +++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/drivers/nrex/nrex.cpp b/drivers/nrex/nrex.cpp
index 696d46240e..ba8bfa8a59 100644
--- a/drivers/nrex/nrex.cpp
+++ b/drivers/nrex/nrex.cpp
@@ -210,14 +210,18 @@ struct nrex_node
 
 struct nrex_node_group : public nrex_node
 {
-        int capturing;
+        static const int NonCapture = -1;
+        static const int Class = -2;
+        static const int LookAhead = -3;
+
+        int mode;
         bool negate;
         nrex_array<nrex_node*> childset;
         nrex_node* back;
 
-        nrex_node_group(int capturing)
+        nrex_node_group(int mode)
             : nrex_node(true)
-            , capturing(capturing)
+            , mode(mode)
             , negate(false)
             , back(NULL)
         {
@@ -234,9 +238,9 @@ struct nrex_node_group : public nrex_node
 
         int test(nrex_search* s, int pos) const
         {
-            if (capturing >= 0)
+            if (mode >= 0)
             {
-                s->captures[capturing].start = pos;
+                s->captures[mode].start = pos;
             }
             for (unsigned int i = 0; i < childset.size(); ++i)
             {
@@ -256,12 +260,20 @@ struct nrex_node_group : public nrex_node
                     {
                         return -1;
                     }
+                    if (i + 1 < childset.size())
+                    {
+                        continue;
+                    }
                 }
                 if (res >= 0)
                 {
-                    if (capturing >= 0)
+                    if (mode >= 0)
                     {
-                        s->captures[capturing].length = res - pos;
+                        s->captures[mode].length = res - pos;
+                    }
+                    else if (mode == LookAhead)
+                    {
+                        res = pos;
                     }
                     return next ? next->test(s, res) : res;
                 }
@@ -271,9 +283,9 @@ struct nrex_node_group : public nrex_node
 
         virtual int test_parent(nrex_search* s, int pos) const
         {
-            if (capturing >= 0)
+            if (mode >= 0)
             {
-                s->captures[capturing].length = pos - s->captures[capturing].start;
+                s->captures[mode].length = pos - s->captures[mode].start;
             }
             return nrex_node::test_parent(s, pos);
         }
@@ -647,7 +659,15 @@ bool nrex::compile(const nrex_char* pattern)
                 if (c[2] == ':')
                 {
                     c = &c[2];
-                    nrex_node_group* group = NREX_NEW(nrex_node_group(-1));
+                    nrex_node_group* group = NREX_NEW(nrex_node_group(nrex_node_group::NonCapture));
+                    stack.top()->add_child(group);
+                    stack.push(group);
+                }
+                else if (c[2] == '!' || c[2] == '=')
+                {
+                    c = &c[2];
+                    nrex_node_group* group = NREX_NEW(nrex_node_group(nrex_node_group::LookAhead));
+                    group->negate = (c[0] == '!');
                     stack.top()->add_child(group);
                     stack.push(group);
                 }
@@ -664,7 +684,7 @@ bool nrex::compile(const nrex_char* pattern)
             }
             else
             {
-                nrex_node_group* group = NREX_NEW(nrex_node_group(-1));
+                nrex_node_group* group = NREX_NEW(nrex_node_group(nrex_node_group::NonCapture));
                 stack.top()->add_child(group);
                 stack.push(group);
             }
@@ -682,7 +702,7 @@ bool nrex::compile(const nrex_char* pattern)
         }
         else if (c[0] == '[')
         {
-            nrex_node_group* group = NREX_NEW(nrex_node_group(-1));
+            nrex_node_group* group = NREX_NEW(nrex_node_group(nrex_node_group::Class));
             stack.top()->add_child(group);
             if (c[1] == '^')
             {

From 6d54f82ab4afe760743842f1eaba3cb4befec5c8 Mon Sep 17 00:00:00 2001
From: Zher Huei Lee <lee.zh.92@gmail.com>
Date: Tue, 20 Oct 2015 09:37:49 +0100
Subject: [PATCH 44/78] Updated nrex to latest version

---
 drivers/nrex/README.md |  53 ++-
 drivers/nrex/nrex.cpp  | 766 +++++++++++++++++++++++++++++++++--------
 drivers/nrex/nrex.hpp  |  10 +-
 3 files changed, 650 insertions(+), 179 deletions(-)

diff --git a/drivers/nrex/README.md b/drivers/nrex/README.md
index f150a5d76f..951b301c1e 100644
--- a/drivers/nrex/README.md
+++ b/drivers/nrex/README.md
@@ -18,47 +18,42 @@ More details about its use is documented in `nrex.hpp`
 
 Currently supported features:
  * Capturing `()` and non-capturing `(?:)` groups
- * Any character `.`
+ * Any character `.` (includes newlines)
  * Shorthand caracter classes `\w\W\s\S\d\D`
- * User-defined character classes such as `[A-Za-z]`
+ * POSIX character classes such as `[[:alnum:]]`
+ * Bracket expressions such as `[A-Za-z]`
  * Simple quantifiers `?`, `*` and `+`
  * Range quantifiers `{0,1}`
  * Lazy (non-greedy) quantifiers `*?`
  * Begining `^` and end `$` anchors
+ * Word boundaries `\b`
  * Alternation `|`
- * Backreferences `\1` to `\99`
-
-To do list:
+ * ASCII `\xFF` code points
  * Unicode `\uFFFF` code points
+ * Positive `(?=)` and negative `(?!)` lookahead
+ * Positive `(?<=)` and negative `(?<!)` lookbehind (fixed length and no alternations)
+ * Backreferences `\1` to `\9` (with option to expand to `\99`)
 
 ## License
 
 Copyright (c) 2015, Zher Huei Lee
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived from
-    this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would
+    be appreciated but is not required.
+    
+ 2. Altered source versions must be plainly marked as such, and must not
+    be misrepresented as being the original software.
+    
+ 3. This notice may not be removed or altered from any source
+    distribution.
diff --git a/drivers/nrex/nrex.cpp b/drivers/nrex/nrex.cpp
index ba8bfa8a59..104e07f887 100644
--- a/drivers/nrex/nrex.cpp
+++ b/drivers/nrex/nrex.cpp
@@ -29,11 +29,13 @@
 #include <wctype.h>
 #include <wchar.h>
 #define NREX_ISALPHANUM iswalnum
+#define NREX_ISSPACE iswspace
 #define NREX_STRLEN wcslen
 #else
 #include <ctype.h>
 #include <string.h>
 #define NREX_ISALPHANUM isalnum
+#define NREX_ISSPACE isspace
 #define NREX_STRLEN strlen
 #endif
 
@@ -116,34 +118,72 @@ class nrex_array
         }
 };
 
-static nrex_char nrex_unescape(nrex_char repr)
+static int nrex_parse_hex(nrex_char c)
 {
-    switch (repr)
+    if ('0' <= c && c <= '9')
     {
-        case '^': return '^';
-        case '$': return '$';
-        case '(': return '(';
-        case ')': return ')';
-        case '\\': return '\\';
-        case '.': return '.';
-        case '+': return '+';
-        case '*': return '*';
-        case '?': return '?';
-        case '-': return '-';
-        case 'a': return '\a';
-        case 'e': return '\e';
-        case 'f': return '\f';
-        case 'n': return '\n';
-        case 'r': return '\r';
-        case 't': return '\t';
-        case 'v': return '\v';
+        return int(c - '0');
     }
-    return 0;
+    else if ('a' <= c && c <= 'f')
+    {
+        return int(c - 'a') + 10;
+    }
+    else if ('A' <= c && c <= 'F')
+    {
+        return int(c - 'A') + 10;
+    }
+    return -1;
+}
+
+static nrex_char nrex_unescape(const nrex_char*& c)
+{
+    switch (c[1])
+    {
+        case '0': ++c; return '\0';
+        case 'a': ++c; return '\a';
+        case 'e': ++c; return '\e';
+        case 'f': ++c; return '\f';
+        case 'n': ++c; return '\n';
+        case 'r': ++c; return '\r';
+        case 't': ++c; return '\t';
+        case 'v': ++c; return '\v';
+        case 'b': ++c; return '\b';
+        case 'x':
+        {
+            int point = 0;
+            for (int i = 2; i <= 3; ++i)
+            {
+                int res = nrex_parse_hex(c[i]);
+                if (res == -1)
+                {
+                    return '\0';
+                }
+                point = (point << 4) + res;
+            }
+            c = &c[3];
+            return nrex_char(point);
+        }
+        case 'u':
+        {
+            int point = 0;
+            for (int i = 2; i <= 5; ++i)
+            {
+                int res = nrex_parse_hex(c[i]);
+                if (res == -1)
+                {
+                    return '\0';
+                }
+                point = (point << 4) + res;
+            }
+            c = &c[5];
+            return nrex_char(point);
+        }
+    }
+    return (++c)[0];
 }
 
 struct nrex_search
 {
-    public:
         const nrex_char* str;
         nrex_result* captures;
         int end;
@@ -168,12 +208,14 @@ struct nrex_node
         nrex_node* previous;
         nrex_node* parent;
         bool quantifiable;
+        int length;
 
         nrex_node(bool quantify = false)
             : next(NULL)
             , previous(NULL)
             , parent(NULL)
             , quantifiable(quantify)
+            , length(-1)
         {
         }
 
@@ -206,13 +248,37 @@ struct nrex_node
             }
             return pos;
         }
+
+        void increment_length(int amount, bool subtract = false)
+        {
+            if (amount >= 0 && length >= 0)
+            {
+                if (!subtract)
+                {
+                    length += amount;
+                }
+                else
+                {
+                    length -= amount;
+                }
+            }
+            else
+            {
+                length = -1;
+            }
+            if (parent)
+            {
+                parent->increment_length(amount, subtract);
+            }
+        }
 };
 
 struct nrex_node_group : public nrex_node
 {
         static const int NonCapture = -1;
-        static const int Class = -2;
+        static const int Bracket = -2;
         static const int LookAhead = -3;
+        static const int LookBehind = -4;
 
         int mode;
         bool negate;
@@ -225,6 +291,14 @@ struct nrex_node_group : public nrex_node
             , negate(false)
             , back(NULL)
         {
+            if (mode != Bracket)
+            {
+                length = 0;
+            }
+            else
+            {
+                length = 1;
+            }
         }
 
         virtual ~nrex_node_group()
@@ -245,7 +319,12 @@ struct nrex_node_group : public nrex_node
             for (unsigned int i = 0; i < childset.size(); ++i)
             {
                 s->complete = false;
-                int res = childset[i]->test(s, pos);
+                int offset = 0;
+                if (mode == LookBehind)
+                {
+                    offset = length;
+                }
+                int res = childset[i]->test(s, pos - offset);
                 if (s->complete)
                 {
                     return res;
@@ -271,7 +350,7 @@ struct nrex_node_group : public nrex_node
                     {
                         s->captures[mode].length = res - pos;
                     }
-                    else if (mode == LookAhead)
+                    else if (mode == LookAhead || mode == LookBehind)
                     {
                         res = pos;
                     }
@@ -292,6 +371,10 @@ struct nrex_node_group : public nrex_node
 
         void add_childset()
         {
+            if (childset.size() > 0 && mode != Bracket)
+            {
+                length = -1;
+            }
             back = NULL;
         }
 
@@ -299,7 +382,7 @@ struct nrex_node_group : public nrex_node
         {
             node->parent = this;
             node->previous = back;
-            if (back)
+            if (back && mode != Bracket)
             {
                 back->next = node;
             }
@@ -307,6 +390,10 @@ struct nrex_node_group : public nrex_node
             {
                 childset.push(node);
             }
+            if (mode != Bracket)
+            {
+                increment_length(node->length);
+            }
             back = node;
         }
 
@@ -322,10 +409,32 @@ struct nrex_node_group : public nrex_node
             {
                 childset.pop();
             }
+            if (mode != Bracket)
+            {
+                increment_length(old->length, true);
+            }
             back = old->previous;
             add_child(node);
             return old;
         }
+
+        void pop_back()
+        {
+            if (back)
+            {
+                nrex_node* old = back;
+                if (!old->previous)
+                {
+                    childset.pop();
+                }
+                if (mode != Bracket)
+                {
+                    increment_length(old->length, true);
+                }
+                back = old->previous;
+                NREX_DELETE(old);
+            }
+        }
 };
 
 struct nrex_node_char : public nrex_node
@@ -336,6 +445,7 @@ struct nrex_node_char : public nrex_node
             : nrex_node(true)
             , ch(c)
         {
+            length = 1;
         }
 
         int test(nrex_search* s, int pos) const
@@ -358,6 +468,7 @@ struct nrex_node_range : public nrex_node
             , start(s)
             , end(e)
         {
+            length = 1;
         }
 
         int test(nrex_search* s, int pos) const
@@ -375,20 +486,219 @@ struct nrex_node_range : public nrex_node
         }
 };
 
-static bool nrex_is_whitespace(nrex_char repr)
+enum nrex_class_type
 {
-    switch (repr)
+    nrex_class_none,
+    nrex_class_alnum,
+    nrex_class_alpha,
+    nrex_class_blank,
+    nrex_class_cntrl,
+    nrex_class_digit,
+    nrex_class_graph,
+    nrex_class_lower,
+    nrex_class_print,
+    nrex_class_punct,
+    nrex_class_space,
+    nrex_class_upper,
+    nrex_class_xdigit,
+    nrex_class_word
+};
+
+static bool nrex_compare_class(const nrex_char** pos, const char* text)
+{
+    unsigned int i = 0;
+    for (i = 0; text[i] != '\0'; ++i)
     {
-        case ' ':
-        case '\t':
-        case '\r':
-        case '\n':
-        case '\f':
-            return true;
+        if ((*pos)[i] != text[i])
+        {
+            return false;
+        }
     }
-    return false;
+    if ((*pos)[i++] != ':' || (*pos)[i] != ']')
+    {
+        return false;
+    }
+    *pos = &(*pos)[i];
+    return true;
 }
 
+#define NREX_COMPARE_CLASS(POS, NAME) if (nrex_compare_class(POS, #NAME)) return nrex_class_ ## NAME
+
+static nrex_class_type nrex_parse_class(const nrex_char** pos)
+{
+    NREX_COMPARE_CLASS(pos, alnum);
+    NREX_COMPARE_CLASS(pos, alpha);
+    NREX_COMPARE_CLASS(pos, blank);
+    NREX_COMPARE_CLASS(pos, cntrl);
+    NREX_COMPARE_CLASS(pos, digit);
+    NREX_COMPARE_CLASS(pos, graph);
+    NREX_COMPARE_CLASS(pos, lower);
+    NREX_COMPARE_CLASS(pos, print);
+    NREX_COMPARE_CLASS(pos, punct);
+    NREX_COMPARE_CLASS(pos, space);
+    NREX_COMPARE_CLASS(pos, upper);
+    NREX_COMPARE_CLASS(pos, xdigit);
+    NREX_COMPARE_CLASS(pos, word);
+    return nrex_class_none;
+}
+
+struct nrex_node_class : public nrex_node
+{
+        nrex_class_type type;
+
+        nrex_node_class(nrex_class_type t)
+            : nrex_node(true)
+            , type(t)
+        {
+            length = 1;
+        }
+
+        int test(nrex_search* s, int pos) const
+        {
+            if (s->end == pos)
+            {
+                return -1;
+            }
+            if (!test_class(s->at(pos)))
+            {
+                return -1;
+            }
+            return next ? next->test(s, pos + 1) : pos + 1;
+        }
+
+        bool test_class(nrex_char c) const
+        {
+            if ((0 <= c && c <= 0x1F) || c == 0x7F)
+            {
+                if (type == nrex_class_cntrl)
+                {
+                    return true;
+                }
+            }
+            else if (c < 0x7F)
+            {
+                if (type == nrex_class_print)
+                {
+                    return true;
+                }
+                else if (type == nrex_class_graph && c != ' ')
+                {
+                    return true;
+                }
+                else if ('0' <= c && c <= '9')
+                {
+                    switch (type)
+                    {
+                        case nrex_class_alnum:
+                        case nrex_class_digit:
+                        case nrex_class_xdigit:
+                        case nrex_class_word:
+                            return true;
+                        default:
+                            break;
+                    }
+                }
+                else if ('A' <= c && c <= 'Z')
+                {
+                    switch (type)
+                    {
+                        case nrex_class_alnum:
+                        case nrex_class_alpha:
+                        case nrex_class_upper:
+                        case nrex_class_word:
+                            return true;
+                        case nrex_class_xdigit:
+                            if (c <= 'F')
+                            {
+                                return true;
+                            }
+                        default:
+                            break;
+                    }
+                }
+                else if ('a' <= c && c <= 'z')
+                {
+                    switch (type)
+                    {
+                        case nrex_class_alnum:
+                        case nrex_class_alpha:
+                        case nrex_class_lower:
+                        case nrex_class_word:
+                            return true;
+                        case nrex_class_xdigit:
+                            if (c <= 'f')
+                            {
+                                return true;
+                            }
+                        default:
+                            break;
+                    }
+                }
+            }
+            switch (c)
+            {
+                case ' ':
+                case '\t':
+                    if (type == nrex_class_blank)
+                    {
+                        return true;
+                    }
+                case '\r':
+                case '\n':
+                case '\f':
+                    if (type == nrex_class_space)
+                    {
+                        return true;
+                    }
+                    break;
+                case '_':
+                    if (type == nrex_class_word)
+                    {
+                        return true;
+                    }
+                case ']':
+                case '[':
+                case '!':
+                case '"':
+                case '#':
+                case '$':
+                case '%':
+                case '&':
+                case '\'':
+                case '(':
+                case ')':
+                case '*':
+                case '+':
+                case ',':
+                case '.':
+                case '/':
+                case ':':
+                case ';':
+                case '<':
+                case '=':
+                case '>':
+                case '?':
+                case '@':
+                case '\\':
+                case '^':
+                case '`':
+                case '{':
+                case '|':
+                case '}':
+                case '~':
+                case '-':
+                    if (type == nrex_class_punct)
+                    {
+                        return true;
+                    }
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        }
+};
+
 static bool nrex_is_shorthand(nrex_char repr)
 {
     switch (repr)
@@ -412,6 +722,7 @@ struct nrex_node_shorthand : public nrex_node
             : nrex_node(true)
             , repr(c)
         {
+            length = 1;
         }
 
         int test(nrex_search* s, int pos) const
@@ -447,7 +758,7 @@ struct nrex_node_shorthand : public nrex_node
                 case 'S':
                     invert = true;
                 case 's':
-                    if (nrex_is_whitespace(c))
+                    if (NREX_ISSPACE(c))
                     {
                         found = true;
                     }
@@ -481,10 +792,10 @@ struct nrex_node_quantifier : public nrex_node
         bool greedy;
         nrex_node* child;
 
-        nrex_node_quantifier()
+        nrex_node_quantifier(int min, int max)
             : nrex_node()
-            , min(0)
-            , max(0)
+            , min(min)
+            , max(max)
             , greedy(true)
             , child(NULL)
         {
@@ -500,17 +811,49 @@ struct nrex_node_quantifier : public nrex_node
 
         int test(nrex_search* s, int pos) const
         {
-            nrex_array<int> backtrack;
-            backtrack.push(pos);
-            while (backtrack.top() <= s->end)
+            return test_step(s, pos, 1);
+        }
+
+        int test_step(nrex_search* s, int pos, int level) const
+        {
+            if (max == 0)
             {
-                if (max >= 1 && backtrack.size() > (unsigned int)max)
+                return pos;
+            }
+            if ((max >= 1 && level > max) || pos > s->end)
+            {
+                return -1;
+            }
+            if (!greedy && level > min)
+            {
+                int res = pos;
+                if (next)
                 {
-                    break;
+                    res = next->test(s, res);
                 }
-                if (!greedy && (unsigned int)min < backtrack.size())
+                if (s->complete)
+                {
+                    return res;
+                }
+                if (res >= 0 && parent->test_parent(s, res) >= 0)
+                {
+                    return res;
+                }
+            }
+            int res = child->test(s, pos);
+            if (s->complete)
+            {
+                return res;
+            }
+            if (res >= 0)
+            {
+                int res_step = test_step(s, res, level + 1);
+                if (res_step >= 0)
+                {
+                    return res_step;
+                }
+                else if (greedy && level >= min)
                 {
-                    int res = backtrack.top();
                     if (next)
                     {
                         res = next->test(s, res);
@@ -524,33 +867,6 @@ struct nrex_node_quantifier : public nrex_node
                         return res;
                     }
                 }
-                int res = child->test(s, backtrack.top());
-                if (s->complete)
-                {
-                    return res;
-                }
-                if (res < 0 || res == backtrack.top())
-                {
-                    break;
-                }
-                backtrack.push(res);
-            }
-            while (greedy && (unsigned int) min < backtrack.size())
-            {
-                int res = backtrack.top();
-                if (next)
-                {
-                    res = next->test(s, res);
-                }
-                if (res >= 0 && parent->test_parent(s, res) >= 0)
-                {
-                    return res;
-                }
-                if (s->complete)
-                {
-                    return res;
-                }
-                backtrack.pop();
             }
             return -1;
         }
@@ -564,6 +880,7 @@ struct nrex_node_anchor : public nrex_node
             : nrex_node()
             , end(end)
         {
+            length = 0;
         }
 
         int test(nrex_search* s, int pos) const
@@ -580,6 +897,45 @@ struct nrex_node_anchor : public nrex_node
         }
 };
 
+struct nrex_node_word_boundary : public nrex_node
+{
+        bool inverse;
+
+        nrex_node_word_boundary(bool inverse)
+            : nrex_node()
+            , inverse(inverse)
+        {
+            length = 0;
+        }
+
+        int test(nrex_search* s, int pos) const
+        {
+            bool left = false;
+            bool right = false;
+            if (pos != 0)
+            {
+                nrex_char c = s->at(pos - 1);
+                if (c == '_' || NREX_ISALPHANUM(c))
+                {
+                    left = true;
+                }
+            }
+            if (pos != s->end)
+            {
+                nrex_char c = s->at(pos);
+                if (c == '_' || NREX_ISALPHANUM(c))
+                {
+                    right = true;
+                }
+            }
+            if ((left != right) == inverse)
+            {
+                return -1;
+            }
+            return next ? next->test(s, pos) : pos;
+        }
+};
+
 struct nrex_node_backreference : public nrex_node
 {
         int ref;
@@ -588,6 +944,7 @@ struct nrex_node_backreference : public nrex_node
             : nrex_node(true)
             , ref(ref)
         {
+            length = -1;
         }
 
         int test(nrex_search* s, int pos) const
@@ -608,6 +965,18 @@ struct nrex_node_backreference : public nrex_node
         }
 };
 
+bool nrex_has_lookbehind(nrex_array<nrex_node_group*>& stack)
+{
+    for (unsigned int i = 0; i < stack.size(); i++)
+    {
+        if (stack[i]->mode == nrex_node_group::LookBehind)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
 nrex::nrex()
     : _capturing(0)
     , _root(NULL)
@@ -642,7 +1011,7 @@ int nrex::capture_size() const
     return _capturing + 1;
 }
 
-bool nrex::compile(const nrex_char* pattern)
+bool nrex::compile(const nrex_char* pattern, bool extended)
 {
     reset();
     nrex_node_group* root = NREX_NEW(nrex_node_group(_capturing));
@@ -671,12 +1040,20 @@ bool nrex::compile(const nrex_char* pattern)
                     stack.top()->add_child(group);
                     stack.push(group);
                 }
+                else if (c[2] == '<' && (c[3] == '!' || c[3] == '='))
+                {
+                    c = &c[3];
+                    nrex_node_group* group = NREX_NEW(nrex_node_group(nrex_node_group::LookBehind));
+                    group->negate = (c[0] == '!');
+                    stack.top()->add_child(group);
+                    stack.push(group);
+                }
                 else
                 {
-                    NREX_COMPILE_ERROR("unrecognised qualifier for parenthesis");
+                    NREX_COMPILE_ERROR("unrecognised qualifier for group");
                 }
             }
-            else if (_capturing < 99)
+            else if ((!extended && _capturing < 9) || (extended && _capturing < 99))
             {
                 nrex_node_group* group = NREX_NEW(nrex_node_group(++_capturing));
                 stack.top()->add_child(group);
@@ -702,152 +1079,233 @@ bool nrex::compile(const nrex_char* pattern)
         }
         else if (c[0] == '[')
         {
-            nrex_node_group* group = NREX_NEW(nrex_node_group(nrex_node_group::Class));
+            nrex_node_group* group = NREX_NEW(nrex_node_group(nrex_node_group::Bracket));
             stack.top()->add_child(group);
             if (c[1] == '^')
             {
                 group->negate = true;
                 ++c;
             }
+            bool first_child = true;
+            nrex_char previous_child;
+            bool previous_child_single = false;
             while (true)
             {
                 group->add_childset();
                 ++c;
                 if (c[0] == '\0')
                 {
-                    NREX_COMPILE_ERROR("unclosed character class '[]'");
+                    NREX_COMPILE_ERROR("unclosed bracket expression '['");
                 }
-                if (c[0] == ']')
+                if (c[0] == '[' && c[1] == ':')
+                {
+                    const nrex_char* d = &c[2];
+                    nrex_class_type cls = nrex_parse_class(&d);
+                    if (cls != nrex_class_none)
+                    {
+                        c = d;
+                        group->add_child(NREX_NEW(nrex_node_class(cls)));
+                        previous_child_single = false;
+                    }
+                    else
+                    {
+                        group->add_child(NREX_NEW(nrex_node_char('[')));
+                        previous_child = '[';
+                        previous_child_single = true;
+                    }
+                }
+                else if (c[0] == ']' && !first_child)
                 {
                     break;
                 }
                 else if (c[0] == '\\')
                 {
-                    nrex_char unescaped = nrex_unescape(c[1]);
-                    if (unescaped)
-                    {
-                        group->add_child(NREX_NEW(nrex_node_char(unescaped)));
-                        ++c;
-                    }
-                    else if (nrex_is_shorthand(c[1]))
+                    if (nrex_is_shorthand(c[1]))
                     {
                         group->add_child(NREX_NEW(nrex_node_shorthand(c[1])));
                         ++c;
+                        previous_child_single = false;
                     }
                     else
                     {
-                        NREX_COMPILE_ERROR("escape token not recognised");
+                        const nrex_char* d = c;
+                        nrex_char unescaped = nrex_unescape(d);
+                        if (c == d)
+                        {
+                            NREX_COMPILE_ERROR("invalid escape token");
+                        }
+                        group->add_child(NREX_NEW(nrex_node_char(unescaped)));
+                        c = d;
+                        previous_child = unescaped;
+                        previous_child_single = true;
+                    }
+                }
+                else if (previous_child_single && c[0] == '-')
+                {
+                    bool is_range = false;
+                    nrex_char next;
+                    if (c[1] != '\0' && c[1] != ']')
+                    {
+                        if (c[1] == '\\')
+                        {
+                            const nrex_char* d = ++c;
+                            next = nrex_unescape(d);
+                            if (c == d)
+                            {
+                                NREX_COMPILE_ERROR("invalid escape token in range");
+                            }
+                        }
+                        else
+                        {
+                            next = c[1];
+                            ++c;
+                        }
+                        is_range = true;
+                    }
+                    if (is_range)
+                    {
+                        if (next < previous_child)
+                        {
+                            NREX_COMPILE_ERROR("text range out of order");
+                        }
+                        group->pop_back();
+                        group->add_child(NREX_NEW(nrex_node_range(previous_child, next)));
+                        previous_child_single = false;
+                    }
+                    else
+                    {
+                        group->add_child(NREX_NEW(nrex_node_char(c[0])));
+                        previous_child = c[0];
+                        previous_child_single = true;
                     }
                 }
                 else
                 {
-                    if (c[1] == '-' && c[2] != '\0')
-                    {
-                        bool range = false;
-                        if ('A' <= c[0] && c[0] <= 'Z' && 'A' <= c[2] && c[2] <= 'Z')
-                        {
-                            range = true;
-                        }
-                        if ('a' <= c[0] && c[0] <= 'z' && 'a' <= c[2] && c[2] <= 'z')
-                        {
-                            range = true;
-                        }
-                        if ('0' <= c[0] && c[0] <= '9' && '0' <= c[2] && c[2] <= '9')
-                        {
-                            range = true;
-                        }
-                        if (range)
-                        {
-                            group->add_child(NREX_NEW(nrex_node_range(c[0], c[2])));
-                            c = &c[2];
-                            continue;
-                        }
-                    }
                     group->add_child(NREX_NEW(nrex_node_char(c[0])));
+                    previous_child = c[0];
+                    previous_child_single = true;
                 }
-
+                first_child = false;
             }
         }
         else if (nrex_is_quantifier(c[0]))
         {
-            nrex_node_quantifier* quant = NREX_NEW(nrex_node_quantifier);
-            quant->child = stack.top()->swap_back(quant);
-            if (quant->child == NULL || !quant->child->quantifiable)
+            if (stack.top()->back == NULL || !stack.top()->back->quantifiable)
             {
+                if (c[0] == '{')
+                {
+                    stack.top()->add_child(NREX_NEW(nrex_node_char('{')));
+                    continue;
+                }
                 NREX_COMPILE_ERROR("element not quantifiable");
             }
-            quant->child->previous = NULL;
-            quant->child->next = NULL;
-            quant->child->parent = quant;
+            int min = 0;
+            int max = -1;
+            bool valid_quantifier = true;
             if (c[0] == '?')
             {
-                quant->min = 0;
-                quant->max = 1;
+                min = 0;
+                max = 1;
             }
             else if (c[0] == '+')
             {
-                quant->min = 1;
-                quant->max = -1;
+                min = 1;
+                max = -1;
             }
             else if (c[0] == '*')
             {
-                quant->min = 0;
-                quant->max = -1;
+                min = 0;
+                max = -1;
             }
             else if (c[0] == '{')
             {
                 bool max_set = false;
-                quant->min = 0;
-                quant->max = -1;
+                const nrex_char* d = c;
                 while (true)
                 {
-                    ++c;
-                    if (c[0] == '\0')
+                    ++d;
+                    if (d[0] == '\0')
                     {
-                        NREX_COMPILE_ERROR("unclosed range quantifier '{}'");
+                        valid_quantifier = false;
+                        break;
                     }
-                    else if (c[0] == '}')
+                    else if (d[0] == '}')
                     {
                         break;
                     }
-                    else if (c[0] == ',')
+                    else if (d[0] == ',')
                     {
                         max_set = true;
                         continue;
                     }
-                    else if (c[0] < '0' || '9' < c[0])
+                    else if (d[0] < '0' || '9' < d[0])
                     {
-                        NREX_COMPILE_ERROR("expected numeric digits, ',' or '}'");
+                        valid_quantifier = false;
+                        break;
                     }
                     if (max_set)
                     {
-                        if (quant->max < 0)
+                        if (max < 0)
                         {
-                            quant->max = int(c[0] - '0');
+                            max = int(d[0] - '0');
                         }
                         else
                         {
-                            quant->max = quant->max * 10 + int(c[0] - '0');
+                            max = max * 10 + int(d[0] - '0');
                         }
                     }
                     else
                     {
-                        quant->min = quant->min * 10 + int(c[0] - '0');
+                        min = min * 10 + int(d[0] - '0');
                     }
                 }
                 if (!max_set)
                 {
-                    quant->max = quant->min;
+                    max = min;
+                }
+                if (valid_quantifier)
+                {
+                    c = d;
                 }
             }
-            if (c[1] == '?')
+            if (valid_quantifier)
             {
-                quant->greedy = false;
-                ++c;
+                nrex_node_quantifier* quant = NREX_NEW(nrex_node_quantifier(min, max));
+                if (min == max)
+                {
+                    if (stack.top()->back->length >= 0)
+                    {
+                        quant->length = max * stack.top()->back->length;
+                    }
+                }
+                else
+                {
+                    if (nrex_has_lookbehind(stack))
+                    {
+                        NREX_COMPILE_ERROR("variable length quantifiers inside lookbehind not supported");
+                    }
+                }
+                quant->child = stack.top()->swap_back(quant);
+                quant->child->previous = NULL;
+                quant->child->next = NULL;
+                quant->child->parent = quant;
+                if (c[1] == '?')
+                {
+                    quant->greedy = false;
+                    ++c;
+                }
+            }
+            else
+            {
+                stack.top()->add_child(NREX_NEW(nrex_node_char(c[0])));
             }
         }
         else if (c[0] == '|')
         {
+            if (nrex_has_lookbehind(stack))
+            {
+                NREX_COMPILE_ERROR("alternations inside lookbehind not supported");
+            }
             stack.top()->add_childset();
         }
         else if (c[0] == '^' || c[0] == '$')
@@ -860,13 +1318,7 @@ bool nrex::compile(const nrex_char* pattern)
         }
         else if (c[0] == '\\')
         {
-            nrex_char unescaped = nrex_unescape(c[1]);
-            if (unescaped)
-            {
-                stack.top()->add_child(NREX_NEW(nrex_node_char(unescaped)));
-                ++c;
-            }
-            else if (nrex_is_shorthand(c[1]))
+            if (nrex_is_shorthand(c[1]))
             {
                 stack.top()->add_child(NREX_NEW(nrex_node_shorthand(c[1])));
                 ++c;
@@ -874,7 +1326,7 @@ bool nrex::compile(const nrex_char* pattern)
             else if ('1' <= c[1] && c[1] <= '9')
             {
                 int ref = 0;
-                if ('0' <= c[2] && c[2] <= '9')
+                if (extended && '0' <= c[2] && c[2] <= '9')
                 {
                     ref = int(c[1] - '0') * 10 + int(c[2] - '0');
                     c = &c[2];
@@ -888,11 +1340,27 @@ bool nrex::compile(const nrex_char* pattern)
                 {
                     NREX_COMPILE_ERROR("backreference to non-existent capture");
                 }
+                if (nrex_has_lookbehind(stack))
+                {
+                    NREX_COMPILE_ERROR("backreferences inside lookbehind not supported");
+                }
                 stack.top()->add_child(NREX_NEW(nrex_node_backreference(ref)));
             }
+            else if (c[1] == 'b' || c[1] == 'B')
+            {
+                stack.top()->add_child(NREX_NEW(nrex_node_word_boundary(c[1] == 'B')));
+                ++c;
+            }
             else
             {
-                NREX_COMPILE_ERROR("escape token not recognised");
+                const nrex_char* d = c;
+                nrex_char unescaped = nrex_unescape(d);
+                if (c == d)
+                {
+                    NREX_COMPILE_ERROR("invalid escape token");
+                }
+                stack.top()->add_child(NREX_NEW(nrex_node_char(unescaped)));
+                c = d;
             }
         }
         else
@@ -900,6 +1368,10 @@ bool nrex::compile(const nrex_char* pattern)
             stack.top()->add_child(NREX_NEW(nrex_node_char(c[0])));
         }
     }
+    if (stack.size() > 1)
+    {
+        NREX_COMPILE_ERROR("unclosed group '('");
+    }
     return true;
 }
 
diff --git a/drivers/nrex/nrex.hpp b/drivers/nrex/nrex.hpp
index 2a6aa08e1d..e26a61c39a 100644
--- a/drivers/nrex/nrex.hpp
+++ b/drivers/nrex/nrex.hpp
@@ -79,7 +79,8 @@ class nrex
          * This is used to provide the array size of the captures needed for
          * nrex::match() to work. The size is actually the number of capture
          * groups + one for the matching of the entire pattern. The result is
-         * always capped at 100.
+         * always capped at 10 or 100, depending on the extend option given in
+         * nrex::compile() (default 10).
          *
          * \return The number of captures
          */
@@ -95,10 +96,13 @@ class nrex
          * runtime error nrex_compile_error if it encounters a problem when
          * parsing the pattern.
          *
-         * \param The regex pattern
+         * \param pattern   The regex pattern
+         * \param extended  If true, raises the limit on number of capture
+         *                  groups and back-references to 99. Otherwise limited
+         *                  to 9. Defaults to false.
          * \return True if the pattern was succesfully compiled
          */
-        bool compile(const nrex_char* pattern);
+        bool compile(const nrex_char* pattern, bool extended = false);
 
         /*!
          * \brief Uses the pattern to search through the provided string

From 26b977c96795172b1e095c06222eb30cfc6f4cb7 Mon Sep 17 00:00:00 2001
From: Zher Huei Lee <lee.zh.92@gmail.com>
Date: Tue, 20 Oct 2015 09:48:09 +0100
Subject: [PATCH 45/78] Fixed segfault in RegEx.get_capture()

---
 drivers/nrex/regex.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/nrex/regex.cpp b/drivers/nrex/regex.cpp
index 0a813c3490..2707249a6e 100644
--- a/drivers/nrex/regex.cpp
+++ b/drivers/nrex/regex.cpp
@@ -54,7 +54,9 @@ bool RegEx::is_valid() const {
 };
 
 int RegEx::get_capture_count() const {
-	
+
+	ERR_FAIL_COND_V( !exp.valid(), 0 );
+
 	return exp.capture_size();
 }
 

From bb3724a4cc737599d5b12abeb8b1590781bb5ddb Mon Sep 17 00:00:00 2001
From: Zher Huei Lee <lee.zh.92@gmail.com>
Date: Tue, 20 Oct 2015 09:51:00 +0100
Subject: [PATCH 46/78] Updated RegEx demos

---
 demos/misc/regex/regex.gd  |  18 ++++++++++--------
 demos/misc/regex/regex.scn | Bin 1772 -> 1793 bytes
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/demos/misc/regex/regex.gd b/demos/misc/regex/regex.gd
index e648c18093..409b4cab05 100644
--- a/demos/misc/regex/regex.gd
+++ b/demos/misc/regex/regex.gd
@@ -2,21 +2,23 @@ extends VBoxContainer
 
 var regex = RegEx.new()
 
-func update_expression():
-	regex.compile(get_node("Expression").get_text())
+func update_expression(text):
+	regex.compile(text)
 	update_text()
 
 func update_text():
 	var text = get_node("Text").get_text()
-	regex.find(text)
 	var list = get_node("List")
 	for child in list.get_children():
 		child.queue_free()
-	for res in regex.get_captures():
-		var label = Label.new()
-		label.set_text(res)
-		list.add_child(label)
+	if regex.is_valid():
+		regex.find(text)
+		for res in regex.get_captures():
+			var label = Label.new()
+			label.set_text(res)
+			list.add_child(label)
 
 func _ready():
 	get_node("Text").set_text("They asked me \"What's going on \\\"in the manor\\\"?\"")
-	update_expression()
+	update_expression(get_node("Expression").get_text())
+
diff --git a/demos/misc/regex/regex.scn b/demos/misc/regex/regex.scn
index 2b62d6b82a609fde26b7407c4b0fb7684915ec2c..1f46521d0d71013b7d6a852d4e6ea71a5e938bc0 100644
GIT binary patch
delta 1516
zcmaFE+sJ1U6zuHG00IIG46}I|7+$h5FfcMOG%zwSHLx)<Fe)%J@F+0z1SBSBr=|oa
zr{<+H6ihTWP3d4@S5RUIP7q~e;8x(`)YC6YO;4@ROHWCVW#Cc};>yWSPRy~=*EeLi
zsKD#M;IR4u^B#u_4$KTv3Nj8w46F+53~UO_4$Vx(3`z=|4w4S@_`;m>E1dK5N)j{k
zQi~XP6(lEKOsc=fn3$sw$&{O#*HGIic~HUO410WhZfZ$le0-uDlWRqRVj^>KW`176
z9@gB%qV&wX2TXew2rSs+$j(%fTG1HEnVVP<pOc!GUXqaz#-5szS(2EPlbYDTQk<Gx
zl-iKT;G-zX;Hn^<V8amdfYBx)L*aFzGDlHra*2L!W?p=~!@C4O2h9fzW~@G$#U%_v
z3ZL0a3sMqGQsYw}ux@pj#2TNRk(igRB<gs2ftrJOLYWf>cV2!<YJ5RrNk%b)oPwtV
zgTpxn4h0THyF^B(VyDXv;toda$@zJC@yYq6ie3!N3Th9Sr4oD}FiJ77D9AaOI>xh=
zB^G5S=9M(0)jKIWSUdST*gG&dusiTOh&ymQusbj?NGPxz;C704;C2XMkW>(7jE{GW
zXU#8)FUToXT*wq(T%yR%P^@_50kejK4zpukW^RIrL!yH~!ULwv;!MX`4!I5t4&n~6
zj7BaAS`M!rgdEs8i}Ml-;tMh>Qga@#=sImnkYX&#SE#R4(o<+;Of5+G&OC{$&CbEr
zftj%?U+Iw}4>JQpgS~@*bAEz(f}R5}GXsNyqXV;ptfOp#EK^ZxjzTCy*#p*v4!Q}l
z%;`m$DGykB8ATZuNIqcbWzJ7aD^@CKsA}kD;8$QzuwyRH$S;4u>FlJQAh*EEA@=}-
z!)ymHru?+Y?92+BOev{p%2OFLN+#<uo7cxUs5<_4`Q)JJRLhW}tff-OkeVO^a*Tt6
zgv)M*3Ww?iq78Zuq70P}I7A&>7;+R`RF5zeCEPmX!62Yurm~7HJ~gi_vnanM@ey-?
z!*d6Dg?TI)`RVz2Dt!-_<s8;9733EuialUvco2EOfx(gW!QTT9P91Q(<2>!Kth(Lg
zH_Q?|zRZcaNtx=#4YH~?CkwF1h_6yz_JAeTIghC-FLm)t=Cfzc*g9<YFq-VlqF8V6
zj6s62s8n?_YidbJW?uR+apyV*H;1Vjg&K7X@#<v^#R<YLzAU;q3M$2!YaLXbe>k{2
zWUz5yaFBS$Q?GuXF*Q%E-a)~oer1vKQ)UJR50?gZh8?L--FFBmX=vD6#l+~<M8_$`
zYHDdJEzo4V;h3Pw)UepuVL}4~<22`ndSQm8sa%d`?zv3G3<?Tz3`q*i4F4A}C~ze(
zIPf{_acps5aQNoH;M(mV?BMGl?6Ar~*dfq?-C>)9w7a5%w1cyQ^aExF&*=^`9g-c`
z-IW~79fKUq9o!!XCp+GA2zP35$acKw(CyOgVE%xa!R@M}wnMf<w0rRb_F{*6r*-uX
z^$*0WAFwlc`8{Bcc9`wpf8e|W{{!Y=hxv};4#JM&4(txv4#yoB9Hbq@J=GfLI!tvi
zbzpFs!yvA};qcah;Q+gXxKrQ(eg{{Fmmc@M?3v;-^V$w}Iyf*K2uk2^6yz$&D9ugE
zOU%q+kXI08U{R1~>kRO7=jD=ekYVBVtoLvUQV?TxU|?WS=5R=3UY$L=R)I(Uw5N+>
zNJQ(~X^wn{6a-uwXKcvPlIwnKBIg;qqJ5+J2Kn@cMH`Q{&R#cX3LD#rJ-Uj2jvEN?
zxHfBQ&jG#-qCyAK<iFS7v^1BxF1!2lOCy{18<|m8IX1rYQ*69gyKH6smtzw0$IM;2
z*%ay%*4FO){<g}0^0K?;+1nYIdJNz1{cfk>&($TL|L7KLQJsx_)_R8Lk>}2_ZVhj!
zQm_i(fAX_Ff+1AlyZoOE;ZCwwY|frc3q0W1&@jcw#78MB|Ir^s#vBg@X`us5Z7drS
nxVUFOV%=AyuD?_J>Z?Nv*LWB_UHx3vIVCg&1qV5^fQonkrXA^2

delta 1484
zcmZqVd&6rS6zuHG00IIG3?aM>3|H6~7#JBC8W<TE71$h@9T*sR6j*oy5|gu2Q-YII
z^HLdDCz_aM_Asz3C@};lh%z$pD{v{;b6M%@7p11BR_LXtBq%a)DTuM;<R>TQC`d3F
zGF(;QbzpE<|A6^`!wm;!1}Oy@hhPR)1$G8D1!jkKreX#q1x^M@1!jjud|^)c70&s2
zC5f4NsYMLD3ZfIwCe`OR@*fmSH06lTO)W``k7wXkFk^D9C{Pq<F3!x)OOR&pQP{!k
znvz+Pu$whEu_!$=?*Y^91p*6pJF+pCq*jz9xO3(vR>bF|=B1ZpB)BuADmXJICgr3i
z>a!N7CKsiaB<M4QIOsdHIB+CnIJ7JXS9q1MiK8erxkNuVGcUg0;cbE$t50Te34@Tr
zI`-0nl*E$M_|ylCTOCszT3O?hGZORCmAD=EE>Lq2Pq1g;P_R-IO?c+y=Xlm(pF<62
za(-T3d~$wiUP*!!1CxT*0V(FZ{FKxOOi~Oi3#1(ObCx9*WhUm86f?*vh&cXYU{+vv
z2y?J^U~ph};CB#rsOM&oP!Mt8cXD_nIK?T+!O)@6DTFaT-qDjazbL*Sr&O_<DZaQw
z;U7b>;%)~GhcE{X2LnbUmjoe)3l2gK?3~4Ui3RZmnH8xy37QTJ4pL4<2~vzj`3gRY
zKNLb3QwtLAFi+xYvvW{#U}mh!SDNSWk(q&^!QMf@Sv$czLC?d1mzjY<!O?-)LDrEe
zL6)f~HAf+ou`KlgOR<A)f-G}-QD({m7D+}?h6R!j7<!rW)6$BSbQ`J~x}EnX*fAGp
z<d;9-bawnWS%z7kojD~nEywxH<Pc`_dPfIU$4gGK4vJ1m3@J)qRCF0q6J$VkJ2*(V
zlrvN~R4)*1&~p%FsC>X7>fpkVqu`?2!cdfO%c<VMg+V~UOeKvoJ~gi_vnW3=H&yAk
zlaB*~gS^9Y2YH2gEE)Of`FSc{518c~)-V<17bl86U}ks_dBB0eVZnpH2OgX{pyPPQ
zdD>xFwO@=WsmWc3c00%_H?t&`=9I)IcO=a^AnVS_oS2)GsdTYHR(0QGJr)`9G}X!n
zEUC_UOjUWQi(fLIJ#)s^VY^%B<U|(5dfBH8uNjL<RVTBimXu`Xr9WkV<uFx4SHp@S
zUVRQjaYB@fFN<!Df=Y2`u0o;n4+ocr3^oo74ie9Jg4E|Qrsk;yIViZ)FPrQ9l$n9S
z!=-_pVMppy_a*@)4Gnv%m>9j9=s2ZVO)X8O#CZ-34VsKM923}?8WuY{%xGX>oaS8L
zAk45dRmjoKJ&LKAK|w)|Ax?pr;r{{#1+D}J2R`@Bjy(<xM`~RsI|w`YItV*#au9Y1
zbYOSb=OFE1?I8VtnZcpgQNkhGf!kfl!Q3&(!Q8?AfpE0rJ%@0o1_yV?iw?~$-45mt
zm>C?^Jr6r%I~cncKVUC*sCQcDQ2#)@I^qF4gS)9iw8M6XXouMj{s+!G@IPP<c9`$T
z?;z};?7;58;2`Y4@5$WQ>(J|<>%hPuuE63|;_%dg;Q+gXxYLFM{0H<CI2@jFm1LCW
zCgmk&<}k=Bh%%^6{=h0y&*;FQAjQDp;LQAc8P_=l9{IPPE{-7)t#79}3N;z<xCWOj
z7X850bN%7J_5x+;#%tH)cU)n0&XAma=t-{TL;Gc!i*Idf)eSCSkLczoD4tWFvsQlV
zv!z?*+74F#e{V89NPB5hoFdCE_jV4B2Xozzh~5-yl;>#tsmb_!j^tX&-1?do0<W?;
z1=1Y8J2c7fZ#!%L@g3_X`FnN@OBmAf9XML%oq9P@?m^mjTY(DwW$m||c0OO8ws4jF
zs<RdEe?Q-pb$_F?=8R4A;~NB%xfKIsxELI2^jCiUT`7O0Q@Ntf@y-QTjydO-KfC5~
z#rN2|_l<7^8S`8kqy-<iF|zD9z{QoO@R><I_K9ym`SvE~iF^#6u6{1-oD!NC7=nU>
IoIyo607;+evH$=8


From f0d246a7bce9f8f22e9886d474f1758e0c20d8cb Mon Sep 17 00:00:00 2001
From: Zher Huei Lee <lee.zh.92@gmail.com>
Date: Tue, 20 Oct 2015 10:05:55 +0100
Subject: [PATCH 47/78] Exposed RegEx expanded option to scripts

---
 drivers/nrex/regex.cpp | 6 +++---
 drivers/nrex/regex.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/nrex/regex.cpp b/drivers/nrex/regex.cpp
index 2707249a6e..246384b10a 100644
--- a/drivers/nrex/regex.cpp
+++ b/drivers/nrex/regex.cpp
@@ -15,7 +15,7 @@
 
 void RegEx::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("compile","pattern"),&RegEx::compile);
+	ObjectTypeDB::bind_method(_MD("compile","pattern", "expanded"),&RegEx::compile, DEFVAL(true));
 	ObjectTypeDB::bind_method(_MD("find","text","start","end"),&RegEx::find, DEFVAL(0), DEFVAL(-1));
 	ObjectTypeDB::bind_method(_MD("clear"),&RegEx::clear);
 	ObjectTypeDB::bind_method(_MD("is_valid"),&RegEx::is_valid);
@@ -68,11 +68,11 @@ String RegEx::get_capture(int capture) const {
 
 }
 
-Error RegEx::compile(const String& p_pattern) {
+Error RegEx::compile(const String& p_pattern, bool expanded) {
 
 	clear();
 
-	exp.compile(p_pattern.c_str());
+	exp.compile(p_pattern.c_str(), expanded);
 
 	ERR_FAIL_COND_V( !exp.valid(), FAILED );
 
diff --git a/drivers/nrex/regex.h b/drivers/nrex/regex.h
index 0626029705..be52da8149 100644
--- a/drivers/nrex/regex.h
+++ b/drivers/nrex/regex.h
@@ -36,7 +36,7 @@ public:
 	bool is_valid() const;
 	int get_capture_count() const;
 	String get_capture(int capture) const;
-	Error compile(const String& p_pattern);
+	Error compile(const String& p_pattern, bool expanded = false);
 	int find(const String& p_text, int p_start = 0, int p_end = -1) const;
 
 	RegEx();

From 61c4c5795ff9057b1c67142758418a4f982a0241 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 9 Nov 2015 00:49:18 -0300
Subject: [PATCH 48/78] -support for stereo ima-adpcm sample compression &
 playback -support for converting samples to ima-adpcm upon export

---
 servers/audio/audio_mixer_sw.cpp              | 137 ++++++++++--------
 servers/audio/audio_mixer_sw.h                |   2 +-
 servers/audio/sample_manager_sw.cpp           |   8 +-
 tools/editor/editor_import_export.cpp         |  53 +++++++
 tools/editor/editor_import_export.h           |  19 +++
 tools/editor/editor_node.cpp                  |   1 +
 .../editor_sample_import_plugin.cpp           |  93 +++++++++++-
 .../io_plugins/editor_sample_import_plugin.h  |  14 ++
 .../io_plugins/editor_texture_import_plugin.h |   1 +
 .../editor/plugins/editor_preview_plugins.cpp |   8 +-
 tools/editor/plugins/sample_editor_plugin.cpp |   8 +-
 tools/editor/project_export.cpp               |  33 +++++
 tools/editor/project_export.h                 |   6 +
 13 files changed, 312 insertions(+), 71 deletions(-)

diff --git a/servers/audio/audio_mixer_sw.cpp b/servers/audio/audio_mixer_sw.cpp
index 791f31719e..033cd333d5 100644
--- a/servers/audio/audio_mixer_sw.cpp
+++ b/servers/audio/audio_mixer_sw.cpp
@@ -45,14 +45,14 @@ void AudioMixerSW::do_resample(const Depth* p_src, int32_t *p_dst, ResamplerStat
 	while (p_state->amount--) {
 
 		int32_t pos=p_state->pos >> MIX_FRAC_BITS;
-		if (is_stereo)
+		if (is_stereo && !is_ima_adpcm)
 			pos<<=1;
 
 		if (is_ima_adpcm) {
 
-			int sample_pos = pos + p_state->ima_adpcm->window_ofs;
+			int sample_pos = pos + p_state->ima_adpcm[0].window_ofs;
 
-			while(sample_pos>p_state->ima_adpcm->last_nibble) {
+			while(sample_pos>p_state->ima_adpcm[0].last_nibble) {
 
 
 				static const int16_t _ima_adpcm_step_table[89] = {
@@ -72,52 +72,64 @@ void AudioMixerSW::do_resample(const Depth* p_src, int32_t *p_dst, ResamplerStat
 					-1, -1, -1, -1, 2, 4, 6, 8
 				};
 
-				int16_t nibble,signed_nibble,diff,step;
-
-				p_state->ima_adpcm->last_nibble++;
-				const uint8_t *src_ptr=p_state->ima_adpcm->ptr;
-
-				nibble = (p_state->ima_adpcm->last_nibble&1)?
-						(src_ptr[p_state->ima_adpcm->last_nibble>>1]>>4):(src_ptr[p_state->ima_adpcm->last_nibble>>1]&0xF);
-				step=_ima_adpcm_step_table[p_state->ima_adpcm->step_index];
-
-				p_state->ima_adpcm->step_index += _ima_adpcm_index_table[nibble];
-				if (p_state->ima_adpcm->step_index<0)
-					p_state->ima_adpcm->step_index=0;
-				if (p_state->ima_adpcm->step_index>88)
-					p_state->ima_adpcm->step_index=88;
-
-				/*
-				signed_nibble = (nibble&7) * ((nibble&8)?-1:1);
-				diff = (2 * signed_nibble + 1) * step / 4; */
-
-				diff = step >> 3 ;
-				if (nibble & 1)
-					diff += step >> 2 ;
-				if (nibble & 2)
-					diff += step >> 1 ;
-				if (nibble & 4)
-					diff += step ;
-				if (nibble & 8)
-					diff = -diff ;
-
-				p_state->ima_adpcm->predictor+=diff;
-				if (p_state->ima_adpcm->predictor<-0x8000)
-					p_state->ima_adpcm->predictor=-0x8000;
-				else if (p_state->ima_adpcm->predictor>0x7FFF)
-					p_state->ima_adpcm->predictor=0x7FFF;
+				for(int i=0;i<(is_stereo?2:1);i++) {
 
 
-				/* store loop if there */
-				if (p_state->ima_adpcm->last_nibble==p_state->ima_adpcm->loop_pos) {
+					int16_t nibble,signed_nibble,diff,step;
+
+					p_state->ima_adpcm[i].last_nibble++;
+					const uint8_t *src_ptr=p_state->ima_adpcm[i].ptr;
+
+
+					uint8_t nbb = src_ptr[ (p_state->ima_adpcm[i].last_nibble>>1) *  (is_stereo?2:1) + i ];
+					nibble = (p_state->ima_adpcm[i].last_nibble&1)?(nbb>>4):(nbb&0xF);
+					step=_ima_adpcm_step_table[p_state->ima_adpcm[i].step_index];
+
+
+					p_state->ima_adpcm[i].step_index += _ima_adpcm_index_table[nibble];
+					if (p_state->ima_adpcm[i].step_index<0)
+						p_state->ima_adpcm[i].step_index=0;
+					if (p_state->ima_adpcm[i].step_index>88)
+						p_state->ima_adpcm[i].step_index=88;
+
+					/*
+					signed_nibble = (nibble&7) * ((nibble&8)?-1:1);
+					diff = (2 * signed_nibble + 1) * step / 4; */
+
+					diff = step >> 3 ;
+					if (nibble & 1)
+						diff += step >> 2 ;
+					if (nibble & 2)
+						diff += step >> 1 ;
+					if (nibble & 4)
+						diff += step ;
+					if (nibble & 8)
+						diff = -diff ;
+
+					p_state->ima_adpcm[i].predictor+=diff;
+					if (p_state->ima_adpcm[i].predictor<-0x8000)
+						p_state->ima_adpcm[i].predictor=-0x8000;
+					else if (p_state->ima_adpcm[i].predictor>0x7FFF)
+						p_state->ima_adpcm[i].predictor=0x7FFF;
+
+
+					/* store loop if there */
+					if (p_state->ima_adpcm[i].last_nibble==p_state->ima_adpcm[i].loop_pos) {
+
+						p_state->ima_adpcm[i].loop_step_index = p_state->ima_adpcm[i].step_index;
+						p_state->ima_adpcm[i].loop_predictor = p_state->ima_adpcm[i].predictor;
+					}
+
+					//printf("%i - %i - pred %i\n",int(p_state->ima_adpcm[i].last_nibble),int(nibble),int(p_state->ima_adpcm[i].predictor));
 
-					p_state->ima_adpcm->loop_step_index = p_state->ima_adpcm->step_index;
-					p_state->ima_adpcm->loop_predictor = p_state->ima_adpcm->predictor;
 				}
 
 			}
 
-			final=p_state->ima_adpcm->predictor;
+			final=p_state->ima_adpcm[0].predictor;
+			if (is_stereo) {
+				final_r=p_state->ima_adpcm[1].predictor;
+			}
 
 		} else {
 			final=p_src[pos];
@@ -399,9 +411,10 @@ void AudioMixerSW::mix_channel(Channel& c) {
 
 	if (format==AS::SAMPLE_FORMAT_IMA_ADPCM) {
 
-		rstate.ima_adpcm=&c.mix.ima_adpcm;
+		rstate.ima_adpcm=c.mix.ima_adpcm;
 		if (loop_format!=AS::SAMPLE_LOOP_NONE) {
-			c.mix.ima_adpcm.loop_pos=loop_begin_fp>>MIX_FRAC_BITS;
+			c.mix.ima_adpcm[0].loop_pos=loop_begin_fp>>MIX_FRAC_BITS;
+			c.mix.ima_adpcm[1].loop_pos=loop_begin_fp>>MIX_FRAC_BITS;
 			loop_format=AS::SAMPLE_LOOP_FORWARD;
 		}
 	}
@@ -447,9 +460,11 @@ void AudioMixerSW::mix_channel(Channel& c) {
 					/* go to loop-begin */
 
 					if (format==AS::SAMPLE_FORMAT_IMA_ADPCM) {
-						c.mix.ima_adpcm.step_index=c.mix.ima_adpcm.loop_step_index;
-						c.mix.ima_adpcm.predictor=c.mix.ima_adpcm.loop_predictor;
-						c.mix.ima_adpcm.last_nibble=loop_begin_fp>>MIX_FRAC_BITS;
+						for(int i=0;i<2;i++) {
+							c.mix.ima_adpcm[i].step_index=c.mix.ima_adpcm[i].loop_step_index;
+							c.mix.ima_adpcm[i].predictor=c.mix.ima_adpcm[i].loop_predictor;
+							c.mix.ima_adpcm[i].last_nibble=loop_begin_fp>>MIX_FRAC_BITS;
+						}
 						c.mix.offset=loop_begin_fp;
 					} else {
 						c.mix.offset=loop_begin_fp+(c.mix.offset-loop_end_fp);
@@ -549,10 +564,12 @@ void AudioMixerSW::mix_channel(Channel& c) {
 			CALL_RESAMPLE_MODE(int16_t,is_stereo,false,use_filter,use_fx,interpolation_type,mix_channels);
 
 		} else if (format==AS::SAMPLE_FORMAT_IMA_ADPCM) {
-			c.mix.ima_adpcm.window_ofs=c.mix.offset>>MIX_FRAC_BITS;
-			c.mix.ima_adpcm.ptr=(const uint8_t*)data;
-			int8_t *src_ptr =  &((int8_t*)data)[(c.mix.offset >> MIX_FRAC_BITS)<<(is_stereo?1:0) ];
-			CALL_RESAMPLE_MODE(int8_t,false,true,use_filter,use_fx,interpolation_type,mix_channels);
+			for(int i=0;i<2;i++) {
+				c.mix.ima_adpcm[i].window_ofs=c.mix.offset>>MIX_FRAC_BITS;
+				c.mix.ima_adpcm[i].ptr=(const uint8_t*)data;
+			}
+			int8_t *src_ptr =  NULL;
+			CALL_RESAMPLE_MODE(int8_t,is_stereo,true,use_filter,use_fx,interpolation_type,mix_channels);
 
 		}
 
@@ -781,14 +798,16 @@ AudioMixer::ChannelID AudioMixerSW::channel_alloc(RID p_sample) {
 
 	if (sample_manager->sample_get_format(c.sample)==AudioServer::SAMPLE_FORMAT_IMA_ADPCM) {
 
-		c.mix.ima_adpcm.step_index=0;
-		c.mix.ima_adpcm.predictor=0;
-		c.mix.ima_adpcm.loop_step_index=0;
-		c.mix.ima_adpcm.loop_predictor=0;
-		c.mix.ima_adpcm.last_nibble=-1;
-		c.mix.ima_adpcm.loop_pos=0x7FFFFFFF;
-		c.mix.ima_adpcm.window_ofs=0;
-		c.mix.ima_adpcm.ptr=NULL;
+		for(int i=0;i<2;i++) {
+			c.mix.ima_adpcm[i].step_index=0;
+			c.mix.ima_adpcm[i].predictor=0;
+			c.mix.ima_adpcm[i].loop_step_index=0;
+			c.mix.ima_adpcm[i].loop_predictor=0;
+			c.mix.ima_adpcm[i].last_nibble=-1;
+			c.mix.ima_adpcm[i].loop_pos=0x7FFFFFFF;
+			c.mix.ima_adpcm[i].window_ofs=0;
+			c.mix.ima_adpcm[i].ptr=NULL;
+		}
 	}
 
 	ChannelID ret_id = index+c.check*MAX_CHANNELS;
diff --git a/servers/audio/audio_mixer_sw.h b/servers/audio/audio_mixer_sw.h
index cb38561c27..d8d9b7bacd 100644
--- a/servers/audio/audio_mixer_sw.h
+++ b/servers/audio/audio_mixer_sw.h
@@ -105,7 +105,7 @@ private:
 				int32_t loop_pos;
 				int32_t window_ofs;
 				const uint8_t *ptr;
-			} ima_adpcm;
+			} ima_adpcm[2];
 
 		} mix;
 
diff --git a/servers/audio/sample_manager_sw.cpp b/servers/audio/sample_manager_sw.cpp
index 9195136a5d..375aa88cd2 100644
--- a/servers/audio/sample_manager_sw.cpp
+++ b/servers/audio/sample_manager_sw.cpp
@@ -38,12 +38,8 @@ SampleManagerSW::~SampleManagerSW()
 
 RID SampleManagerMallocSW::sample_create(AS::SampleFormat p_format, bool p_stereo, int p_length) {
 
-	ERR_EXPLAIN("IMA-ADPCM and STEREO are not a valid combination for sample format.");
-	ERR_FAIL_COND_V( p_format == AS::SAMPLE_FORMAT_IMA_ADPCM && p_stereo,RID());
 	Sample *s = memnew( Sample );
 	int datalen = p_length;
-	if (p_stereo)
-		datalen*=2;
 	if (p_format==AS::SAMPLE_FORMAT_PCM16)
 		datalen*=2;
 	else if (p_format==AS::SAMPLE_FORMAT_IMA_ADPCM) {
@@ -53,6 +49,10 @@ RID SampleManagerMallocSW::sample_create(AS::SampleFormat p_format, bool p_stere
 		datalen/=2;
 		datalen+=4;
 	}
+
+	if (p_stereo)
+		datalen*=2;
+
 #define SAMPLE_EXTRA 16
 
 	s->data = memalloc(datalen+SAMPLE_EXTRA); //help the interpolator by allocating a little more..
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp
index b13473e61c..e569485807 100644
--- a/tools/editor/editor_import_export.cpp
+++ b/tools/editor/editor_import_export.cpp
@@ -1706,6 +1706,17 @@ void EditorImportExport::load_config() {
 		}
 	}
 
+	if (cf->has_section("convert_samples")) {
+
+		if (cf->has_section_key("convert_samples","max_hz"))
+			sample_action_max_hz=cf->get_value("convert_samples","max_hz");
+
+		if (cf->has_section_key("convert_samples","trim"))
+			sample_action_trim=cf->get_value("convert_samples","trim");
+	}
+
+
+
 }
 
 
@@ -1816,6 +1827,14 @@ void EditorImportExport::save_config() {
 
 	cf->set_value("script","encrypt_key",script_key);
 
+	switch(sample_action) {
+		case SAMPLE_ACTION_NONE: cf->set_value("convert_samples","action","none"); break;
+		case SAMPLE_ACTION_COMPRESS_RAM: cf->set_value("convert_samples","action","compress_ram"); break;
+	}
+
+	cf->set_value("convert_samples","max_hz",sample_action_max_hz);
+	cf->set_value("convert_samples","trim",sample_action_trim);
+
 	cf->save("res://export.cfg");
 
 }
@@ -1841,6 +1860,35 @@ String EditorImportExport::script_get_encryption_key() const{
 }
 
 
+void EditorImportExport::sample_set_action(SampleAction p_action) {
+
+	sample_action=p_action;
+}
+
+EditorImportExport::SampleAction EditorImportExport::sample_get_action() const{
+
+	return sample_action;
+}
+
+void EditorImportExport::sample_set_max_hz(int p_hz){
+
+	sample_action_max_hz=p_hz;
+}
+int EditorImportExport::sample_get_max_hz() const{
+
+	return sample_action_max_hz;
+}
+
+void EditorImportExport::sample_set_trim(bool p_trim){
+
+	sample_action_trim=p_trim;
+}
+bool EditorImportExport::sample_get_trim() const{
+
+	return sample_action_trim;
+}
+
+
 void EditorImportExport::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("image_export_group_create"),&EditorImportExport::image_export_group_create);
@@ -1868,8 +1916,13 @@ EditorImportExport::EditorImportExport() {
 	image_formats.insert("png");
 	image_shrink=1;
 
+
 	script_action=SCRIPT_ACTION_COMPILE;
 
+	sample_action=SAMPLE_ACTION_NONE;
+	sample_action_max_hz=44100;
+	sample_action_trim=false;
+
 }
 
 
diff --git a/tools/editor/editor_import_export.h b/tools/editor/editor_import_export.h
index 245adffbfd..1a3171e66b 100644
--- a/tools/editor/editor_import_export.h
+++ b/tools/editor/editor_import_export.h
@@ -245,6 +245,12 @@ public:
 		SCRIPT_ACTION_ENCRYPT
 	};
 
+	enum SampleAction {
+
+		SAMPLE_ACTION_NONE,
+		SAMPLE_ACTION_COMPRESS_RAM,
+	};
+
 protected:
 
 	struct ImageGroup {
@@ -274,6 +280,10 @@ protected:
 	ScriptAction script_action;
 	String script_key;
 
+	SampleAction sample_action;
+	int sample_action_max_hz;
+	bool sample_action_trim;
+
 	static EditorImportExport* singleton;
 
 	static void _bind_methods();
@@ -343,6 +353,15 @@ public:
 	void script_set_encryption_key(const String& p_key);
 	String script_get_encryption_key() const;
 
+	void sample_set_action(SampleAction p_action);
+	SampleAction sample_get_action() const;
+
+	void sample_set_max_hz(int p_hz);
+	int sample_get_max_hz() const;
+
+	void sample_set_trim(bool p_trim);
+	bool sample_get_trim() const;
+
 	void load_config();
 	void save_config();
 
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index a3d7cbd7cf..5f5f554efc 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -5488,6 +5488,7 @@ EditorNode::EditorNode() {
 	editor_import_export->add_import_plugin( Ref<EditorTranslationImportPlugin>( memnew(EditorTranslationImportPlugin(this))));
 
 	editor_import_export->add_export_plugin( Ref<EditorTextureExportPlugin>( memnew(EditorTextureExportPlugin)));
+	editor_import_export->add_export_plugin( Ref<EditorSampleExportPlugin>( memnew(EditorSampleExportPlugin)));
 
 	add_editor_plugin( memnew( CanvasItemEditorPlugin(this) ) );
 	add_editor_plugin( memnew( SpatialEditorPlugin(this) ) );
diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.cpp b/tools/editor/io_plugins/editor_sample_import_plugin.cpp
index 9298b35b3b..7888246956 100644
--- a/tools/editor/io_plugins/editor_sample_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_sample_import_plugin.cpp
@@ -35,6 +35,7 @@
 #include "io/resource_saver.h"
 #include "os/file_access.h"
 #include "io/marshalls.h"
+#include "tools/editor/editor_settings.h"
 
 class _EditorSampleImportOptions : public Object {
 
@@ -156,7 +157,7 @@ public:
 		edit_normalize=true;
 		edit_loop=false;
 
-		compress_mode=COMPRESS_MODE_DISABLED;
+		compress_mode=COMPRESS_MODE_RAM;
 		compress_bitrate=COMPRESS_128;
 	}
 
@@ -580,8 +581,7 @@ Error EditorSampleImportPlugin::import(const String& p_path, const Ref<ResourceI
 
 	int compression = from->get_option("compress/mode");
 	bool force_mono = from->get_option("force/mono");
-	if (compression==_EditorSampleImportOptions::COMPRESS_MODE_RAM)
-		force_mono=true;
+
 
 	if (force_mono && chans==2) {
 
@@ -608,9 +608,47 @@ Error EditorSampleImportPlugin::import(const String& p_path, const Ref<ResourceI
 	if ( compression == _EditorSampleImportOptions::COMPRESS_MODE_RAM) {
 
 		dst_format=Sample::FORMAT_IMA_ADPCM;
+		if (chans==1) {
+			_compress_ima_adpcm(data,dst_data);
+		} else {
 
-		_compress_ima_adpcm(data,dst_data);
-		print_line("compressing ima-adpcm, resulting buffersize is "+itos(dst_data.size())+" from "+itos(data.size()));
+			print_line("INTERLEAAVE!");
+
+
+
+			//byte interleave
+			Vector<float> left;
+			Vector<float> right;
+
+			int tlen = data.size()/2;
+			left.resize(tlen);
+			right.resize(tlen);
+
+			for(int i=0;i<tlen;i++) {
+				left[i]=data[i*2+0];
+				right[i]=data[i*2+1];
+			}
+
+			DVector<uint8_t> bleft;
+			DVector<uint8_t> bright;
+
+			_compress_ima_adpcm(left,bleft);
+			_compress_ima_adpcm(right,bright);
+
+			int dl = bleft.size();
+			dst_data.resize( dl *2 );
+
+			DVector<uint8_t>::Write w=dst_data.write();
+			DVector<uint8_t>::Read rl=bleft.read();
+			DVector<uint8_t>::Read rr=bright.read();
+
+			for(int i=0;i<dl;i++) {
+				w[i*2+0]=rl[i];
+				w[i*2+1]=rr[i];
+			}
+		}
+
+//		print_line("compressing ima-adpcm, resulting buffersize is "+itos(dst_data.size())+" from "+itos(data.size()));
 
 	} else {
 
@@ -781,9 +819,54 @@ void EditorSampleImportPlugin::_compress_ima_adpcm(const Vector<float>& p_data,D
 
 }
 
+
+EditorSampleImportPlugin* EditorSampleImportPlugin::singleton=NULL;
+
+
+
 EditorSampleImportPlugin::EditorSampleImportPlugin(EditorNode* p_editor) {
 
+	singleton=this;
 	dialog = memnew( EditorSampleImportDialog(this));
 	p_editor->get_gui_base()->add_child(dialog);
 }
 
+Vector<uint8_t> EditorSampleExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
+
+
+
+	if (EditorImportExport::get_singleton()->sample_get_action()==EditorImportExport::SAMPLE_ACTION_NONE || p_path.extension().to_lower()!="wav") {
+
+		return Vector<uint8_t>();
+	}
+
+	Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
+
+	imd->add_source(EditorImportPlugin::validate_source_path(p_path));
+
+	imd->set_option("force/8_bit",false);
+	imd->set_option("force/mono",false);
+	imd->set_option("force/max_rate",true);
+	imd->set_option("force/max_rate_hz",EditorImportExport::get_singleton()->sample_get_max_hz());
+	imd->set_option("edit/trim",EditorImportExport::get_singleton()->sample_get_trim());
+	imd->set_option("edit/normalize",false);
+	imd->set_option("edit/loop",false);
+	imd->set_option("compress/mode",1);
+
+	String savepath = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/smpconv.smp");
+	Error err = EditorSampleImportPlugin::singleton->import(savepath,imd);
+
+
+	ERR_FAIL_COND_V(err!=OK,Vector<uint8_t>());
+
+	p_path=p_path.basename()+".smp";
+	return FileAccess::get_file_as_array(savepath);
+
+}
+
+
+EditorSampleExportPlugin::EditorSampleExportPlugin() {
+
+}
+
+
diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.h b/tools/editor/io_plugins/editor_sample_import_plugin.h
index 03a4d38ab3..89319affa0 100644
--- a/tools/editor/io_plugins/editor_sample_import_plugin.h
+++ b/tools/editor/io_plugins/editor_sample_import_plugin.h
@@ -43,6 +43,8 @@ class EditorSampleImportPlugin : public EditorImportPlugin {
 	void _compress_ima_adpcm(const Vector<float>& p_data,DVector<uint8_t>& dst_data);
 public:
 
+	static EditorSampleImportPlugin *singleton;
+
 	virtual String get_name() const;
 	virtual String get_visible_name() const;
 	virtual void import_dialog(const String& p_from="");
@@ -52,4 +54,16 @@ public:
 	EditorSampleImportPlugin(EditorNode* p_editor);
 };
 
+class EditorSampleExportPlugin : public EditorExportPlugin {
+
+	OBJ_TYPE( EditorSampleExportPlugin, EditorExportPlugin);
+
+
+public:
+
+	virtual Vector<uint8_t> custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform);
+
+	EditorSampleExportPlugin();
+};
+
 #endif // EDITOR_SAMPLE_IMPORT_PLUGIN_H
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.h b/tools/editor/io_plugins/editor_texture_import_plugin.h
index 78383d1d77..38fd671e9d 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.h
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.h
@@ -123,6 +123,7 @@ public:
 	virtual Vector<uint8_t> custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform);
 	EditorTextureExportPlugin();
 };
+
 class EditorImportTextureOptions : public VBoxContainer {
 
 	OBJ_TYPE( EditorImportTextureOptions, VBoxContainer );
diff --git a/tools/editor/plugins/editor_preview_plugins.cpp b/tools/editor/plugins/editor_preview_plugins.cpp
index c2b3ecfcda..5f52d4c3e7 100644
--- a/tools/editor/plugins/editor_preview_plugins.cpp
+++ b/tools/editor/plugins/editor_preview_plugins.cpp
@@ -491,8 +491,14 @@ Ref<Texture> EditorSamplePreviewPlugin::generate(const RES& p_from) {
 					ima_adpcm.last_nibble++;
 					const uint8_t *src_ptr=sdata;
 
+					int ofs = ima_adpcm.last_nibble>>1;
+
+					if (stereo)
+						ofs*=2;
+
+
 					nibble = (ima_adpcm.last_nibble&1)?
-							(src_ptr[ima_adpcm.last_nibble>>1]>>4):(src_ptr[ima_adpcm.last_nibble>>1]&0xF);
+							(src_ptr[ofs]>>4):(src_ptr[ofs]&0xF);
 					step=_ima_adpcm_step_table[ima_adpcm.step_index];
 
 					ima_adpcm.step_index += _ima_adpcm_index_table[nibble];
diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/tools/editor/plugins/sample_editor_plugin.cpp
index 31fa7246ae..d88f2adc73 100644
--- a/tools/editor/plugins/sample_editor_plugin.cpp
+++ b/tools/editor/plugins/sample_editor_plugin.cpp
@@ -156,8 +156,14 @@ void SampleEditor::generate_preview_texture(const Ref<Sample>& p_sample,Ref<Imag
 					ima_adpcm.last_nibble++;
 					const uint8_t *src_ptr=sdata;
 
+					int ofs = ima_adpcm.last_nibble>>1;
+
+					if (stereo)
+						ofs*=2;
+
 					nibble = (ima_adpcm.last_nibble&1)?
-							(src_ptr[ima_adpcm.last_nibble>>1]>>4):(src_ptr[ima_adpcm.last_nibble>>1]&0xF);
+							(src_ptr[ofs]>>4):(src_ptr[ofs]&0xF);
+
 					step=_ima_adpcm_step_table[ima_adpcm.step_index];
 
 					ima_adpcm.step_index += _ima_adpcm_index_table[nibble];
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index 6003b976aa..30c7c9cfda 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -252,6 +252,13 @@ void ProjectExportDialog::_script_edited(Variant v) {
 
 }
 
+void ProjectExportDialog::_sample_convert_edited(int what) {
+	EditorImportExport::get_singleton()->sample_set_action( EditorImportExport::SampleAction(sample_mode->get_selected()));
+	EditorImportExport::get_singleton()->sample_set_max_hz(  sample_max_hz->get_val() );
+	EditorImportExport::get_singleton()->sample_set_trim(  sample_trim->is_pressed() );
+
+}
+
 void ProjectExportDialog::_notification(int p_what) {
 
 	switch(p_what) {
@@ -319,6 +326,15 @@ void ProjectExportDialog::_notification(int p_what) {
 			_update_group();
 			_update_group_tree();
 
+			sample_mode->select( EditorImportExport::get_singleton()->sample_get_action() );
+			sample_max_hz->set_val( EditorImportExport::get_singleton()->sample_get_max_hz() );
+			sample_trim->set_pressed( EditorImportExport::get_singleton()->sample_get_trim() );
+
+			sample_mode->connect("item_selected",this,"_sample_convert_edited");
+			sample_max_hz->connect("value_changed",this,"_sample_convert_edited");
+			sample_trim->connect("toggled",this,"_sample_convert_edited");
+
+
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 
@@ -1045,6 +1061,7 @@ void ProjectExportDialog::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_group_select_none"),&ProjectExportDialog::_group_select_none);
 	ObjectTypeDB::bind_method(_MD("_script_edited"),&ProjectExportDialog::_script_edited);
 	ObjectTypeDB::bind_method(_MD("_update_script"),&ProjectExportDialog::_update_script);
+	ObjectTypeDB::bind_method(_MD("_sample_convert_edited"),&ProjectExportDialog::_sample_convert_edited);
 
 
 	ObjectTypeDB::bind_method(_MD("export_platform"),&ProjectExportDialog::export_platform);
@@ -1316,6 +1333,22 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	hbc->add_child(button_reload);
 */
 
+
+	sample_vbox = memnew( VBoxContainer );
+	sample_vbox->set_name("Samples");
+	sections->add_child(sample_vbox);
+	sample_mode = memnew( OptionButton );
+	sample_vbox->add_margin_child("Sample Conversion Mode: (.wav files):",sample_mode);
+	sample_mode->add_item("Keep");
+	sample_mode->add_item("Compress (RAM - IMA-ADPCM)");
+	sample_max_hz = memnew( SpinBox );
+	sample_max_hz->set_max(192000);
+	sample_max_hz->set_min(8000);
+	sample_vbox->add_margin_child("Sampling Rate Limit: (hz)",sample_max_hz);
+	sample_trim = memnew( CheckButton );
+	sample_trim->set_text("Trim");
+	sample_vbox->add_margin_child("Trailing Silence:",sample_trim);
+
 	script_vbox = memnew( VBoxContainer );
 	script_vbox->set_name("Script");
 	sections->add_child(script_vbox);
diff --git a/tools/editor/project_export.h b/tools/editor/project_export.h
index d85e688e58..2f824e5ff7 100644
--- a/tools/editor/project_export.h
+++ b/tools/editor/project_export.h
@@ -139,6 +139,10 @@ private:
 	OptionButton *script_mode;
 	LineEdit *script_key;
 
+	VBoxContainer *sample_vbox;
+	OptionButton *sample_mode;
+	SpinBox *sample_max_hz;
+	CheckButton *sample_trim;
 
 
 	void _export_mode_changed(int p_idx);
@@ -162,6 +166,8 @@ private:
 	void _image_export_edited(int what);
 	void _shrink_edited(float what);
 
+	void _sample_convert_edited(int what);
+
 	void _update_group_list();
 	void _select_group(const String& p_by_name);
 

From 6334895088947eb318c8df15d0a68db27819a06f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Thu, 5 Nov 2015 20:13:05 +0100
Subject: [PATCH 49/78] Display error type (error, warning, script error) in
 OS::print_error

Previously all types of errors would be shown as ERROR, thus making for example warnings (WARN_PRINT) somewhat aggressive.
ERROR is displayed in red, WARNING in yellow and SCRIPT ERROR in magenta (though the latter does not seem used so far).
Fixes #1127.
---
 core/os/os.cpp                  | 11 +++++++++--
 drivers/unix/os_unix.cpp        | 26 ++++++++++++++++++--------
 platform/windows/os_windows.cpp | 25 ++++++++++++++++++-------
 platform/winrt/os_winrt.cpp     | 26 ++++++++++++++++++--------
 4 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/core/os/os.cpp b/core/os/os.cpp
index ee9f12b79d..8caf95e4d1 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -61,9 +61,16 @@ void OS::debug_break() {
 
 void OS::print_error(const char* p_function,const char* p_file,int p_line,const char *p_code,const char*p_rationale,ErrorType p_type) {
 
+	const char* err_type;
+	switch(p_type) {
+		case ERR_ERROR: err_type="**ERROR**"; break;
+		case ERR_WARNING: err_type="**WARNING**"; break;
+		case ERR_SCRIPT: err_type="**SCRIPT ERROR**"; break;
+	}
+
 	if (p_rationale && *p_rationale)
-		print("**ERROR**: %s\n ",p_rationale);
-	print("**ERROR**: At: %s:%i:%s() - %s\n",p_file,p_line,p_function,p_code);
+		print("%s: %s\n ",err_type,p_rationale);
+	print("%s: At: %s:%i:%s() - %s\n",err_type,p_file,p_line,p_function,p_code);
 }
 
 void OS::print(const char* p_format, ...) {
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 8617061ad4..194802fcb8 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -65,15 +65,25 @@ void OS_Unix::print_error(const char* p_function,const char* p_file,int p_line,c
 	if (!_print_error_enabled)
 		return;
 
-	if (p_rationale && p_rationale[0]) {
-
-		print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,p_rationale);
-		print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
-
-	} else {
-		print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,p_code);
-		print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+	const char* err_details;
+	if (p_rationale && p_rationale[0])
+		err_details=p_rationale;
+	else
+		err_details=p_code;
 
+	switch(p_type) {
+		case ERR_ERROR:
+			print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
+			print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			break;
+		case ERR_WARNING:
+			print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details);
+			print("\E[0;33;40m     At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			break;
+		case ERR_SCRIPT:
+			print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
+			print("\E[0;35;40m          At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			break;
 	}
 }
 
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 438a5a6903..01a8261563 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1768,15 +1768,26 @@ void OS_Windows::print_error(const char* p_function,const char* p_file,int p_lin
 
 	HANDLE hCon=GetStdHandle(STD_OUTPUT_HANDLE);
 	if (!hCon || hCon==INVALID_HANDLE_VALUE) {
-		if (p_rationale && p_rationale[0]) {
 
-			print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,p_rationale);
-			print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
-
-		} else {
-			print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,p_code);
-			print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+		const char* err_details;
+		if (p_rationale && p_rationale[0])
+			err_details=p_rationale;
+		else
+			err_details=p_code;
 
+		switch(p_type) {
+			case ERR_ERROR:
+				print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
+				print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+				break;
+			case ERR_WARNING:
+				print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details);
+				print("\E[0;33;40m     At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+				break;
+			case ERR_SCRIPT:
+				print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
+				print("\E[0;35;40m          At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+				break;
 		}
 	} else {
 
diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp
index 3e06d9d59b..1e060a3667 100644
--- a/platform/winrt/os_winrt.cpp
+++ b/platform/winrt/os_winrt.cpp
@@ -424,15 +424,25 @@ void OSWinrt::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) con
 
 void OSWinrt::print_error(const char* p_function,const char* p_file,int p_line,const char *p_code,const char*p_rationale,ErrorType p_type) {
 
-	if (p_rationale && p_rationale[0]) {
-
-		print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,p_rationale);
-		print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
-
-	} else {
-		print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,p_code);
-		print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+	const char* err_details;
+	if (p_rationale && p_rationale[0])
+		err_details=p_rationale;
+	else
+		err_details=p_code;
 
+	switch(p_type) {
+		case ERR_ERROR:
+			print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
+			print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			break;
+		case ERR_WARNING:
+			print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details);
+			print("\E[0;33;40m     At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			break;
+		case ERR_SCRIPT:
+			print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
+			print("\E[0;35;40m          At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			break;
 	}
 }
 

From 9ab7de243fe0348c46a87c03b1fce15b8e1afeb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 10 Nov 2015 08:04:48 +0100
Subject: [PATCH 50/78] Fix error messages forcing a white font for subsequent
 messages

This is achieved using the "no specific formatting" \E[0m tag.
Fixes #2566.

Also remove the hardcoded black background colour and use default bolded terminal font for error message.
Error logs should now look good both on terminals with a dark and light background colour.
---
 drivers/unix/os_unix.cpp        | 12 ++++++------
 platform/windows/os_windows.cpp | 12 ++++++------
 platform/winrt/os_winrt.cpp     | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 194802fcb8..fd8c26f6d9 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -73,16 +73,16 @@ void OS_Unix::print_error(const char* p_function,const char* p_file,int p_line,c
 
 	switch(p_type) {
 		case ERR_ERROR:
-			print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
-			print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			print("\E[1;31mERROR: %s: \E[0m\E[1m%s\n",p_function,err_details);
+			print("\E[0;31m   At: %s:%i.\E[0m\n",p_file,p_line);
 			break;
 		case ERR_WARNING:
-			print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details);
-			print("\E[0;33;40m     At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			print("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n",p_function,err_details);
+			print("\E[0;33m     At: %s:%i.\E[0m\n",p_file,p_line);
 			break;
 		case ERR_SCRIPT:
-			print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
-			print("\E[0;35;40m          At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			print("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m%s\n",p_function,err_details);
+			print("\E[0;35m          At: %s:%i.\E[0m\n",p_file,p_line);
 			break;
 	}
 }
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 01a8261563..964b9e76f3 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1777,16 +1777,16 @@ void OS_Windows::print_error(const char* p_function,const char* p_file,int p_lin
 
 		switch(p_type) {
 			case ERR_ERROR:
-				print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
-				print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+				print("\E[1;31mERROR: %s: \E[0m\E[1m%s\n",p_function,err_details);
+				print("\E[0;31m   At: %s:%i.\E[0m\n",p_file,p_line);
 				break;
 			case ERR_WARNING:
-				print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details);
-				print("\E[0;33;40m     At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+				print("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n",p_function,err_details);
+				print("\E[0;33m     At: %s:%i.\E[0m\n",p_file,p_line);
 				break;
 			case ERR_SCRIPT:
-				print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
-				print("\E[0;35;40m          At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+				print("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m",p_function,err_details);
+				print("\E[0;35m          At: %s:%i.\E[0m\n",p_file,p_line);
 				break;
 		}
 	} else {
diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp
index 1e060a3667..51f60a0362 100644
--- a/platform/winrt/os_winrt.cpp
+++ b/platform/winrt/os_winrt.cpp
@@ -432,16 +432,16 @@ void OSWinrt::print_error(const char* p_function,const char* p_file,int p_line,c
 
 	switch(p_type) {
 		case ERR_ERROR:
-			print("\E[1;31;40mERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
-			print("\E[0;31;40m   At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			print("\E[1;31mERROR: %s: \E[0m\E[1m%s\n",p_function,err_details);
+			print("\E[0;31m   At: %s:%i.\E[0m\n",p_file,p_line);
 			break;
 		case ERR_WARNING:
-			print("\E[1;33;40mWARNING: %s: \E[1;37;40m%s\n",p_function,err_details);
-			print("\E[0;33;40m     At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			print("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n",p_function,err_details);
+			print("\E[0;33m     At: %s:%i.\E[0m\n",p_file,p_line);
 			break;
 		case ERR_SCRIPT:
-			print("\E[1;35;40mSCRIPT ERROR: %s: \E[1;37;40m%s\n",p_function,err_details);
-			print("\E[0;35;40m          At: %s:%i.\E[0;0;37m\n",p_file,p_line);
+			print("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m",p_function,err_details);
+			print("\E[0;35m          At: %s:%i.\E[0m\n",p_file,p_line);
 			break;
 	}
 }

From 1d3fa162c8272337f7a275432181824e07558fa9 Mon Sep 17 00:00:00 2001
From: sanikoyes <sanikoyes@163.com>
Date: Wed, 11 Jun 2014 14:45:26 +0800
Subject: [PATCH 51/78] Fix node renaming bug when using the '.' character

Fixed by making '.' (and '/') illegal character in node names when adding via the rename feature.
---
 tools/editor/scene_tree_editor.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp
index 60395d5ff5..ac2f76acdc 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/tools/editor/scene_tree_editor.cpp
@@ -649,20 +649,28 @@ void SceneTreeEditor::_rename_node(ObjectID p_node,const String& p_name) {
 void SceneTreeEditor::_renamed() {
 
 	TreeItem *which=tree->get_edited();
-	
+
 	ERR_FAIL_COND(!which);
 	NodePath np = which->get_metadata(0);
 	Node *n=get_node(np);
 	ERR_FAIL_COND(!n);
 
+	String new_name=which->get_text(0);
+	if (new_name.find(".") != -1 || new_name.find("/") != -1) {
+
+		error->set_text("Invalid node name, the following characters are not allowed:\n  \".\", \"/\"");
+		error->popup_centered_minsize();
+		new_name=n->get_name();
+	}
+
 	if (!undo_redo) {
-		n->set_name( which->get_text(0) );
+		n->set_name( new_name );
 		which->set_metadata(0,n->get_path());
 		emit_signal("node_renamed");
 	} else {
 		undo_redo->create_action("Rename Node");
-		emit_signal("node_prerename",n,which->get_text(0));
-		undo_redo->add_do_method(this,"_rename_node",n->get_instance_ID(),which->get_text(0));
+		emit_signal("node_prerename",n,new_name);
+		undo_redo->add_do_method(this,"_rename_node",n->get_instance_ID(),new_name);
 		undo_redo->add_undo_method(this,"_rename_node",n->get_instance_ID(),n->get_name());
 		undo_redo->commit_action();
 	}

From 541812e999858ec1a7f1dc19febef2617f06573f Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Wed, 11 Nov 2015 11:30:55 -0300
Subject: [PATCH 52/78] Implement Quat multiply operator, and xform method

---
 core/math/quat.h      |  2 +-
 core/variant_call.cpp |  2 ++
 core/variant_op.cpp   | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/core/math/quat.h b/core/math/quat.h
index de4aedaeec..f161e35074 100644
--- a/core/math/quat.h
+++ b/core/math/quat.h
@@ -73,7 +73,7 @@ public:
 			-x * v.x - y * v.y - z * v.z);
 	}
 
-	_FORCE_INLINE_ Vector3 xform(const Vector3& v) {
+	_FORCE_INLINE_ Vector3 xform(const Vector3& v) const {
 
 		Quat q = *this * v;
 		q *= this->inverse();
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 222618ffa0..7bbb18225d 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -409,6 +409,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
 	VCALL_LOCALMEM0R(Quat,normalized);
 	VCALL_LOCALMEM0R(Quat,inverse);
 	VCALL_LOCALMEM1R(Quat,dot);
+	VCALL_LOCALMEM1R(Quat,xform);
 	VCALL_LOCALMEM2R(Quat,slerp);
 	VCALL_LOCALMEM2R(Quat,slerpni);
 	VCALL_LOCALMEM4R(Quat,cubic_slerp);
@@ -1361,6 +1362,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 	ADDFUNC0(QUAT,QUAT,Quat,normalized,varray());
 	ADDFUNC0(QUAT,QUAT,Quat,inverse,varray());
 	ADDFUNC1(QUAT,REAL,Quat,dot,QUAT,"b",varray());
+	ADDFUNC1(QUAT,VECTOR3,Quat,xform,VECTOR3,"v",varray());
 	ADDFUNC2(QUAT,QUAT,Quat,slerp,QUAT,"b",REAL,"t",varray());
 	ADDFUNC2(QUAT,QUAT,Quat,slerpni,QUAT,"b",REAL,"t",varray());
 	ADDFUNC4(QUAT,QUAT,Quat,cubic_slerp,QUAT,"b",QUAT,"pre_a",QUAT,"post_b",REAL,"t",varray());
diff --git a/core/variant_op.cpp b/core/variant_op.cpp
index 1cdf6d7319..39a802e171 100644
--- a/core/variant_op.cpp
+++ b/core/variant_op.cpp
@@ -586,7 +586,21 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant&
 				} break;
 				DEFAULT_OP_LOCALMEM_NUM(*,VECTOR3,Vector3);
 				DEFAULT_OP_FAIL(PLANE);
-				DEFAULT_OP_FAIL(QUAT);
+				case QUAT: {
+
+					switch(p_b.type) {
+						case VECTOR3: {
+
+							_RETURN( reinterpret_cast<const Quat*>(p_a._data._mem)->xform( *(const Vector3*)p_b._data._mem) );
+						} break;
+						case QUAT: {
+
+							_RETURN( *reinterpret_cast<const Quat*>(p_a._data._mem) * *reinterpret_cast<const Quat*>(p_b._data._mem) );
+						} break;
+					};
+					r_valid=false;
+					return;
+				} break;
 				DEFAULT_OP_FAIL(_AABB);
 				case MATRIX3: {
 

From 1d7e9c4ba52250db3b0b0fd732e44074252045d2 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Wed, 11 Nov 2015 17:39:06 -0300
Subject: [PATCH 53/78] -fixes to animatedsprite used with atlas

---
 scene/2d/animated_sprite.cpp             |  3 ++-
 tools/editor/io_plugins/editor_atlas.cpp | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp
index 342b86b4c1..458246671c 100644
--- a/scene/2d/animated_sprite.cpp
+++ b/scene/2d/animated_sprite.cpp
@@ -165,7 +165,8 @@ void AnimatedSprite::_notification(int p_what) {
 			if (vflip)
 				dst_rect.size.y=-dst_rect.size.y;
 
-			texture->draw_rect(ci,dst_rect,false,modulate);
+			//texture->draw_rect(ci,dst_rect,false,modulate);
+			texture->draw_rect_region(ci,dst_rect,Rect2(Vector2(),texture->get_size()),modulate);
 //			VisualServer::get_singleton()->canvas_item_add_texture_rect_region(ci,dst_rect,texture->get_rid(),src_rect,modulate);
 
 		} break;
diff --git a/tools/editor/io_plugins/editor_atlas.cpp b/tools/editor/io_plugins/editor_atlas.cpp
index 4a260a9a6f..7e9acd193d 100644
--- a/tools/editor/io_plugins/editor_atlas.cpp
+++ b/tools/editor/io_plugins/editor_atlas.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "editor_atlas.h"
-
+#include "print_string.h"
 
 struct _EditorAtlasWorkRect {
 
@@ -83,6 +83,7 @@ void EditorAtlas::fit(const Vector<Size2i>& p_rects,Vector<Point2i>& r_result, S
 		//place them
 		int ofs=0;
 		int limit_h=0;
+
 		for(int j=0;j<wrects.size();j++) {
 
 
@@ -100,6 +101,9 @@ void EditorAtlas::fit(const Vector<Size2i>& p_rects,Vector<Point2i>& r_result, S
 
 			wrects[j].p.x=ofs;
 			wrects[j].p.y=from_y;
+
+
+
 			int end_h = from_y+wrects[j].s.height;
 			int end_w = ofs+wrects[j].s.width;
 			if (ofs==0)
@@ -116,7 +120,7 @@ void EditorAtlas::fit(const Vector<Size2i>& p_rects,Vector<Point2i>& r_result, S
 			if (end_w > max_w)
 				max_w=end_w;
 
-			if (ofs==0 || end_h>limit_h ) //while h limit not reched, keep stacking
+			//if (ofs==0 || end_h>limit_h ) //while h limit not reched, keep stacking
 				ofs+=wrects[j].s.width;
 
 		}
@@ -136,8 +140,8 @@ void EditorAtlas::fit(const Vector<Size2i>& p_rects,Vector<Point2i>& r_result, S
 
 	for(int i=0;i<results.size();i++) {
 
-		float h = nearest_power_of_2(results[i].max_h);
-		float w = nearest_power_of_2(results[i].max_w);
+		float h = results[i].max_h;
+		float w = results[i].max_w;
 		float aspect = h>w ? h/w : w/h;
 		if (aspect < best_aspect) {
 			best=i;

From 724b7edfd74efa9e0af0d9b25a4f7070389a87c8 Mon Sep 17 00:00:00 2001
From: Neiro <neiro@km.ru>
Date: Thu, 12 Nov 2015 17:47:04 +0300
Subject: [PATCH 54/78] Remove of use_exclude_ctrl_bones (was removed in
 io_scene_dae by Sergey Lapin, commit
 4210d5e4594fcf80bc121bccc916d411663d02bc) in godot_export_manager.py

---
 tools/export/blender25/godot_export_manager.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/export/blender25/godot_export_manager.py b/tools/export/blender25/godot_export_manager.py
index e390ae6ce3..582d76f94f 100644
--- a/tools/export/blender25/godot_export_manager.py
+++ b/tools/export/blender25/godot_export_manager.py
@@ -107,7 +107,6 @@ class godot_export_manager(bpy.types.Panel):
             col.prop(group,"use_triangles")
             col.prop(group,"use_copy_images")
             col.prop(group,"use_active_layers")
-            col.prop(group,"use_exclude_ctrl_bones")
             col.prop(group,"use_anim")
             col.prop(group,"use_anim_action_all")
             col.prop(group,"use_anim_skip_noexp")
@@ -351,7 +350,7 @@ class export_group(bpy.types.Operator):
                     bpy.data.objects[object.name].select = True
                     
             bpy.ops.object.transform_apply(location=group[self.idx].apply_loc, rotation=group[self.idx].apply_rot, scale=group[self.idx].apply_scale)
-            bpy.ops.export_scene.dae(check_existing=True, filepath=path, filter_glob="*.dae", object_types=group[self.idx].object_types, use_export_selected=group[self.idx].use_export_selected, use_mesh_modifiers=group[self.idx].use_mesh_modifiers, use_tangent_arrays=group[self.idx].use_tangent_arrays, use_triangles=group[self.idx].use_triangles, use_copy_images=group[self.idx].use_copy_images, use_active_layers=group[self.idx].use_active_layers, use_exclude_ctrl_bones=group[self.idx].use_exclude_ctrl_bones, use_anim=group[self.idx].use_anim, use_anim_action_all=group[self.idx].use_anim_action_all, use_anim_skip_noexp=group[self.idx].use_anim_skip_noexp, use_anim_optimize=group[self.idx].use_anim_optimize, anim_optimize_precision=group[self.idx].anim_optimize_precision, use_metadata=group[self.idx].use_metadata)    
+            bpy.ops.export_scene.dae(check_existing=True, filepath=path, filter_glob="*.dae", object_types=group[self.idx].object_types, use_export_selected=group[self.idx].use_export_selected, use_mesh_modifiers=group[self.idx].use_mesh_modifiers, use_tangent_arrays=group[self.idx].use_tangent_arrays, use_triangles=group[self.idx].use_triangles, use_copy_images=group[self.idx].use_copy_images, use_active_layers=group[self.idx].use_active_layers, use_anim=group[self.idx].use_anim, use_anim_action_all=group[self.idx].use_anim_action_all, use_anim_skip_noexp=group[self.idx].use_anim_skip_noexp, use_anim_optimize=group[self.idx].use_anim_optimize, anim_optimize_precision=group[self.idx].anim_optimize_precision, use_metadata=group[self.idx].use_metadata)    
           
             self.report({'INFO'}, '"'+group[self.idx].name+'"' + " Group exported." )  
             msg = "Export Group "+group[self.idx].name
@@ -422,7 +421,6 @@ class godot_export_groups(bpy.types.PropertyGroup):
 
     use_copy_images = BoolProperty(name="Copy Images",description="Copy Images (create images/ subfolder)",default=False)
     use_active_layers = BoolProperty(name="Active Layers",description="Export only objects on the active layers.",default=True)
-    use_exclude_ctrl_bones = BoolProperty(name="Exclude Control Bones",description="Exclude skeleton bones with names that begin with 'ctrl'.",default=True)
     use_anim = BoolProperty(name="Export Animation",description="Export keyframe animation",default=False)
     use_anim_action_all = BoolProperty(name="All Actions",description=("Export all actions for the first armature found in separate DAE files"),default=False)
     use_anim_skip_noexp = BoolProperty(name="Skip (-noexp) Actions",description="Skip exporting of actions whose name end in (-noexp). Useful to skip control animations.",default=True)

From bbc42a159c0e2ec04e317bb0766472e4d35e2819 Mon Sep 17 00:00:00 2001
From: eska <eska@eska.me>
Date: Thu, 12 Nov 2015 15:50:20 +0100
Subject: [PATCH 55/78] Allow extending from Object in GDScript

---
 modules/gdscript/gd_parser.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index 313fb57d0e..202ab76da0 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -1940,9 +1940,15 @@ void GDParser::_parse_extends(ClassNode *p_class) {
 
 	p_class->extends_used=true;
 
-	//see if inheritance happens from a file
 	tokenizer->advance();
 
+	if (tokenizer->get_token()==GDTokenizer::TK_BUILT_IN_TYPE && tokenizer->get_token_type()==Variant::OBJECT) {
+		p_class->extends_class.push_back(Variant::get_type_name(Variant::OBJECT));
+		tokenizer->advance();
+		return;
+	}
+
+	// see if inheritance happens from a file
 	if (tokenizer->get_token()==GDTokenizer::TK_CONSTANT) {
 
 		Variant constant = tokenizer->get_token_constant();

From 222d112f496a5193b837854a72e4025a45a28ef2 Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Thu, 12 Nov 2015 13:35:48 -0300
Subject: [PATCH 56/78] Implement Ctrl + backspace/delete to delete words

---
 scene/gui/text_edit.cpp | 113 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 109 insertions(+), 4 deletions(-)

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index be6c0d0a8b..d081e84df4 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1647,8 +1647,60 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 				case KEY_BACKSPACE: {
 					if (readonly)
 						break;
-					backspace_at_cursor();
-					
+
+#ifdef APPLE_STYLE_KEYS
+					if (k.mod.alt) {
+#else
+					if (k.mod.alt) {
+						scancode_handled=false;
+						break;
+					} else if (k.mod.command) {
+#endif
+						int line=cursor.line;
+						int column=cursor.column;
+
+						bool prev_char=false;
+						bool only_whitespace=true;
+
+						while (only_whitespace && line > 0) {
+
+							while (column>0) {
+								CharType c=text[line][column-1];
+
+								if (c != '\t' && c != ' ') {
+									only_whitespace=false;
+									break;
+								}
+
+								column--;
+							}
+
+							if (only_whitespace) {
+								line--;
+								column=text[line].length();
+							}
+						}
+
+						while (column>0) {
+							bool ischar=_is_text_char(text[line][column-1]);
+
+							if (prev_char && !ischar)
+								break;
+
+							prev_char=ischar;
+							column--;
+
+						}
+
+						_remove_text(line, column, cursor.line, cursor.column);
+
+						cursor_set_line(line);
+						cursor_set_column(column);
+
+					} else {
+						backspace_at_cursor();
+					}
+
 				} break;
 				case KEY_LEFT: {
 					
@@ -1789,10 +1841,63 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 					if (cursor.line==text.size()-1 && cursor.column==curline_len)
 						break; //nothing to do
 					
-					int next_line = cursor.column<curline_len?cursor.line:cursor.line+1;
-					int next_column = cursor.column<curline_len?(cursor.column+1):0;
+					int next_line=cursor.column<curline_len?cursor.line:cursor.line+1;
+					int next_column;
+
+#ifdef APPLE_STYLE_KEYS
+					if (k.mod.alt) {
+#else
+					if (k.mod.alt) {
+						scancode_handled=false;
+						break;
+					} else if (k.mod.command) {
+#endif
+						int last_line=text.size()-1;
+
+						int line=cursor.line;
+						int column=cursor.column;
+
+						bool prev_char=false;
+						bool only_whitespace=true;
+
+						while (only_whitespace && line < last_line) {
+
+							while (column<text[line].length()) {
+								CharType c=text[line][column];
+
+								if (c != '\t' && c != ' ') {
+									only_whitespace=false;
+									break;
+								}
+
+								column++;
+							}
+
+							if (only_whitespace) {
+								line++;
+								column=0;
+							}
+						}
+
+						while (column<text[line].length()) {
+
+							bool ischar=_is_text_char(text[line][column]);
+
+							if (prev_char && !ischar)
+								break;
+							prev_char=ischar;
+							column++;
+						}
+
+						next_line=line;
+						next_column=column;
+					} else {
+						next_column=cursor.column<curline_len?(cursor.column+1):0;
+					}
+
 					_remove_text(cursor.line,cursor.column,next_line,next_column);
 					update();
+
 				} break;
 #ifdef APPLE_STYLE_KEYS
 				case KEY_HOME: {

From bff8b04f522961daa46af217d6dd5514cf875a9d Mon Sep 17 00:00:00 2001
From: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
Date: Fri, 13 Nov 2015 12:16:55 +0200
Subject: [PATCH 57/78] Change popup_menu.cpp as proposed in #2011

Closes #2011
---
 scene/gui/popup_menu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index 6c21ea639f..89354322e3 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -774,6 +774,7 @@ void PopupMenu::add_separator() {
 void PopupMenu::clear()  {
 
 	items.clear();
+	mouse_over=-1;
 	update();
 	idcount=0;
 

From ae65dfa4ec82dd59f7aaa0b4fa48ba28f878b72c Mon Sep 17 00:00:00 2001
From: neikeq <ignalfonsore@gmail.com>
Date: Thu, 5 Nov 2015 15:22:50 +0100
Subject: [PATCH 58/78] Small PopupMenu changes

---
 scene/gui/popup_menu.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index 6c21ea639f..95d4503162 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -323,11 +323,14 @@ void PopupMenu::_input_event(const InputEvent &p_event) {
 						invalidated_click=false;
 						break;
 					}
-					if (over<0 || items[over].separator || items[over].disabled) {
+					if (over<0) {
 						hide();
 						break; //non-activable
 					}
 
+					if (items[over].separator || items[over].disabled)
+						break;
+
 					if (items[over].submenu!="") {
 
 						_activate_submenu(over);
@@ -362,8 +365,11 @@ void PopupMenu::_input_event(const InputEvent &p_event) {
 			int over=_get_mouse_over(Point2(m.x,m.y));
 			int id = (over<0 || items[over].separator || items[over].disabled)?-1:items[over].ID;
 
-			if (id<0)
+			if (id<0) {
+				mouse_over=-1;
+				update();
 				break;
+			}
 
 			if (items[over].submenu!="" && submenu_over!=over) {
 				submenu_over=over;

From 8420c24f7f35cdd7adbc7d4595cb1756020ab127 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Fri, 13 Nov 2015 20:56:44 -0300
Subject: [PATCH 59/78] -better integration of ndee's theme

---
 scene/gui/tree.cpp                            |  28 +++++++++++++++---
 scene/gui/tree.h                              |   8 +++++
 scene/main/instance_placeholder.cpp           |   5 ++--
 scene/main/instance_placeholder.h             |   4 +--
 scene/resources/default_theme/checked.png     | Bin 597 -> 601 bytes
 .../resources/default_theme/default_theme.cpp |  16 +++++-----
 scene/resources/default_theme/hslider_bg.png  | Bin 229 -> 479 bytes
 .../default_theme/hslider_grabber.png         | Bin 483 -> 582 bytes
 .../default_theme/hslider_grabber_hl.png      | Bin 456 -> 611 bytes
 scene/resources/default_theme/scroll_bg.png   | Bin 215 -> 468 bytes
 .../default_theme/scroll_grabber.png          | Bin 266 -> 364 bytes
 .../default_theme/scroll_grabber_hl.png       | Bin 286 -> 411 bytes
 scene/resources/default_theme/theme_data.h    |  26 ++++++++--------
 scene/resources/default_theme/toggle_off.png  | Bin 733 -> 1613 bytes
 scene/resources/default_theme/toggle_on.png   | Bin 831 -> 1618 bytes
 scene/resources/default_theme/unchecked.png   | Bin 394 -> 385 bytes
 scene/resources/default_theme/vslider_bg.png  | Bin 229 -> 543 bytes
 .../default_theme/vslider_grabber.png         | Bin 572 -> 533 bytes
 .../default_theme/vslider_grabber_hl.png      | Bin 456 -> 555 bytes
 scene/resources/packed_scene.cpp              |   2 +-
 tools/editor/editor_node.cpp                  |   6 ++--
 tools/editor/icons/icon_back.png              | Bin 206 -> 180 bytes
 tools/editor/icons/icon_forward.png           | Bin 199 -> 191 bytes
 tools/editor/property_editor.cpp              |   1 +
 24 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index 5df6f2ced9..a27918cf52 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -962,7 +962,9 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 
 		Point2i guide_space=Point2i( cache.guide_width , height );
 
-		if (p_item->childs) { //has childs, draw the guide box
+
+
+		if (!hide_folding && p_item->childs) { //has childs, draw the guide box
 
 			Ref<Texture> arrow;
 
@@ -986,7 +988,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 
 		int font_ascent=font->get_ascent();
 
-		int ofs = p_pos.x + cache.item_margin;
+		int ofs = p_pos.x + (hide_folding?cache.hseparation:cache.item_margin);
 		for (int i=0;i<columns.size();i++) {
 
 			int w = get_column_width(i);
@@ -1062,7 +1064,10 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 
 			if (p_item->cells[i].custom_bg_color) {
 
-				VisualServer::get_singleton()->canvas_item_add_rect(ci,cell_rect,p_item->cells[i].bg_color);
+				Rect2 r=cell_rect;
+				r.pos.x-=cache.hseparation;
+				r.size.x+=cache.hseparation;
+				VisualServer::get_singleton()->canvas_item_add_rect(ci,r,p_item->cells[i].bg_color);
 			}
 
 			Color col=p_item->cells[i].custom_color?p_item->cells[i].color:get_color( p_item->cells[i].selected?"font_color_selected":"font_color");
@@ -1376,7 +1381,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 	if (!skip && p_pos.y<item_h) {
 		// check event!
 
-		if (p_pos.x >=x_ofs && p_pos.x < (x_ofs+cache.item_margin) ) {
+		if (!hide_folding && (p_pos.x >=x_ofs && p_pos.x < (x_ofs+cache.item_margin) )) {
 
 
 			if (p_item->childs)
@@ -3114,6 +3119,16 @@ bool Tree::can_cursor_exit_tree() const {
 	return cursor_can_exit_tree;
 }
 
+void Tree::set_hide_folding(bool p_hide) {
+	hide_folding=p_hide;
+	update();
+}
+
+bool Tree::is_folding_hidden() const {
+
+	return hide_folding;
+}
+
 
 void Tree::_bind_methods() {
 
@@ -3155,6 +3170,9 @@ void Tree::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_column_title","column"),&Tree::get_column_title);
 	ObjectTypeDB::bind_method(_MD("get_scroll"),&Tree::get_scroll);
 
+	ObjectTypeDB::bind_method(_MD("set_hide_folding","hide"),&Tree::set_hide_folding);
+	ObjectTypeDB::bind_method(_MD("is_folding_hidden"),&Tree::is_folding_hidden);
+
 
 	ADD_SIGNAL( MethodInfo("item_selected"));
 	ADD_SIGNAL( MethodInfo("cell_selected"));
@@ -3242,6 +3260,8 @@ Tree::Tree() {
 	pressing_for_editor=false;
 	range_drag_enabled=false;
 
+	hide_folding=false;
+
 }
 
 
diff --git a/scene/gui/tree.h b/scene/gui/tree.h
index 3fbd7c95d9..8fb9b802a1 100644
--- a/scene/gui/tree.h
+++ b/scene/gui/tree.h
@@ -228,6 +228,7 @@ public:
 	void set_tooltip(int p_column, const String& p_tooltip);
 	String get_tooltip(int p_column) const;
 
+
 	void clear_children();
 
 	void move_to_top();
@@ -410,6 +411,8 @@ friend class TreeItem;
 	bool drag_touching_deaccel;
 	bool click_handled;
 
+	bool hide_folding;
+
 protected:
 	static void _bind_methods();
 	
@@ -467,6 +470,11 @@ public:
 
 	VScrollBar *get_vscroll_bar() { return v_scroll; }
 
+	void set_hide_folding(bool p_hide);
+	bool is_folding_hidden() const;
+
+
+
 	Tree();
 	~Tree();	
 
diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp
index 370eb1e74a..12f6086bf0 100644
--- a/scene/main/instance_placeholder.cpp
+++ b/scene/main/instance_placeholder.cpp
@@ -22,12 +22,12 @@ void InstancePlaceholder::_get_property_list( List<PropertyInfo> *p_list) const{
 }
 
 
-void InstancePlaceholder::set_path(const String& p_name) {
+void InstancePlaceholder::set_instance_path(const String& p_name) {
 
 	path=p_name;
 }
 
-String InstancePlaceholder::get_path() const {
+String InstancePlaceholder::get_instance_path() const {
 
 	return path;
 }
@@ -66,6 +66,7 @@ void InstancePlaceholder::replace_by_instance(const Ref<PackedScene> &p_custom_s
 void InstancePlaceholder::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("replace_by_instance","custom_scene:PackedScene"),&InstancePlaceholder::replace_by_instance,DEFVAL(Variant()));
+	ObjectTypeDB::bind_method(_MD("get_instance_path"),&InstancePlaceholder::get_instance_path);
 }
 
 InstancePlaceholder::InstancePlaceholder() {
diff --git a/scene/main/instance_placeholder.h b/scene/main/instance_placeholder.h
index e9e76e7a2d..9c47655ce7 100644
--- a/scene/main/instance_placeholder.h
+++ b/scene/main/instance_placeholder.h
@@ -26,8 +26,8 @@ protected:
 
 public:
 
-	void set_path(const String& p_name);
-	String get_path() const;
+	void set_instance_path(const String& p_name);
+	String get_instance_path() const;
 
 	void replace_by_instance(const Ref<PackedScene>& p_custom_scene=Ref<PackedScene>());
 
diff --git a/scene/resources/default_theme/checked.png b/scene/resources/default_theme/checked.png
index a41b33cccf28037acaaadcc6b9182f85b62973c8..a2240c227f9042cd7f10e17c759f73e480f3075b 100644
GIT binary patch
delta 533
zcmcc0a+76(mf?Sf{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&&?}l
zz>xczW%<NtjrxP0E{-7<r`Jw)%oYw5Y29CL{J0@DqDeSfW7+Ln_7}?1#bcM~Dsv?r
zh+mLt-gF^$LwC?Z1rbgUR^}j0GY<_tk*?KhU)ftW?iS?Q=E-?;ndklDhdv&KmwMwW
zK0KIL{ch*?x$OTXxDpEOUNbyCz%qeJh0n&MBvvl<{r#%lU+e0nIlkG|XGACF?J4}0
z{rJh33cu`J?WIY(pBDLlc$d24Swuhg`unL3i#rk?J^50>w?X%`TA#vPzs*~|h$QnI
zP5M~2;+w{#S(l=2D{%^SvM3#T@?`G4SeJ;{vyUzKcJEeQb=6s0W~=#Xjips{&CTNj
z^`_65H;?JSXR(<xXD+&#v#EaHKEa1Aj;B{$&0<K|%r7ao@8GFZ#SGW3#a+tUs+YLd
zqABR5@afZ*Y3c8a>h3Ad^a)xi6QuY4Z)<Ppg^W2H_y6a;y)820#D%==C!fb3+1JBk
zbmH8(<MwWWT}}^q9X}Y0rSmFTSgd$Z$zO1HcF5}c>{f<K7mi8v818K`WV`>rG4g%9
z-iyO8>za0Tlx*3zLHTB3Vvpl%ZkHw8SALg2=wEVdAJg5u?T16zL()}Dzp;M!Ey}Xa
s`q!CK_wDO``7C@>6(RG%{*k$V(~6|sXL<!07#J8lUHx3vIVCg!0R8*-JOBUy

delta 529
zcmcb~a+PI*mLUTO{B+)3&%nUIS>O>_%)r1c48n{Iv*t)JFfg!}c>21s-{TZwFf$8v
z(<_@8tx><%)5S5wqPKUlf3|R-$kF=AGg}s3>Y3oV>(w^-1sr9I*X9O$O;hsX)(ic^
zW>%u@x@&!5V&POL^PoE>t&<k**v{g6b;qUF8E2G~XP!K>B!AZlpV^b9U*hiPe!sW)
z+~3s~%vn7cqMocbV*H{cuO(=~nbP2?P|MoMkn_MifzfeI{fvttxp|3p@qTKPgHp_<
zr>_0MbiH)u%$<L4l-_lIFrRBl!^)+9KJ9y6d1G7eV+-f!H!rLAEI+Q9yH|1g+#Ub_
z9zUsf!N)~VV%D;YZ_AdxYISOS8GZT9-usKgRtvT%HZZC@ika%zuxizG4mrCjhsV$L
zS6x+ZQgGmKR9WNEy>-*BdZ(3Nqz)VGur6=kD4iUl#a?1Hcj5k7JqgSA9Del3Mp|0`
zWtH6heb+4i73ui;OEn5KB^A#7;>&#bOu$Y11Dn>o7H&!GxSF-`XO{5ofBt*prZ>3@
zF;vX!f4n1S|J`MG^ZHdfvIS1bN%yiXo7s80Y~ii^dzIQO7v6oXda=uHir41Qo4ZPu
zzqZ=<-no8>zo-MNTF}anfA`)T+8wx9CR%`{=GUK(J0F+WG1Rk9Kl$X>=`ZXVjCD4R
k&9B#-+W5Te)B&scj7gkpz2x>h_XS11r>mdKI;Vst0DhtM!~g&Q

diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 7e36366e74..0f4c2ecd23 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -460,10 +460,10 @@ void make_default_theme() {
 
 	// HScrollBar
 
-	t->set_stylebox("scroll","HScrollBar", make_stylebox( scroll_bg_png,3,3,3,3,0,0,0,0) );
-	t->set_stylebox("scroll_focus","HScrollBar", make_stylebox( scroll_bg_png,3,3,3,3,0,0,0,0) );
-	t->set_stylebox("grabber","HScrollBar", make_stylebox( scroll_grabber_png,3,3,3,3,2,2,2,2) );
-	t->set_stylebox("grabber_hilite","HScrollBar", make_stylebox( scroll_grabber_hl_png,3,3,3,3,2,2,2,2) );
+	t->set_stylebox("scroll","HScrollBar", make_stylebox( scroll_bg_png,5,5,5,5,0,0,0,0) );
+	t->set_stylebox("scroll_focus","HScrollBar", make_stylebox( scroll_bg_png,5,5,5,5,0,0,0,0) );
+	t->set_stylebox("grabber","HScrollBar", make_stylebox( scroll_grabber_png,5,5,5,5,2,2,2,2) );
+	t->set_stylebox("grabber_hilite","HScrollBar", make_stylebox( scroll_grabber_hl_png,5,5,5,5,2,2,2,2) );
 
 	t->set_icon("increment","HScrollBar",empty_icon);
 	t->set_icon("increment_hilite","HScrollBar",empty_icon);
@@ -474,10 +474,10 @@ void make_default_theme() {
 
 	// VScrollBar
 
-	t->set_stylebox("scroll","VScrollBar", make_stylebox( scroll_bg_png,3,3,3,3,0,0,0,0) );
-	t->set_stylebox("scroll_focus","VScrollBar", make_stylebox( scroll_bg_png,3,3,3,3,0,0,0,0) );
-	t->set_stylebox("grabber","VScrollBar", make_stylebox( scroll_grabber_png,3,3,3,3,2,2,2,2) );
-	t->set_stylebox("grabber_hilite","VScrollBar", make_stylebox( scroll_grabber_hl_png,3,3,3,3,2,2,2,2) );
+	t->set_stylebox("scroll","VScrollBar", make_stylebox( scroll_bg_png,5,5,5,5,0,0,0,0) );
+	t->set_stylebox("scroll_focus","VScrollBar", make_stylebox( scroll_bg_png,5,5,5,5,0,0,0,0) );
+	t->set_stylebox("grabber","VScrollBar", make_stylebox( scroll_grabber_png,5,5,5,5,2,2,2,2) );
+	t->set_stylebox("grabber_hilite","VScrollBar", make_stylebox( scroll_grabber_hl_png,5,5,5,5,2,2,2,2) );
 
 	t->set_icon("increment","VScrollBar",empty_icon);
 	t->set_icon("increment_hilite","VScrollBar",empty_icon);
diff --git a/scene/resources/default_theme/hslider_bg.png b/scene/resources/default_theme/hslider_bg.png
index 963e4c8456abf71b9af87dd6ab4548f26d03944d..701c1d43b56688d407978c1e9a225692126ed0e0 100644
GIT binary patch
delta 411
zcmaFLc%ONKmf?Sf{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&&?~Q
zBUbP6X7$8q^?F8kPZ!4!i_=FZ8TJJwinQ+kAE)$ZPo>q_%PdYwi4~$#PtVxFAe_dS
zcI#&6#%%@%StX`FWMbjwmE?*)qu^hmT=4%s(**}-rK5A6ggmd=zLWi3G~a`xM^FE6
zvahM>zkSG5fw^b_bA<!nFUA!Oh94v~8cK7y?X^$O55M0%`?PDlsXe#is^Z@zJqnN3
zyqp~0zxms4liDwAKNeMP|DF=&w|;+}^xmlT*W+AVLj^9{uI4(|sS|$s*xN71i{A^c
zye>VT<wSSVrSfwtS1sDr{N%uFpU}c{nSnmP9O9U*y0hlJTaYXynAD@Qs*<bZ$rW=h
zgS=l$coYSkEV$lO`OcqmAR@jYaoSckLpNjNGd%)t@;}ZupE*-7d5caqZ^Oc8cjH3W
zo4egp-xYPQbo%Q1{AZfF3;#DnG9+dEO1YM2Tl?F<ww|}gU+&V$;C=Of8Si;76j{%+
S$cll1fx*+&&t;ucLK6T12(|72

delta 159
zcmcc5{FHHmmf>B7y9{@~igL_lU|`@Z@Q5sCVBi)8VMc~ob0ioT7}!fZeO=k_af<Ns
zaLnKN)pcUDdNPBrr;B5VMQ?I~1gi+Mn}oBIQ<4-jv$NX7U(5Dad{pAT+wlL*n>j8o
z|NZ=IeYjg(UqVtsLSjZonKqxn2eu6g8<+q8^K<SChb31Y1vaoSXa@@P&X+g1&cMLH
N;OXk;vd$@?2>=6fI9dPz

diff --git a/scene/resources/default_theme/hslider_grabber.png b/scene/resources/default_theme/hslider_grabber.png
index b72ec4d8f482ae942ea999573cf2d8114f2bfcaa..343d247bc5167ca35901420257405bdb0c0b9f63 100644
GIT binary patch
delta 514
zcmaFNe2is+mf?Sf{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&&?|;
zrFQA`XYGm68ujZuT^vI!PA{Eo-!J4Sajf2Y_vu4Pn_7=v6zE<$IVSOB`G!RsH{Lzv
z|6utB1xu%7$7GLnAyV92+}+A7i+L@blvLX0-1}&M#%Oo)=JvGr2fS-mpENe!zvunu
zGY9IY751kw={;cl=@QLcoWSgIoI&k_1xJ(kzW3p_=dD?1oPQo)-*)(6<>HGK?0<eq
zCoN;>Z&Ij;)SDhJ-S)9$YgFp?+qq_wPuggTaGmcu`p9?t?Z0d-+r?eD9{k)FAL=zX
z$4q)kkj7GvYwG*nhfls}!E&N{Ub)s%m+ZabTd#R&db*vGXO<|Gk#3jiUv$Fb_cXSa
zpi|nHP2L|%mGID9&sfT{A+BCWEI#-4KIRR%(rdr=tDI_XNZo(`{{ss@l_T?Y6<K!1
z_?27D-G1Pagu}P0z1*5lk8E1AHzQJP_uY5ZyYK${vYzkJ#SD{qe#_-!ue)+I3NT$S
zmFz$Meriy-Lk-V@#>%x})xxe9mp-<z=yR4iez<CH-L$;_`=)aUv?uPEcQ$SMR5!1u
zm1eVhqt{+reK4VbF-M+>Az<>!C+RCgc17w<pFjKTGfRW&7x{Op*)2}a%(eP|`xmd~
Yl`Y<7cb-==FfcH9y85}Sb4q9e0M8KWH2?qr

delta 414
zcmX@c@|byomf<9ZNenYp4|WtXFfecyctjR6FmMZlFeAgPIT8#E4D2PIzOL-|IE5IP
z6m$1SxJ``KsQ31CaSXBOT{_t?`;ddk@&Dy}P1L4G={R!D&E{y+<NM1ZyXl9fmFS!H
zmC3(t=UA6rXySM%a;K@}M8J_du|_wZDlJTy`b%E^{rAUrAIlabop|pgz+%q8#*oAy
z8$6F$f>DA?@zUNV1r9mJJuQh(cIdUI&ShpewaH;#{sa|c&Ik3893R6B(@S?;-BtCr
z?7hzU>?T7tCk_t9gr0+iF<Wk5pBA*~yrutUo!M{H43hP$_EsO?CSAWTGQ0KT4`-$w
zqE1V$Twza?kZoZ+uuYod@Cn0eC)JMF>GCbBXWZMN_acPbT5Z|(VDUfJQxoE*9lbc=
z<=pG6i*4@9=o;)@yenabN|N!)tyUb_YgaW(F+H2GNhkXEzW+<7yfL3WJ)!4q>-5vC
zQzrR4b$p+Dz(Z}$=aQ{n@;2`eEt=94)b+Nkd(nl6_4^Iy)_F0%_xt(ed`VFq!_D@l
W*@{Ao@)#Hx7(8A5T-G@yGywpL`?040

diff --git a/scene/resources/default_theme/hslider_grabber_hl.png b/scene/resources/default_theme/hslider_grabber_hl.png
index 0dc5f2b61588eea16f9f0941721754498d27f3d3..f0ba7dd21258ff904225a29b4387eb2232428c0d 100644
GIT binary patch
delta 543
zcmX@X{Fr5emf?Sf{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&&?|;
zuKQto$h(Qr8uh0=T^vI!PA{E&)=N52=IHsk*2aET&g`?rCO3(62dqfc_{z9zE4Skb
zH<tSg`~wQ6PTf%+Ezpv;XtkHPQ&h>rLrp8TiU@IO-MVtb$H=(o`Rh3I$x&*CVm7A_
z@3lYopL@r05BYwk3WftL3)JVaFW`N^<zU0%z?ib!Yw69HgIZekZugiPF4*4xU%Mmz
z-<}O01RXxdbNDj$tPIMu`~T`}_4Zu98|nL=nJM=Qe~v86`BM7s>F2PmK|lEvUerwp
zVlWQh(B<bXTPV$=*e$q8BCq*i=1S$AO`$$shjSTX4L^y!W)X<_W6CO?Fqgs8^Opj{
zLqT<?FJ)l`4eo}X-*tI8>MNeao#?v4JRzmY;)5QeOEW{<gDd=@vF{jHNJ>s&dwx<Q
zpVeajwr%D{{8J+qnR}{wE#P1MC}Hm(Mu&8P1M6%5ZqgR~9da=*NMjby%(A}yYuDu5
zpW1M}ziv*&*IUazR&WTZPS9xl=+azU^hJ~JFgL@Wb)jJ<mun2S@7k94|71@xH=|9}
ztLtIu>1h$W{|Y<Ih`YO`;>quOS5x;!&8V}^O%dI<dC!-3Ir;hG46n;A{)(8c-g@lC
z6Bq3QDeI|6j~X%ju3x`VTk=4_r?#cf?_V{26}f5g{9W=T3=9kmp00i_>zopr0PKbE
A8vp<R

delta 387
zcmaFNa)Nn+mf<9ZNenYp4|WtXFfecyctjR6FmMZlFeAgPIT8#E4D2PIzOL-|IE5IP
zWSuUk9Gn=fQE%Ys;uvDlyL9r#tV01JZTpiSO}L<UaBcV6gn0+{IkFpDu*>c$(Ry+C
zMaDtT6K@3OFXVVvcs|Itptx&$vw4x=mWBTwKdrgHSLPpgxtkt;&HZ|&HV5&H*N=HO
zu&8-XS`yB>?|nVPV*?qBdDk75ur&m^f2wg8Im>@Q!*kO5NgI9YcigO*_wD!l((AQX
zHZU}K@LsQ7aJh1A{&suY+uJVboW90j`uOH!g%^rRg}O>&ju)6EvY)9iv?W>;<Q-h5
z!o%Ko?{egYuX~QoFOamoZOZz#C^2+V`t4;8?rXA2FYTMEXuI2x^|a0XP_Y*`muk*%
zx%g*6NZ`Y7i*&9$(Yf$d=IBTFrf8w1T#qUkmzyn1Ffly6X=`ru%dD?|uVwAMB75A?
v#iT;z{Pr_xmk-zN|8KIo=6m`s>;1kJr6%%<vC9}37#KWV{an^LB{Ts51q81P

diff --git a/scene/resources/default_theme/scroll_bg.png b/scene/resources/default_theme/scroll_bg.png
index 53797886cd2476af2146aec58df2e8260f2c444e..e1e419d6630bd1eb539258174b3715c949ca3a05 100644
GIT binary patch
delta 440
zcmcc4c!fE-Gr-TCmrII^fq{Y7)59f*fq{VsggMw47#PAzW1cfGFt8<gySp&_2f+n<
zmrrJ3VBjq9h%9Dc;1&j9Muu5)Bp4VN*h@TpUD@w*^NOl!<gWc9Ffm%ap3%nB#W6(V
z{M1Q?dBTYTZuif)-1x7@ZNfcC*<0j9^wLKX9n1=<><(LYdb;>Fitsg9u(2yFWQbgn
z(8>|HhkM(9$*!Zk8m{xch~8hW?rY5S;mgU*whP##68Kcy*b+Ev7;bHUe=q0h`adgP
z*X{XntIqOO`_<g<1`MGmUA5}(t*`$cAAa@j^aJkMV(k3ucAb9gKmYvv{Oz}wWMwUz
zp{ca$_1UUle?Q%RJjH9S&$9QT8MnSY3UE1d#=tn__?ulF5x3)Hn9j->yl)RR^*XhG
zg_fYB{Ti)=bq){Zv<_|UXsFf*&@gvtj0?4SRHexja<nn7F?Hgpb9W2B|9^5fZpkL*
zX(3#5u6})EqEvKl<{aa9$z`@mMX~4o8jZ8X*bk=|+4`^Ca`xBtq`g0DwbQ46jH;M;
qYW3fnhr`QPRjVHe%KIf%&%ktflH8@zntBEX1_n=8KbLh*2~7ZbHMpn%

delta 185
zcmcb@e4R16Gr-TCmrII^fq{Y7)59f*fq{VoggMw47#NQ5@9Sn@U|>t~c6VV=1HnlC
zdnF7E44efXk;M!Q+`=Ht$S`Y;1Oo#Ddx@v7EBif85pi>!UR$1&iP7qz4ECNbjv*3L
z*Y+85F(~jbufOH~<>|N0Ua>ME0pk2l(^Oo}^hjq`FeU{vPS_~0b=%UFvlvxAK8QaM
hYP^|YzQ5c{ep&8}soDOo85kHCJYD@<);T3K0RTNQGN}Ln

diff --git a/scene/resources/default_theme/scroll_grabber.png b/scene/resources/default_theme/scroll_grabber.png
index 16beda15145ff1d2c41b332172dbb91f2aa92da1..3a193e5448863bbf5c2c891b35246c8f8b98725b 100644
GIT binary patch
delta 334
zcmeBTdczdm8Q|y6%O%Cdz`(%k>ERN@z`(!*!W?W23=CnVG0zzo7}%1$-CY>|gW!U_
z%O^81FmM)lL>4nJa0`PlBg3pY5)2Fs>?NMQuI%@@dBxPkKP@oXJ~3LO{)(rIV~EE2
zz5Rw>%!vZ6_kX8voM_vSdrHCbU=?4a&Jk;loz5Tlk_4L;q;_3-#$u?F?y>jjeq;UK
z{p)hp^0TGQ_-^>QVZT`W;n?2=ybnBsm>*1f!gk<s(bqlljBnrm?Rm28{ckG~hK3_8
zt5#Wgo_+N-m7U?`Y!z|K=eO=I6cEX3+O7ONW^#;3e5h1^h7Hq%y1#D(H+0MvRN$QC
z=5SMVspAY?_Joz|C&()+C_PKNHu29+w?k)kb<7Z-KlNF`9~<B0o43yN4e|<4D@#n1
jW_)}5cTs!&WyzJYnG1r-78EfsFfe$!`njxgN@xNAq-uof

delta 236
zcmaFE)WsCt8Q|y6%O%Cdz`(%k>ERN@z`(!(!W?W23=Bv3_jNNcFt8<gySp%`fnX&6
zy%Gin2F?PH$YKTtZeb8+WSBKaf`Ng7y~NYkmHi&4h`6d|>*5ZJiP0MMMV>B>Arez-
z&u-*AY{1}hQCxANlfWGolZNsWEO|y7r1>AI`DU3Pigj?6lJ-&f_jJGYyCAPZw;n^O
zw)A$%>S{-O-^WsBhKsFv@+%y3)>`V6uiLTxTFaD6_y13sG@-cdyZ^U?lZwT%)_%D0
g<Xl(X>2p7sX5N&HTa&7%!~pV!r>mdKI;Vst0QSjFJ^%m!

diff --git a/scene/resources/default_theme/scroll_grabber_hl.png b/scene/resources/default_theme/scroll_grabber_hl.png
index acfb7c835bd9a9e70c0b0391fc2fd33aceda024a..82c94c03c86ac7b97d2e4aa55328b73bfd4cc292 100644
GIT binary patch
delta 383
zcmbQoG@CiPGr-TCmrII^fq{Y7)59f*fq{VsggMw47#PAzW1cfGFt8<gySp&_2f+n<
zmrrJ3VBjq9h%9Dc;1&j9Muu5)Bp4VN*h@TpUD@w*^NR7wFH{rKpBSxP&&cfQ;uxZF
ze(wZ(@52EiNBuv2I%O>MS-{1rL}22&QsL*X#9u5INOycA$CCar`U`W%<{dY;cI?n#
z-D>*f=!9qc?EN%(ORqAszuWoYv7FwA>z}3_KKmiH|3u8WON+8)&6bET-%EI|K6mbN
z(FavO?#!!u!vA>VB-e!xA8b&wm~~d8{_Y(ven0Eo$_yM@3i_v>y#4B3xBBO!MOt1F
zi<fpZu{f+}^HGm954JS98TH&p(#P&<;Z$)4PboLyHD;y<DtNYR`MlcEqwx5Q=7p7K
zdn`FL^THWU|E;^z6}<1<L(8V;9F7tSc}G`1t^0p{`@FmM+ccM}RL_?^cvIt6AG_m?
j9Xq70?#Ms9|ApCfbKx466uaFF3=9mOu6{1-oD!M<i3*)T

delta 257
zcmbQuJdY{5Gr-TCmrII^fq{Y7)59f*fq{VoggMw47#NQ5@9Sn@U|>t~c6VV=1HnlC
zdnF7E44efXk;M!Q+`=Ht$S`Y;1Oo#Ddx@v7EBif85ph+~RcF5JpBSxP&(P-S;us<^
zwYF~~SF?dc%YL)Qyr=wY^Y{d(>-}1nSF5@3+|qTd?9IX4KNosW;d|6ue!s9h<F<A6
zCWgZwcC{IlI!yc%cqH`R^v$dsiLYMm+9{FD7|{ECU%gG^on>wtTNsYr5T3v&Q_lZ~
zadFlky=7T{7~X$f(y{td+O!!8kMd--AJkeh|GajDzaUTbYs{YOml+rs7(8A5T-G@y
GGywp01YPL>

diff --git a/scene/resources/default_theme/theme_data.h b/scene/resources/default_theme/theme_data.h
index dcfaa6e3c0..c338126d3a 100644
--- a/scene/resources/default_theme/theme_data.h
+++ b/scene/resources/default_theme/theme_data.h
@@ -50,7 +50,7 @@ static const unsigned char button_pressed_png[]={
 
 
 static const unsigned char checked_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0xf9,0x43,0xbb,0x7f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x12,0x0,0x36,0x36,0x55,0x46,0x2e,0x76,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0xbd,0x49,0x44,0x41,0x54,0x38,0x8d,0x8d,0x93,0x4f,0x6b,0x13,0x51,0x14,0xc5,0x7f,0x93,0x99,0x84,0xa1,0xd2,0x8c,0x90,0x49,0xba,0xea,0xb6,0x1f,0xa0,0x8,0x76,0xa3,0xad,0x6d,0x53,0x4a,0x96,0x22,0x4a,0xb,0x2e,0x55,0xfc,0x6,0x36,0x74,0x2b,0x45,0xba,0xaf,0x71,0x61,0x71,0x95,0x42,0x37,0x52,0xdc,0x34,0x85,0x92,0xa2,0xb8,0xb7,0x4,0x4d,0xd5,0xb8,0xd2,0x85,0x98,0xcc,0x22,0x23,0x99,0xc9,0xcc,0xa4,0x6f,0xba,0xc8,0x4c,0x9b,0x92,0x97,0xd2,0xb,0x8f,0xb,0xef,0xbd,0x73,0xce,0xfd,0xab,0xd0,0x37,0x5,0x48,0x0,0x5a,0xe4,0xaf,0x32,0x1,0xf4,0x22,0x1f,0x2a,0x11,0x38,0x9,0x64,0x80,0x49,0x20,0x7d,0x5,0x89,0x0,0x6c,0xe0,0x37,0x60,0x1,0x41,0xac,0x98,0xd1,0x54,0x6d,0x6e,0x61,0x3e,0x5f,0x4e,0x26,0x93,0x52,0x64,0x36,0x97,0x65,0xad,0xf8,0x2,0xd7,0x75,0x99,0x99,0xb9,0xfd,0xd8,0x75,0xdd,0x43,0xe0,0x9f,0xa,0xa4,0x80,0xa9,0xa5,0xfc,0xf2,0xbe,0xe7,0x79,0xd8,0xb6,0x8d,0xe3,0x38,0x43,0xe7,0xd9,0xd3,0x27,0x8c,0xa7,0xc7,0x29,0x6d,0xbd,0x21,0x97,0x9d,0xb8,0xff,0xfd,0xc7,0xc9,0x2e,0xd0,0x4c,0x44,0x11,0x18,0x9a,0xa6,0xd1,0xed,0x76,0xa5,0xea,0x85,0x42,0x81,0xe9,0x5b,0xd3,0xec,0xbd,0xdf,0xa3,0x56,0xab,0x11,0x86,0x21,0x80,0x1,0x24,0xe2,0x5c,0x95,0x41,0x80,0xaa,0xaa,0x97,0x8,0x1e,0x3e,0x7a,0x40,0xe3,0xe7,0x2f,0xaa,0xd5,0x23,0x82,0x20,0x40,0x8,0x41,0x24,0xac,0x48,0x8b,0xb5,0xb2,0xba,0x42,0xa9,0xf4,0x1a,0xc3,0x30,0xb8,0x3b,0x77,0x87,0xb1,0x1b,0x63,0x54,0x2a,0x7,0x74,0x3a,0x9d,0xa1,0xbf,0x9a,0x8c,0x60,0xa7,0xbc,0xc3,0xe2,0xe2,0x3c,0x1b,0x1b,0x2f,0xe9,0x7a,0x1e,0xdf,0xbe,0xd6,0x39,0xfe,0x72,0x2c,0x4d,0x4f,0x1a,0x81,0x10,0x82,0x62,0x71,0x9d,0xf4,0x4d,0x3,0xd3,0xcc,0x50,0xd9,0x3f,0xc0,0xb2,0xac,0xeb,0x13,0x84,0x61,0x88,0xd5,0x6a,0xb1,0xf9,0x6a,0x13,0xdb,0xfe,0x4f,0xbd,0x5e,0x97,0x82,0x47,0x12,0x0,0x78,0x9e,0x8f,0xe3,0xb8,0x6c,0xbf,0xdd,0xa6,0xdd,0x6e,0x8f,0x24,0x88,0x6b,0x10,0xca,0x1e,0x1b,0x8d,0x6,0xa6,0x99,0x89,0xdb,0x76,0xa1,0xda,0x6f,0xde,0x79,0x2b,0x4,0xd0,0xee,0xf5,0x7a,0xe8,0xba,0x3e,0x94,0x4a,0xb3,0xd9,0xba,0x74,0xa7,0xeb,0x3a,0xbe,0xef,0x43,0x7f,0xa4,0x4f,0x15,0x40,0x5,0x26,0x52,0xa9,0x54,0xfe,0xde,0xec,0xc2,0xbb,0x51,0xa3,0x1c,0x5b,0x10,0x4,0x7c,0xfa,0xfc,0xf1,0xb9,0xe3,0x74,0x3e,0x0,0x7f,0x7,0x97,0xc9,0xe4,0xfa,0xcb,0xf4,0x7,0x68,0x1,0x7e,0x3c,0x81,0x83,0xeb,0xac,0xca,0xb1,0xe7,0x76,0xca,0xc0,0x3a,0x9f,0x1,0x62,0x9,0xad,0x4a,0x1e,0xbc,0xe7,0x4d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x30,0x0,0x6d,0xeb,0x4,0xa7,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0xc1,0x49,0x44,0x41,0x54,0x38,0xcb,0xad,0x93,0x41,0x6b,0x13,0x51,0x14,0x85,0xbf,0x77,0x33,0xe3,0x80,0x5d,0x58,0x82,0x13,0x5b,0x28,0xa6,0xdb,0xda,0x3f,0xd0,0x76,0x67,0x17,0x5d,0xa4,0x2d,0x23,0xa,0x62,0xc0,0x5f,0xa0,0x69,0x37,0x82,0xd0,0x5d,0xb0,0x8b,0x52,0xa1,0x20,0x14,0x9,0x48,0x5,0x3,0x52,0x29,0x36,0x48,0x28,0x2e,0x14,0x8a,0xab,0x26,0xf5,0x7,0x84,0xb1,0xbb,0x11,0xa,0xb6,0x49,0x9,0xd9,0xa6,0x49,0xdf,0x73,0xe1,0x4c,0x48,0x71,0xd2,0x8d,0x5e,0x78,0xf0,0xe0,0x9e,0x7b,0xee,0xb9,0xf7,0x9d,0x7,0xff,0x18,0xa,0x60,0x71,0x3e,0xeb,0x0,0xe3,0xc0,0x4,0x90,0x2,0x24,0xe,0x3c,0x34,0x74,0x5d,0x1e,0x65,0xef,0xdf,0x7a,0xbb,0xf5,0x7e,0x1b,0x8,0xf6,0x3e,0x7f,0x68,0x5b,0x61,0x6e,0xbc,0x71,0xf6,0x6b,0xe3,0xe4,0xf4,0x78,0x4e,0x6b,0x6d,0x2b,0xa5,0x62,0xbb,0xe5,0x72,0x4f,0xf0,0xee,0x65,0xb8,0xe6,0x58,0x8f,0xb,0xaf,0xdf,0x65,0x80,0xa3,0x88,0x60,0xe2,0xe4,0xf4,0x78,0xe,0xb0,0x2d,0xcb,0x26,0x8e,0x20,0x9d,0x4e,0xb3,0xb4,0xf4,0x14,0x63,0xc,0xc5,0x62,0xf1,0x76,0xa8,0xf6,0x28,0x92,0x9a,0xd2,0x5a,0xdb,0x22,0x9,0x12,0x89,0x4,0x22,0xc2,0xe4,0xe4,0x9d,0xde,0x5d,0x44,0x58,0x5d,0xcd,0xe3,0x38,0xe,0xbb,0xbb,0x25,0xaa,0xd5,0x43,0x2b,0x1c,0xb5,0x37,0xab,0x28,0xa5,0x7a,0x9d,0x37,0x37,0x5f,0x51,0x2e,0x97,0x98,0x9e,0x9e,0x2,0xc0,0xf3,0x16,0x99,0x99,0x99,0xa2,0xd9,0x6c,0xb2,0xbe,0xbe,0x11,0xe1,0x84,0x41,0xcb,0xaa,0xd5,0x6a,0x0,0x64,0xb3,0xf,0x19,0x1e,0xbe,0xc1,0xca,0xca,0x73,0x0,0xd6,0xd6,0x5e,0xd2,0x6a,0xb5,0x2e,0x61,0xad,0x38,0x82,0x52,0xe9,0x13,0xcb,0xcb,0x39,0x66,0x67,0xef,0x72,0x7e,0xde,0x21,0x99,0x4c,0x52,0xa9,0x1c,0x52,0x2e,0xef,0xfd,0x85,0x8d,0x55,0xd0,0x68,0x9c,0xb1,0xbf,0xff,0xd,0xdb,0xb6,0x59,0x58,0xc8,0xd0,0x6e,0xb7,0xc9,0xe7,0x5f,0xc4,0xbe,0x8c,0xc,0x32,0xc8,0xce,0xce,0xc7,0x3f,0x46,0x51,0x8a,0x42,0xe1,0xd,0x41,0xf0,0x33,0x16,0x67,0xd,0x22,0x38,0x38,0xa8,0xe0,0x79,0xf,0x70,0xdd,0x9b,0x54,0xab,0xdf,0x7,0x3a,0x31,0x22,0xd0,0xc6,0x18,0x8c,0x31,0xbd,0x84,0x31,0x6,0xdf,0xff,0x81,0xef,0x5f,0x2e,0xe8,0xc3,0xe9,0x7e,0x82,0xba,0x88,0x74,0xb4,0xbe,0xb0,0x23,0xd9,0x71,0x61,0x8c,0x41,0xeb,0xb,0x44,0xa4,0xb,0xd4,0xfb,0x77,0xe0,0x8f,0xa4,0xc6,0xbe,0x2,0xdd,0x6e,0xb7,0xc3,0x55,0x7,0x54,0x67,0x24,0x35,0xf6,0x5,0xf0,0xfb,0x15,0x4,0xae,0x3b,0xfa,0xcc,0x75,0x47,0xb7,0xae,0xfa,0x4c,0xa1,0xec,0x7a,0x58,0x1c,0xf0,0x3f,0xe2,0x37,0x4f,0x82,0xa8,0x62,0xbb,0xcc,0x8d,0x11,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
@@ -150,17 +150,17 @@ static const unsigned char hseparator_png[]={
 
 
 static const unsigned char hslider_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xdd,0x0,0xdd,0x0,0xdd,0xf5,0x15,0x8,0x9d,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0xf,0xc,0x8,0x9f,0xb9,0xf5,0x45,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x4d,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0x18,0x5,0x14,0x3,0x46,0x18,0x43,0x42,0x42,0x62,0x1a,0x3,0x3,0x43,0x26,0x91,0xfa,0xa6,0xbf,0x78,0xf1,0x22,0xb,0xdd,0x80,0xff,0xec,0xec,0x9c,0x44,0xe9,0xfe,0xf9,0xf3,0x3b,0xc3,0x8b,0x17,0x2f,0x18,0x19,0x18,0x18,0x18,0x98,0x88,0x76,0x2b,0xe,0x30,0xf0,0x6,0xb0,0x20,0xb1,0xa7,0xff,0xfc,0xf9,0x9d,0xe8,0x40,0xa4,0xd4,0xe2,0x51,0x80,0x4,0x0,0x2b,0x51,0x10,0x8d,0x9f,0x1f,0x30,0xd7,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x2c,0x16,0x7f,0x48,0xec,0xab,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x47,0x49,0x44,0x41,0x54,0x38,0xcb,0xc5,0x92,0x31,0x8e,0x52,0x61,0x14,0x85,0xbf,0xff,0x5e,0x22,0xfc,0xbc,0x79,0x3a,0xcd,0xd3,0x4,0x42,0x62,0x61,0x78,0x15,0x95,0xcb,0x98,0xb8,0x0,0x13,0x66,0x1,0x66,0xda,0xd9,0x89,0xb1,0xb6,0x30,0xc1,0x5,0x18,0x97,0xe1,0x2,0x4,0xb,0xd,0x19,0xa,0x5f,0xcc,0x20,0x4f,0x78,0x23,0x70,0xff,0xdf,0x2,0xd0,0x40,0x43,0x22,0xc5,0x9c,0xe4,0x54,0xe7,0x7c,0xb7,0xb9,0x7,0xee,0x5b,0xe,0xe0,0xc5,0xc5,0xcb,0xff,0x82,0x3f,0x7c,0x7c,0x8f,0xdb,0xc2,0x35,0x20,0x3,0x72,0xa0,0x3,0x78,0x40,0xe,0xfa,0x1,0xa8,0x80,0x31,0xf0,0x19,0x28,0x80,0x75,0x6d,0xb,0x3f,0x2b,0xcb,0x9f,0x57,0xdf,0x8b,0x9b,0xcb,0x45,0x35,0x3f,0xb,0x21,0xaa,0x73,0xfb,0x74,0x8c,0x20,0xe2,0xac,0xe9,0x93,0x5f,0x8f,0xb3,0xf6,0xbb,0x34,0x7d,0xf4,0x6,0xf8,0xa2,0x79,0xb7,0xf7,0x64,0x56,0x4e,0xaf,0xbf,0x7e,0x1b,0xbd,0x5a,0xaf,0xd7,0x5e,0x44,0x45,0x55,0x10,0xd1,0x3d,0xab,0xa,0xce,0x89,0x2c,0x57,0xcb,0xc6,0xed,0xf4,0xc7,0x73,0xef,0x13,0xa9,0xd7,0x1b,0x9f,0x4,0xc8,0x8b,0x62,0xd2,0x77,0xce,0xa9,0xaa,0xa2,0xba,0x83,0xe4,0xc0,0x9b,0x4c,0x55,0x71,0xce,0x69,0x51,0x4c,0xfa,0x40,0x5e,0x3,0x3a,0x8b,0x6a,0x9e,0xee,0xa0,0x63,0x12,0x11,0x62,0x8c,0x2c,0xaa,0x79,0xa,0x74,0xe4,0xd4,0x37,0xa,0x30,0x6e,0xfa,0xa4,0xc,0x21,0x10,0x42,0x38,0xa,0xec,0x7a,0x4d,0x9f,0x94,0xc0,0x58,0x80,0x61,0x96,0xb5,0x6,0x31,0x46,0x33,0x33,0xcc,0x8c,0x10,0xec,0x6f,0xf1,0x9f,0x37,0x99,0x99,0x11,0x63,0xb4,0x2c,0x6b,0xd,0x80,0xa1,0xe6,0xdd,0x5e,0x55,0xaf,0x37,0x46,0xde,0x27,0xba,0x5a,0xde,0x75,0x97,0xab,0xdf,0xf,0xcc,0x82,0x8b,0x71,0xff,0x80,0x59,0x0,0x62,0x68,0xfa,0x64,0xd6,0x6e,0x3d,0x7d,0xfb,0x30,0x3d,0x7f,0xd,0x8c,0x4f,0x1e,0xd2,0xc9,0x53,0xbe,0x7f,0xfd,0x1,0xde,0x4b,0xa1,0x14,0xaf,0xc,0xa2,0x3a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hslider_grabber_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x92,0x0,0x92,0x0,0x99,0x25,0xc1,0x88,0x71,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x12,0x0,0x2,0x21,0x6d,0xbf,0x58,0x46,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x4b,0x49,0x44,0x41,0x54,0x38,0x8d,0xa5,0x93,0x31,0x6b,0xc2,0x40,0x14,0xc7,0xff,0x77,0xbd,0x34,0x26,0x97,0x5a,0x2c,0x41,0xa,0x9d,0x6b,0x8,0x86,0x2e,0xe,0xfd,0x4,0x1d,0xb2,0xf8,0x29,0x3a,0x15,0xec,0x87,0xa9,0x63,0xfb,0x3d,0x9c,0x3b,0x76,0xd0,0x82,0x8,0xe1,0x14,0xdc,0x82,0x74,0xc8,0x50,0xc4,0xdc,0x5d,0x32,0xd8,0xe5,0x22,0xa1,0x60,0x95,0xfa,0x1f,0x1f,0xef,0xf7,0xe3,0xdd,0xe3,0x1d,0x70,0x62,0xc8,0xef,0x42,0x10,0x4,0x37,0x0,0x6,0x0,0x62,0x0,0x1d,0x53,0x9e,0x3,0x18,0x1,0x18,0xa,0x21,0xd2,0xbd,0x82,0x20,0x8,0x1e,0x1,0xbc,0x84,0x61,0xe4,0xb8,0x2e,0x87,0x65,0x9d,0x3,0x0,0xca,0xb2,0x40,0x9e,0x6f,0x90,0x24,0x33,0x9,0xe0,0x59,0x8,0xf1,0x56,0x31,0x67,0x75,0xb8,0xd5,0xba,0x7a,0xed,0x76,0xef,0x2c,0xcf,0x6b,0x82,0x31,0x6,0x42,0x8,0x8,0x21,0x60,0x8c,0xc1,0x71,0x5c,0xb4,0xdb,0xd7,0x96,0x52,0xb2,0xcf,0x39,0x4f,0xb3,0x2c,0x9b,0xec,0x26,0x30,0x63,0x2f,0x7a,0xbd,0x7b,0xc7,0xb6,0x1b,0x7f,0xbe,0x59,0x6b,0x85,0xf1,0xf8,0x43,0x2,0xb8,0x15,0x42,0xa4,0xd4,0xd4,0x7,0x61,0x18,0x1d,0x84,0x1,0xc0,0xb6,0x1b,0x8,0xc3,0xc8,0x31,0x7b,0x42,0x25,0x88,0x5d,0x97,0x1f,0x84,0xab,0x98,0xde,0xb8,0x2e,0xe8,0x54,0xb,0x3b,0x26,0xa6,0xb7,0x53,0x17,0xfc,0x3b,0x95,0x60,0x5e,0x96,0xc5,0xd1,0x90,0xe9,0x9d,0xd7,0x5,0xa3,0x3c,0xdf,0x1c,0x2d,0x30,0xbd,0xa3,0xba,0x60,0x98,0x24,0x33,0xa9,0xb5,0x3a,0x8,0x6b,0xad,0xaa,0x83,0x1a,0x2,0xe6,0x90,0xb2,0x2c,0x5b,0xfb,0xbe,0xff,0xa5,0x94,0xec,0x37,0x9b,0x97,0x60,0x8c,0xed,0x85,0x97,0xcb,0x5,0x94,0x92,0x4f,0x42,0x88,0xf7,0x9d,0xc0,0x48,0x26,0x9c,0xf3,0x74,0xb5,0x4a,0x1f,0x3c,0xef,0xc2,0xa2,0x94,0x82,0x52,0x8a,0xed,0x76,0x8b,0xa2,0xd0,0x58,0xaf,0xbf,0x31,0x9d,0x7e,0x4a,0x3,0xef,0x4e,0xf9,0xe4,0xcf,0x74,0x72,0x7e,0x0,0xd9,0x87,0x82,0x9b,0x21,0x12,0xa2,0x6e,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x1a,0x26,0xd2,0xcb,0xf3,0x2b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0xae,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x3f,0x8f,0x12,0x41,0x18,0xc6,0x7f,0x3b,0xbb,0xcb,0xc2,0x62,0xb2,0x85,0xc5,0xd1,0x10,0x8b,0xa5,0x93,0x5c,0x61,0xc9,0x77,0xb0,0xa2,0xb1,0xb1,0xdd,0xca,0x4f,0xe0,0xa7,0xb0,0x20,0x39,0x42,0x63,0x41,0x63,0x48,0xae,0x54,0x1a,0xb,0xa,0xb,0x8b,0x23,0x4,0xa3,0xd,0x39,0x42,0x22,0x24,0x86,0x9c,0xde,0xf1,0x3f,0xcc,0x32,0xbb,0x63,0xb3,0x87,0x66,0xef,0xc0,0x4b,0x7c,0xab,0xc9,0x33,0x33,0xbf,0xbc,0xef,0xf3,0xcc,0xc0,0x7f,0x96,0x71,0x8f,0x66,0x2,0x2e,0xe0,0x1,0xf9,0x44,0x5b,0x3,0x73,0x60,0x3,0x44,0xc7,0x0,0x26,0xf0,0x38,0x8,0x82,0x17,0xbe,0xef,0x57,0x3d,0xcf,0x3b,0x5,0x98,0xcf,0xe7,0x5f,0x86,0xc3,0xe1,0x79,0xa3,0xd1,0x78,0x7,0xfc,0xfa,0x1b,0x62,0xa6,0x0,0x8f,0x82,0x20,0x78,0x59,0x2e,0x97,0x5f,0x1b,0x86,0xf1,0x74,0xb5,0x5a,0x65,0xb7,0xdb,0x6d,0x36,0x93,0xc9,0x3c,0x29,0x14,0xa,0xcf,0x8a,0xc5,0xe2,0x4d,0xb7,0xdb,0xfd,0x6,0x84,0xb7,0x17,0x44,0xa,0xe0,0xf9,0xbe,0x5f,0x55,0x4a,0x9d,0x6c,0x36,0x1b,0x94,0x52,0x28,0xa5,0x48,0xd6,0x27,0xbe,0xef,0x57,0x93,0xd1,0x38,0x4,0xc8,0x7b,0x9e,0x77,0x2a,0xa5,0x44,0x6b,0xbd,0x17,0xb5,0xd6,0x48,0x29,0x49,0x46,0xca,0x1f,0x3,0x18,0x71,0x1c,0x1b,0x87,0x1c,0x8f,0xa2,0xc8,0x48,0xfb,0x96,0x6,0x84,0x52,0xca,0x2b,0xd3,0x34,0xef,0xc6,0x65,0x18,0x48,0x29,0xaf,0x1,0x75,0xc,0xb0,0x5e,0x2c,0x16,0x5f,0x6d,0xdb,0xbe,0x3,0xb0,0x6d,0x1b,0xad,0xf5,0x8f,0x24,0xca,0x83,0x80,0x65,0xbf,0xdf,0xff,0xe0,0x38,0x4e,0x24,0xc4,0x9f,0x2d,0x21,0x4,0xb9,0x5c,0x4e,0x77,0x3a,0x9d,0xb7,0xc0,0xe2,0x18,0x40,0xf6,0x7a,0xbd,0xb,0x29,0xe5,0xc4,0xb2,0xac,0xbd,0x68,0x59,0x16,0xbb,0xdd,0xee,0x7b,0xbb,0xdd,0xfe,0xf4,0xaf,0xe,0xe2,0xd1,0x68,0x34,0x9e,0x4e,0xa7,0x1f,0x5d,0xd7,0x45,0x8,0x81,0x10,0x2,0xd7,0x75,0x19,0x8f,0xc7,0xef,0x95,0x52,0x57,0x40,0x7c,0xc,0xa0,0x81,0x79,0xad,0x56,0x7b,0x13,0x45,0xd1,0xa5,0xe3,0x38,0x38,0x8e,0x43,0x1c,0xc7,0xc3,0x7a,0xbd,0x7e,0x96,0x6e,0xff,0xbe,0x97,0x8,0x10,0x87,0x61,0xb8,0x9e,0xcd,0x66,0x97,0x95,0x4a,0xe5,0x79,0x36,0x9b,0x8d,0x5b,0xad,0xd6,0xab,0xc1,0x60,0x70,0x1,0x6c,0x1f,0x2,0x0,0x50,0x93,0xc9,0xe4,0x67,0xa9,0x54,0xba,0x59,0x2e,0x97,0x9f,0x9b,0xcd,0xe6,0x39,0x30,0x7b,0xe8,0x6f,0xdc,0x7b,0x7,0x38,0xc9,0x99,0x6d,0x3a,0xff,0xdb,0xfa,0xd,0x29,0xd4,0xb4,0x4b,0x76,0xdc,0xe7,0x79,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hslider_grabber_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x92,0x0,0x92,0x0,0x99,0x25,0xc1,0x88,0x71,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x12,0x0,0x2,0x1d,0x42,0xd0,0x24,0xc1,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x30,0x49,0x44,0x41,0x54,0x38,0x8d,0xa5,0x93,0xb1,0x6a,0xc2,0x50,0x14,0x86,0xbf,0x63,0xe2,0x90,0xd0,0x2e,0xc1,0xad,0x8b,0xad,0x60,0x9e,0xc0,0xbe,0x41,0x7,0x33,0x38,0x7,0x1d,0xba,0x74,0x2a,0xe8,0xc3,0xe8,0x68,0xc1,0x49,0xc8,0xec,0x10,0x9f,0xa1,0x8,0xee,0x71,0xcf,0x52,0x4d,0x70,0x73,0x8a,0xb7,0x83,0x37,0x72,0x11,0xb4,0xa1,0xfe,0xe3,0xe5,0x7c,0xdf,0xbd,0x1c,0xfe,0xb,0x77,0x46,0x2e,0xf,0x7c,0xdf,0x7f,0x2,0x86,0x40,0x17,0x68,0xeb,0xe3,0xd,0xb0,0x4,0x26,0x49,0x92,0xa4,0x57,0x5,0xbe,0xef,0x7f,0x0,0xe3,0x30,0x1c,0x38,0x9e,0xd7,0x40,0xa4,0x6,0x80,0x52,0x47,0xf2,0x7c,0x47,0x14,0xcd,0xf,0xc0,0x28,0x49,0x92,0xaf,0x92,0xb1,0x4c,0xb8,0xd9,0x7c,0x9e,0xf6,0xfb,0xef,0x75,0xd7,0x7d,0xd4,0xb0,0x0,0x82,0x48,0xd,0xd7,0x7d,0xa0,0xd3,0x79,0xad,0x6f,0xb7,0x3f,0x3d,0xdb,0xb6,0xd2,0x2c,0xcb,0xd6,0x0,0x35,0xe3,0xd9,0xe3,0x20,0xe8,0x21,0x62,0x71,0x2d,0x22,0x16,0x41,0xd0,0x3,0x18,0x6b,0xe6,0x24,0x0,0x86,0x61,0x38,0x70,0x6e,0xc1,0xa6,0x24,0xc,0x7,0x8e,0xde,0xd3,0x59,0xd0,0xf5,0xbc,0xc6,0x9f,0x70,0x19,0x3d,0xdb,0x35,0x5,0xed,0x72,0x61,0x55,0xa2,0x67,0xdb,0xa6,0xe0,0xdf,0x29,0x5,0x1b,0xa5,0x8e,0x95,0x21,0x3d,0xbb,0x31,0x5,0xcb,0x3c,0xdf,0x55,0x16,0xe8,0xd9,0xa5,0x29,0x98,0x44,0xd1,0xfc,0xa0,0x54,0x51,0xe1,0xf6,0xa2,0x2c,0xd4,0xe4,0x2c,0xd0,0xf5,0x1c,0xc5,0xf1,0x82,0x5b,0x12,0xa5,0xa,0xe2,0x78,0x1,0xa7,0x36,0xa6,0x60,0x34,0x31,0xcb,0xb2,0xb5,0x6d,0x5b,0xe9,0x6a,0xf5,0xfd,0xd6,0x6a,0xbd,0xd4,0x1d,0xc7,0x41,0x44,0x34,0x78,0x24,0xcf,0xb7,0xcc,0x66,0xd3,0xc3,0x7e,0xbf,0xff,0x34,0xab,0x7c,0xf7,0x67,0xba,0x3b,0xbf,0x4d,0x78,0x75,0x34,0x1f,0x21,0x5d,0xa6,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x17,0x2d,0xf0,0xb7,0x54,0xee,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0xcb,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0xcd,0x4a,0x1b,0x51,0x1c,0xc5,0xcf,0x9d,0x3b,0x33,0x4e,0x3a,0x43,0x7,0x9b,0x16,0x93,0x82,0x14,0x8b,0x50,0xa8,0x61,0x28,0xf5,0x1,0xba,0xb5,0xb,0x41,0xc8,0x46,0x4,0xdf,0xa0,0x4f,0x50,0x70,0x95,0x95,0xb8,0x77,0x5b,0x10,0x84,0x6e,0xa2,0xab,0x4a,0x17,0x42,0x5a,0x74,0xe1,0xc2,0x82,0xa8,0xb5,0x14,0x12,0xa,0x2a,0xda,0xd4,0xc4,0x4c,0x32,0x33,0x72,0xe7,0xeb,0x5e,0x37,0x93,0x5a,0x26,0x31,0x16,0x3c,0xcb,0xc3,0xbd,0x3f,0xce,0xff,0xb,0xb8,0xa7,0x48,0x1f,0x8f,0x2,0x78,0x0,0xc0,0x4,0xa0,0x27,0x9e,0x7,0xa0,0xd,0xe0,0xa,0x40,0x3c,0x8,0x40,0x1,0x64,0xa7,0x4a,0xa5,0xd9,0x5c,0xc1,0x2a,0x2a,0x46,0xde,0x2,0x80,0xd0,0x3d,0xdf,0xff,0x7d,0xb8,0x5f,0xfe,0xbc,0xb0,0xf0,0x11,0x40,0xf3,0x5f,0x8,0x4d,0x1,0x8c,0xa9,0x52,0x69,0x3e,0xff,0xea,0xcd,0x7b,0xb7,0x6d,0x4e,0xd8,0x67,0xbe,0xe6,0x36,0x23,0x8d,0x13,0xf3,0x59,0x76,0x6c,0xf4,0x75,0xee,0xe5,0xf3,0x56,0xb5,0x52,0xf9,0xe,0x20,0xe8,0x7e,0x90,0x52,0x0,0x33,0x57,0xb0,0x8a,0x4e,0x4b,0x1d,0x71,0x1b,0xc,0x21,0x8b,0x11,0xb2,0x18,0x6e,0x83,0xc1,0x69,0xa9,0x23,0xb9,0x82,0x55,0x4c,0x4a,0xc3,0x6d,0x0,0x5d,0x31,0xf2,0x16,0xeb,0x4,0x10,0x5c,0xfc,0x35,0x5,0x17,0x60,0x9d,0x0,0x49,0x49,0xfa,0x20,0x0,0xe1,0x11,0x27,0x42,0xf4,0x76,0x56,0x70,0x80,0x47,0x31,0x49,0xf7,0x2d,0xd,0x8,0x78,0xe4,0x5e,0xc8,0x8a,0xd4,0x3,0x90,0x64,0x82,0x38,0xf0,0x2e,0x1,0x44,0x83,0x0,0x5e,0xe0,0xd4,0xf,0x55,0x5d,0xee,0x1,0xa8,0x19,0x19,0x94,0x6,0xe7,0xc9,0x28,0x6f,0x5,0x38,0xbf,0xb6,0xb6,0x37,0x32,0xf,0x95,0x58,0xa2,0x37,0x49,0x25,0x4a,0xa0,0xf,0xab,0xe2,0x60,0xbd,0xfc,0x1,0x40,0x67,0x10,0xc0,0xaf,0x7d,0xfd,0xb2,0x2b,0x11,0xfb,0x54,0xd1,0x6e,0x52,0x28,0x9a,0xc,0x99,0x76,0x8e,0xbf,0xad,0xac,0x6c,0xdf,0x95,0x80,0xd7,0x8f,0x7e,0x9c,0x78,0xf5,0xda,0xa6,0xf1,0x78,0x8,0x12,0x25,0x90,0x28,0x81,0xf1,0x44,0x83,0x7d,0x72,0xf4,0x29,0xe,0xc3,0xb,0x0,0xfc,0xae,0x55,0x56,0x34,0xd3,0x7c,0x31,0xb7,0xba,0xb6,0x6e,0xff,0xc9,0x8c,0xb,0x1,0x3c,0x7a,0xea,0xd7,0x56,0x67,0x67,0x66,0x58,0xbb,0xfd,0x13,0x40,0x98,0x5e,0xdd,0xb4,0x78,0xe4,0xfb,0xde,0xd5,0x65,0xbd,0x5a,0x98,0x7e,0x3b,0x6d,0x64,0x15,0xbe,0xb3,0xbc,0xf4,0xee,0x6c,0x6f,0x6f,0x17,0x0,0xeb,0x77,0x38,0xfd,0x14,0x35,0xab,0xb5,0xc6,0xe8,0xe4,0x44,0x2b,0x70,0x1a,0x3b,0x95,0xc5,0xc5,0x32,0x0,0xfb,0x7f,0xaf,0xb1,0x2b,0x19,0xc0,0x50,0xf2,0x86,0xa5,0xe7,0xdf,0xd5,0x35,0xea,0x59,0xb2,0xa3,0x9f,0xba,0x1f,0x74,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
@@ -310,7 +310,7 @@ static const unsigned char reference_border_png[]={
 
 
 static const unsigned char scroll_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x26,0x0,0x26,0x0,0x26,0x59,0xf,0xde,0x74,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0x17,0x37,0x2c,0x8d,0x3d,0xc,0x64,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x3f,0x49,0x44,0x41,0x54,0x18,0x95,0xad,0x8e,0x31,0xa,0x0,0x20,0xc,0x3,0xaf,0xda,0x47,0xf4,0xe5,0xf6,0xb3,0x4a,0x5d,0x1c,0x54,0x50,0x17,0xf,0x42,0x96,0x24,0x44,0xcc,0x8c,0x1b,0x69,0x78,0x1,0x62,0x53,0x1,0x90,0xb1,0x10,0xb5,0xb6,0xa5,0xa9,0x9a,0x1,0x24,0xf1,0xe0,0x5f,0xc0,0x55,0x33,0xb3,0x0,0x9f,0x4f,0x1e,0xe9,0xf,0x1d,0xb,0x68,0x95,0x6b,0x4f,0xeb,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x25,0x28,0x6d,0xad,0xf4,0x10,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x3c,0x49,0x44,0x41,0x54,0x28,0xcf,0x95,0x92,0x31,0x6e,0x13,0x61,0x10,0x46,0xdf,0xcc,0x44,0xd8,0xff,0x2e,0xb,0x34,0xb,0x92,0x23,0x4b,0x14,0xc8,0x5b,0xa5,0xe2,0x18,0x88,0x3,0x20,0x25,0x7,0x40,0xb4,0xb9,0x49,0x44,0x4d,0x81,0x14,0xe,0x80,0x38,0x6,0x7,0x20,0xa1,0x0,0x59,0xa4,0x60,0x85,0x8,0x59,0xbc,0xb,0xb6,0xff,0x19,0x8a,0xc5,0xd,0x28,0x45,0x9e,0xf4,0x15,0xdf,0xa7,0x27,0x4d,0x33,0x2,0xf0,0xf4,0xc9,0xb3,0x3d,0xa0,0x6,0x1a,0x60,0xe,0x24,0x46,0x6,0x60,0x9,0x7c,0x0,0xda,0xb7,0xef,0xde,0x6c,0xe5,0xaf,0xfc,0xa8,0xeb,0x7e,0xbc,0xf8,0xda,0x7e,0x39,0xea,0x87,0xd5,0x6d,0xf7,0x30,0x0,0x55,0xc9,0x45,0x2a,0x7f,0xde,0xaf,0xf7,0x5f,0x57,0xd5,0xdd,0x97,0xc0,0x47,0x6b,0x16,0x7,0xf,0xae,0xba,0xcb,0xe3,0x4f,0x9f,0xcf,0x9f,0x6f,0xb7,0xdb,0xa4,0x6a,0x6a,0xa6,0x98,0x29,0x22,0xaa,0xeb,0xcd,0x7a,0xfa,0xfd,0xf2,0xdb,0xe3,0x94,0x4a,0x9d,0x4c,0xa6,0xef,0x15,0x68,0xda,0xf6,0xe2,0x50,0x44,0xcc,0xcc,0x30,0x33,0x54,0xc7,0xec,0xba,0x88,0x58,0xdb,0x5e,0x1c,0x2,0xcd,0x1e,0x30,0xef,0x87,0x55,0x35,0x4a,0xca,0xbf,0xa8,0x2a,0x11,0x41,0x3f,0xac,0x2a,0x60,0xae,0x40,0xe1,0x1e,0x2a,0xc2,0xb5,0x88,0x80,0x7b,0x28,0x50,0x28,0x37,0x44,0x81,0x5e,0x55,0x3c,0xe2,0x7a,0x29,0x2,0x54,0xc5,0x81,0x5e,0x81,0x65,0x91,0xca,0xce,0xdd,0x71,0xf7,0xff,0xe4,0xdd,0x5e,0xa4,0xb2,0x3,0x96,0xa,0x9c,0xd5,0xf5,0xec,0x34,0x22,0x72,0xce,0x99,0x9c,0x33,0xee,0x63,0x76,0x3d,0x22,0x72,0x5d,0xcf,0x4e,0x81,0x33,0x6b,0x16,0x7,0xc3,0x64,0x32,0x3d,0x4f,0xa9,0xb4,0xcd,0xfa,0xd7,0x62,0xbd,0xf9,0x7d,0x2b,0x67,0x97,0xf1,0x5a,0x78,0x91,0xca,0xab,0xfd,0xd9,0xc3,0x57,0x77,0xaa,0x7b,0x27,0xc0,0x52,0x6e,0xfa,0x1a,0x7f,0x0,0x2,0xd3,0x92,0x1e,0xd2,0x75,0x7c,0x7f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
@@ -355,12 +355,12 @@ static const unsigned char scroll_button_up_hl_png[]={
 
 
 static const unsigned char scroll_grabber_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x26,0x0,0x26,0x0,0x26,0x59,0xf,0xde,0x74,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0x17,0x25,0x29,0x85,0xa3,0x88,0x38,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x72,0x49,0x44,0x41,0x54,0x18,0x95,0x7d,0xcd,0xb1,0x9,0xc3,0x30,0x0,0x44,0xd1,0x17,0x21,0x91,0x42,0x10,0xdc,0x4,0x34,0x80,0x77,0xc8,0x4,0x6e,0x32,0xb0,0x1b,0xf,0xe2,0x26,0x4d,0x6a,0x37,0xc2,0x5d,0x40,0x45,0x1a,0x1b,0x4c,0x20,0xfe,0xe5,0xbf,0x3b,0xee,0x52,0x4a,0x71,0x46,0x8c,0x31,0x1a,0x86,0x67,0x87,0x19,0x7b,0x7b,0x41,0x3f,0x4d,0xe3,0x1a,0x36,0x31,0xa3,0x3b,0xc,0x6f,0x78,0x41,0x6c,0xad,0x39,0x2c,0x77,0xae,0xb8,0xb7,0xd6,0x84,0x94,0xd2,0xdf,0xff,0x94,0x92,0x90,0x73,0x86,0xf7,0x4f,0xf6,0xc1,0x92,0x73,0x16,0x6a,0xad,0xf0,0xd8,0xe4,0xce,0x8a,0x7e,0xcb,0xce,0xf9,0x2,0x99,0xd9,0x19,0x5e,0xac,0x65,0x2e,0x22,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x26,0x17,0xf2,0xa0,0x34,0xb7,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xd4,0x49,0x44,0x41,0x54,0x28,0xcf,0xbd,0x8f,0x31,0x4a,0x3,0x61,0x10,0x85,0xdf,0xfb,0x67,0xb1,0x91,0x3d,0x80,0x6d,0xca,0x20,0x39,0xc1,0x7a,0xe,0x59,0x2c,0xc4,0x3b,0x8,0xb9,0x43,0xf0,0xe,0x62,0x11,0x82,0xa0,0x65,0x8a,0xd4,0xe6,0x4,0x31,0x24,0x67,0x48,0xbd,0xe5,0xbf,0x33,0x2f,0x8d,0xbf,0xae,0x6c,0xad,0xf,0x6,0x66,0x98,0xf7,0x31,0xf3,0x80,0xbf,0x16,0x87,0xc3,0x5d,0xfb,0x70,0xd,0xe0,0x49,0x52,0x3,0xe0,0x92,0xe4,0x6,0xc0,0xe3,0x72,0xf5,0xbc,0x1f,0x1,0xed,0xed,0xfd,0x8c,0xe4,0xb6,0xef,0xfb,0x3a,0x14,0x0,0x80,0xc4,0x84,0xaa,0xaa,0x3a,0x49,0xcd,0xea,0xf5,0x65,0x7,0x0,0xe9,0x9b,0x24,0x17,0x39,0xe7,0xda,0xdd,0xa1,0x10,0x14,0x82,0xbb,0x23,0xe7,0x5c,0x93,0x5c,0x14,0x5f,0x55,0x1a,0x8f,0x68,0x3c,0x2,0x90,0x7e,0xfd,0xec,0x11,0xb0,0x88,0x9b,0x11,0x20,0x9,0x92,0x46,0x40,0xd9,0x15,0xa5,0x41,0x98,0x2d,0x7,0x60,0xa9,0xaf,0x90,0x1f,0x23,0x20,0x22,0xe6,0x66,0xd6,0x91,0xfc,0xb9,0x46,0xc2,0xcc,0xba,0x88,0x98,0x17,0x9f,0x95,0xe6,0x70,0xfc,0x3c,0x4d,0xa7,0xb3,0xb5,0x99,0x4d,0x52,0x4a,0x57,0x66,0x76,0x61,0x66,0x1b,0x1,0xed,0xdb,0xfb,0x72,0x87,0x7f,0xd3,0x19,0xa9,0x1d,0x69,0xa0,0x52,0x76,0xa0,0x72,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_grabber_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x26,0x0,0x26,0x0,0x26,0x59,0xf,0xde,0x74,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0x17,0x25,0x15,0xaa,0xcc,0xf4,0xbf,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x86,0x49,0x44,0x41,0x54,0x18,0x95,0x7d,0x8e,0xb1,0xa,0x83,0x30,0x18,0x84,0xbf,0x36,0x81,0x6e,0xe5,0xf,0xad,0x6e,0xe,0x11,0x97,0x2e,0xfa,0xae,0x6e,0x7d,0x29,0xa1,0xce,0xa5,0xae,0x5,0x7,0x83,0x53,0xb,0xf9,0xa1,0x4b,0x94,0xe,0xe2,0x8d,0x77,0xdf,0x71,0x77,0x68,0xdb,0x3b,0x7b,0xb2,0x0,0xc3,0xf0,0xba,0x86,0x30,0x75,0x40,0x91,0xfc,0x51,0xc4,0x55,0xde,0x97,0xb3,0x5,0x8,0x61,0xea,0xea,0xba,0xb9,0x18,0x63,0x1,0x50,0x8d,0xe7,0xbe,0x7f,0x3c,0x81,0xdc,0xa6,0x46,0xb1,0x84,0x0,0xc6,0xd8,0x13,0x90,0x1,0x1c,0x77,0xf,0xfc,0x1,0xa3,0x6a,0xfc,0x2e,0xa6,0x6a,0xfc,0x0,0xef,0xf5,0xa4,0x88,0xab,0xd2,0x66,0x96,0x98,0x20,0xe2,0x6e,0x2b,0xe0,0x7d,0x39,0x3,0xf9,0xd6,0xc4,0xf,0x70,0x6e,0x25,0xf5,0x5c,0xbc,0xd7,0xd3,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0xe,0x1f,0xa1,0x26,0x12,0x2f,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x3,0x49,0x44,0x41,0x54,0x28,0xcf,0xbd,0x90,0x3f,0x4b,0xc3,0x50,0x14,0xc5,0x4f,0xf2,0xf2,0xca,0x33,0x12,0xf3,0x10,0x44,0x3a,0x74,0x10,0x91,0xae,0x75,0x13,0xe7,0xea,0x17,0xe8,0xa7,0x10,0x67,0x41,0xec,0x1e,0x4,0x67,0xf1,0x5b,0xf4,0x3,0x88,0xb3,0xb8,0xd9,0xb5,0x88,0xb8,0x28,0x5,0xb5,0x35,0xf4,0xc5,0x90,0xe6,0xbe,0x3f,0x4e,0x29,0xd,0x75,0xd5,0x3,0x7,0xee,0xb9,0xf0,0xe3,0x1e,0x2e,0xf0,0xd7,0xf2,0x96,0xc3,0xcd,0xf0,0x65,0x8f,0xc8,0x5c,0xce,0xd2,0xa2,0x6b,0x1d,0x36,0xa4,0x14,0x3,0xde,0x60,0xe7,0x27,0x9d,0x9d,0xa7,0x15,0xe0,0x7a,0xf8,0xdc,0x9e,0x7e,0xe4,0xf,0xe3,0xb1,0x92,0x45,0xa1,0xe1,0xe0,0xb0,0x26,0x38,0x9a,0xcd,0x28,0xdd,0xdc,0xa,0xf,0x4e,0x3b,0xbb,0x23,0x0,0x8,0x2a,0x20,0x2f,0xca,0xe4,0xed,0xf5,0x4b,0x7e,0xab,0xf9,0xe2,0xa2,0x2a,0x4a,0x58,0xa3,0xa5,0x88,0x82,0x4,0x40,0xaf,0x6,0x4c,0x27,0x59,0x37,0x53,0x39,0x34,0xd9,0x5a,0xe7,0x4c,0x19,0x4c,0x3e,0xd5,0x71,0x95,0x17,0x40,0x49,0x1a,0x46,0x13,0xac,0x36,0x35,0xc0,0x78,0xc,0xb4,0xb4,0xf3,0xab,0x41,0x48,0x71,0xc7,0x98,0x83,0xa1,0x79,0xcd,0x8c,0x39,0x8,0x29,0x6e,0x57,0x0,0xcb,0xfd,0x7e,0xdc,0x8a,0x53,0xbe,0xce,0xe1,0x39,0x82,0xe7,0x8,0x41,0x18,0x20,0x6e,0xc5,0xa9,0xe5,0x7e,0xff,0xd7,0xb7,0x9e,0xdd,0x3f,0xb6,0x29,0xa7,0x24,0x7b,0x9f,0x1d,0xc1,0xd9,0x28,0xda,0x8e,0x7,0x41,0xd8,0xb8,0xb8,0x3a,0xdc,0x1f,0xe1,0xdf,0xf4,0x3,0x35,0xb3,0x71,0xac,0x4,0x64,0x3e,0xbb,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
@@ -415,12 +415,12 @@ static const unsigned char tab_menu_hl_png[]={
 
 
 static const unsigned char toggle_off_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0xa2,0x9d,0x7e,0x84,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x26,0x0,0x26,0x0,0x26,0x59,0xf,0xde,0x74,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0x17,0x2,0x16,0xe9,0x0,0x17,0x60,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x2,0x45,0x49,0x44,0x41,0x54,0x68,0x81,0xed,0x99,0x5f,0x4f,0xd3,0x50,0x18,0x87,0x9f,0xb3,0x96,0xb5,0xcc,0x3a,0xa6,0xac,0x6d,0xa,0x91,0x84,0x5b,0x8d,0x7e,0x21,0x60,0x2c,0x5c,0x1a,0x63,0xe2,0x27,0x31,0x31,0xc6,0x4b,0x32,0xa7,0x7e,0x20,0x84,0x6b,0x6f,0xc,0x90,0x6d,0x32,0xca,0x6c,0xb0,0x24,0x75,0xc7,0x8b,0xba,0xb9,0x35,0xdd,0x84,0xec,0xe0,0x26,0xed,0x73,0xd7,0xf7,0xed,0xce,0x7b,0x7e,0xbf,0xbe,0x67,0x7f,0xde,0x41,0x4e,0x4e,0xa6,0x11,0x89,0xeb,0x12,0x50,0x1,0x2c,0x40,0x4b,0xc9,0xff,0xaf,0x48,0xe0,0x27,0x10,0x0,0x3e,0x70,0x39,0x48,0xe8,0x89,0x1b,0x2b,0xc0,0x33,0xe0,0x11,0x60,0x72,0xb7,0xc,0x8,0x81,0xaf,0xc0,0x67,0xa6,0x18,0x60,0x1,0x1b,0x4f,0x1e,0x3f,0x7d,0x6d,0x57,0xed,0x65,0x40,0x48,0x64,0xfc,0x72,0x95,0x8,0x10,0x8,0x74,0x5d,0x67,0x69,0x49,0x47,0xd3,0x92,0xdb,0x50,0x4b,0x14,0x45,0xf2,0xf8,0xe4,0xf8,0xc7,0xe1,0xd1,0xc1,0x2b,0xe0,0xcb,0x68,0x2e,0x59,0x59,0x7,0xc,0xbb,0x6a,0x97,0xce,0xba,0x67,0x4,0x41,0x80,0xec,0xf7,0x91,0x8a,0x1d,0x10,0x8,0x44,0xa1,0x80,0x51,0x2c,0x52,0x2a,0xdd,0xa3,0x58,0x2c,0x2a,0x5d,0x3f,0x89,0x69,0x9a,0x62,0x7d,0x6d,0xbd,0x74,0x78,0x74,0x60,0x90,0xd0,0x9c,0x66,0xbd,0x0,0x8,0x82,0xef,0x54,0x2a,0xf,0x70,0x6c,0x7,0xa1,0xf8,0x24,0x48,0x24,0xed,0x4e,0x1b,0xdf,0x3f,0xc7,0x30,0x4c,0xa5,0x6b,0xa7,0x11,0x86,0x21,0x96,0x65,0x41,0xca,0x91,0x4e,0xed,0x3d,0x29,0x25,0xb2,0x2f,0x71,0x1d,0x97,0x30,0xc,0x39,0x6d,0x9d,0x2a,0xdd,0x90,0xe7,0x7a,0xb8,0x8e,0xcb,0x79,0xb7,0xab,0xbc,0xbb,0x6e,0x4a,0x61,0x52,0x62,0x70,0xf6,0x55,0x8b,0x87,0xdf,0x6b,0x4a,0xe6,0x2e,0x1e,0xa6,0x18,0x90,0x15,0x32,0x6f,0xc0,0xed,0x7e,0xfe,0xcc,0x80,0x65,0x59,0xd4,0xf7,0x6a,0x63,0xb1,0xc6,0x7e,0x93,0x20,0x8,0x78,0xf1,0xf2,0xf9,0x58,0xfc,0xed,0x9b,0x77,0xa9,0xb1,0xeb,0xb0,0xb0,0x6,0xc,0xc4,0x7f,0x78,0xff,0x9,0x80,0x9d,0xdd,0x2d,0xea,0x7b,0xb5,0xa1,0xb0,0x34,0x81,0xd7,0x15,0x3d,0xca,0xc2,0x1a,0x0,0xd0,0x6c,0x7c,0xa4,0xd7,0xeb,0x1,0xb1,0x11,0x3b,0xbb,0x5b,0xc3,0xdc,0xe8,0x13,0x1f,0x8,0x4f,0x8b,0xfd,0x8d,0x85,0x36,0x60,0x1a,0xaa,0x3a,0x60,0xa1,0xdf,0x4,0x6b,0xf5,0x6d,0xca,0xe5,0x32,0xe5,0x72,0x79,0xec,0xe9,0xab,0x24,0x69,0x80,0x9,0xac,0xdc,0x4a,0xa5,0x1b,0xd2,0xd8,0x6f,0x2,0xb1,0x9,0xb5,0xfa,0xf6,0x58,0x6c,0x6,0x56,0x88,0x35,0xe,0x49,0x1e,0x81,0x10,0xb8,0x98,0xb5,0x8a,0xa,0x82,0x20,0x98,0xd8,0xd2,0x33,0xb4,0xff,0x5,0xb1,0xc6,0x21,0xb,0x7d,0x4,0xfe,0x5,0xb9,0x1,0xf3,0xde,0xc0,0xbc,0x99,0x68,0x80,0x88,0xa7,0x16,0x78,0xae,0xa7,0xbc,0xa8,0xe7,0x7a,0xc3,0xa1,0xc8,0xbc,0x49,0xfd,0x1e,0x20,0x84,0x40,0x14,0x4,0xad,0x76,0xb,0xc7,0x76,0xd8,0xdc,0xd8,0x54,0x5a,0x54,0x22,0x69,0xb5,0x5b,0x88,0x82,0x98,0xbb,0x9,0x69,0x6,0x48,0x0,0xcb,0xba,0x8f,0xef,0xfb,0xb7,0xf2,0x9b,0xfd,0xcf,0x44,0xc8,0x40,0xd3,0x34,0xa5,0x6b,0xa7,0x61,0x9a,0x26,0x51,0x14,0x41,0xca,0x70,0x2f,0x69,0x40,0x4,0x5c,0x75,0xbe,0x75,0x2e,0xed,0xaa,0xbd,0xbc,0xfa,0x70,0xf5,0x4e,0xcd,0x4,0x81,0x2b,0x62,0x8d,0xa3,0x5b,0x19,0x63,0x8d,0x6c,0x4c,0x85,0x4f,0x6,0x89,0xcc,0xff,0x2f,0x90,0x93,0x93,0x93,0x6d,0x7e,0x1,0x6b,0xe,0xc1,0xdb,0xd6,0xe0,0xc4,0xba,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0xa2,0x9d,0x7e,0x84,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x16,0x28,0x99,0xc6,0x91,0x20,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x5,0xb5,0x49,0x44,0x41,0x54,0x68,0xde,0xed,0x99,0xdb,0x6f,0x54,0x55,0x14,0xc6,0x7f,0xfb,0xdc,0xe6,0x72,0x66,0x3a,0x9d,0x76,0x5a,0xa0,0x3,0xe5,0xd2,0xc4,0xb4,0x21,0x26,0x46,0x2,0x31,0xbe,0x11,0xc0,0x17,0x62,0x14,0xe2,0xe5,0xc1,0xc4,0x77,0xc2,0xe5,0xf,0x30,0x31,0xd1,0x18,0x8,0xbc,0x5a,0x2,0xaf,0x3e,0x90,0x80,0xa8,0x28,0x1a,0x5f,0x4,0x9,0x8f,0x62,0x42,0x88,0x1a,0x9c,0x82,0x5c,0x14,0x68,0x11,0x5a,0x3a,0xed,0xdc,0x3b,0xe7,0xb2,0x7d,0x70,0x77,0x98,0xe,0x67,0x86,0x96,0xe,0x97,0x4,0x56,0xb2,0x33,0x33,0xeb,0x5c,0xe6,0xac,0x6f,0x7f,0x7b,0x9d,0xb5,0xbe,0xd,0x2f,0xec,0xf9,0x36,0xb1,0xc0,0x73,0x45,0xdd,0x35,0xe2,0x19,0x89,0x41,0xd6,0x7d,0xca,0xba,0xdf,0x6d,0x3,0x40,0x53,0xc3,0xac,0x1b,0xba,0xf2,0x89,0x67,0x20,0x78,0x1f,0xf0,0x0,0xa7,0x6e,0xf8,0x6a,0x2c,0xa,0x0,0xa1,0x2,0xb5,0x80,0x18,0xd0,0xa9,0x46,0x7,0x10,0x51,0x40,0x3c,0x4d,0x10,0x66,0x83,0x77,0x80,0x32,0x90,0x3,0xa6,0xd4,0x28,0x0,0x55,0x5,0x8c,0x7c,0x14,0x0,0x34,0xc0,0x50,0x81,0xf7,0x0,0xcb,0x53,0xa9,0x25,0xef,0xc6,0x62,0x1d,0x6f,0x1a,0x86,0xde,0x3,0xc2,0x0,0x84,0x10,0x4f,0x97,0x0,0x52,0x4a,0x5,0x84,0x74,0x5d,0xd7,0x1b,0x2f,0x14,0x72,0x3f,0x4c,0x4c,0xdc,0xf9,0xa,0xb8,0x5,0x8c,0x2b,0x20,0xdc,0x56,0x6c,0x10,0x4d,0x82,0xb7,0x80,0x4,0xd0,0xdf,0xd9,0xd9,0xbd,0xad,0xab,0x2b,0xb5,0x5b,0xd3,0x44,0xec,0x7e,0xbc,0x62,0x1e,0x18,0xca,0x26,0x3e,0xa1,0x9e,0xa7,0xfd,0xe4,0x91,0x52,0xe2,0xfb,0x7e,0x61,0x72,0x72,0x62,0x78,0x6a,0xea,0xde,0xb7,0xc0,0xd,0x60,0x5a,0xb1,0xc1,0x9f,0xf,0x0,0x42,0x5,0x9f,0x4,0xd6,0x2c,0x5b,0xb6,0xfc,0x23,0xdb,0x8e,0x6d,0x15,0x2,0xc2,0xc2,0x60,0x95,0x69,0xd3,0x6b,0x84,0xb1,0x35,0x3,0xbd,0xc5,0xec,0x3b,0xd2,0x67,0xd4,0x29,0x73,0xa5,0x9a,0xa7,0x22,0xfd,0x0,0x50,0x7c,0xf5,0x57,0xda,0x63,0x63,0x46,0xb1,0x98,0xff,0xf1,0xf6,0xed,0x5b,0xfb,0x80,0x6b,0x40,0x56,0x81,0x20,0x5b,0x1,0x30,0xbb,0xe6,0x13,0xc0,0x40,0x5f,0xdf,0x8a,0xcf,0xa2,0x51,0xfb,0xd,0x21,0x4,0x6b,0xcc,0x18,0x2b,0x2d,0x9b,0xdb,0x4e,0x85,0x51,0xa7,0x44,0x41,0xba,0x81,0xf3,0x2b,0x80,0x30,0x1a,0x1d,0xba,0x49,0xaf,0x11,0xa6,0xd7,0x8,0x71,0xbd,0x5a,0xe4,0x6f,0xa7,0x18,0x0,0xbf,0x7c,0xac,0xe9,0x43,0x4a,0x49,0xa9,0x54,0xf8,0x69,0x6c,0xec,0xe6,0xc7,0xc0,0x55,0xc5,0x84,0x7,0x72,0x82,0xde,0x40,0xfd,0x30,0xb0,0x2c,0x99,0x4c,0x7d,0x90,0x48,0x74,0x7e,0x28,0x84,0x60,0x6d,0x28,0x41,0x4a,0xf,0xf1,0x47,0x65,0x9a,0x5b,0x6e,0x99,0xea,0x43,0x92,0xab,0x8b,0xa4,0x28,0x3d,0xee,0x7a,0x33,0xe4,0x3c,0x87,0x95,0x96,0x4d,0x87,0x6e,0x72,0xcf,0x9b,0x69,0x0,0xed,0xf1,0xe6,0xf,0x21,0x4,0xa6,0x69,0xd,0x0,0xd3,0xe5,0x72,0xe9,0x12,0x50,0x54,0xf9,0x40,0x36,0xae,0xf7,0xfa,0xef,0x31,0x60,0x79,0x57,0x57,0xf7,0x2e,0x21,0xa0,0xdf,0xb4,0x49,0xe8,0x16,0x17,0xca,0x59,0xa6,0x7c,0x67,0xc1,0xf,0x71,0xcf,0xaf,0xf2,0x5b,0x39,0x4b,0x42,0xb7,0x58,0x61,0x46,0x9f,0xf8,0xeb,0x42,0x8,0x41,0x32,0xd9,0xbd,0x13,0x58,0xa1,0x62,0xd3,0x1b,0x91,0xd7,0xea,0xa6,0xc3,0x4,0x12,0x3d,0x3d,0x4b,0xdf,0xd7,0x34,0x11,0xb1,0x84,0xc1,0x6a,0xd3,0x26,0x53,0xc9,0x51,0x9e,0xdf,0x2b,0x35,0xd0,0x4a,0xf8,0x8c,0x54,0x72,0xac,0x31,0x63,0x58,0x42,0x7b,0xe2,0x6f,0xa,0x4d,0xd3,0x23,0x3d,0x3d,0x4b,0xdf,0x53,0x4b,0xdb,0x8,0xca,0xf8,0xf5,0x0,0x74,0xda,0x76,0x7c,0x2b,0x40,0xda,0x88,0x30,0xe9,0x55,0xc9,0xfa,0xd5,0x45,0x3f,0xc4,0xa4,0x5f,0xe5,0x9e,0x37,0x43,0x9f,0x11,0x69,0x79,0x5e,0x3a,0xdd,0xc7,0xfe,0xfd,0x7b,0xb9,0x7c,0xf9,0x22,0xe7,0xcf,0xff,0xc2,0xf6,0xed,0x6f,0x3,0xb0,0x61,0xc3,0x7a,0x2e,0x5f,0xbe,0x38,0x67,0x4,0xf9,0xe2,0xf1,0x78,0xe0,0x7d,0x6d,0x3b,0xb6,0x55,0x25,0x76,0xab,0x91,0x1,0x46,0x3,0x0,0x1d,0x86,0xa1,0xa7,0x40,0xb0,0xc4,0x8,0xf3,0x8f,0x53,0x6c,0xdb,0x4c,0x8c,0x7b,0x33,0xac,0x34,0x6d,0xae,0xb7,0xb8,0xe7,0x81,0x3,0xfb,0xc8,0xe5,0xf2,0x6c,0xdc,0xb8,0x85,0xa1,0xa1,0x41,0xe,0x1d,0x1a,0xe6,0xdc,0xb9,0x5f,0x6b,0xc7,0xd7,0xad,0x7b,0x8d,0x7c,0x3e,0x5f,0x3,0xa5,0xd1,0xd7,0xcc,0xc,0xc3,0xe8,0x51,0x5,0x9c,0xd1,0xc,0x80,0xd9,0x84,0x18,0x9e,0xf5,0xc5,0x34,0x83,0x69,0xcf,0x69,0x1b,0x0,0xd3,0x9e,0x43,0x2c,0x64,0xb4,0x9c,0xfd,0xd,0x1b,0xd6,0xd7,0x2,0x1a,0x1d,0x1d,0xe3,0xf4,0xe9,0x33,0x6c,0xde,0xbc,0x89,0x4c,0x66,0x84,0x4c,0x66,0xe4,0x81,0x6b,0x82,0x7c,0x4d,0xb2,0x81,0xa1,0xaa,0xd7,0xa6,0x39,0xa0,0xfe,0x35,0x28,0x0,0x4c,0xa1,0x51,0x96,0x5e,0xdb,0x0,0x28,0x4b,0xf,0xb3,0x45,0xe,0x48,0xa7,0xd3,0x64,0x32,0x23,0x73,0x66,0x33,0x93,0xc9,0x30,0x34,0x34,0x8,0x40,0x3e,0x9f,0xe7,0xf0,0xe1,0x61,0x8e,0x1c,0xf9,0xa2,0x46,0xf5,0x20,0x5f,0xb3,0x64,0xd8,0xac,0xf2,0x32,0x2,0x6a,0xeb,0x5a,0x31,0x13,0x11,0x3a,0xa5,0x36,0x81,0x10,0x11,0x3a,0x8e,0x6c,0x9e,0x4c,0x33,0x99,0x11,0x86,0x86,0x6,0x89,0xc7,0xe3,0x35,0x10,0xd2,0xe9,0xf4,0x1c,0x40,0x76,0xec,0xd8,0xfd,0x0,0xdd,0x83,0x7c,0x4d,0x4a,0x66,0x3f,0xa8,0x10,0xaa,0x9f,0x12,0xef,0xff,0xa6,0x42,0xba,0x20,0x29,0xf8,0x2e,0x9,0xdd,0x6c,0x1b,0x3,0x12,0xba,0x49,0xc1,0x77,0x9b,0x1e,0xcf,0xe7,0xf3,0x64,0x32,0x23,0xb5,0xc4,0x17,0x8f,0xc7,0xd9,0xb2,0x65,0xd3,0x2,0x68,0xde,0x12,0x2,0x57,0x35,0x4c,0x5e,0xb3,0x3a,0x40,0xaa,0xae,0x2a,0xef,0xba,0xfe,0x38,0xc0,0x1d,0xb7,0x42,0x4a,0xf,0xb5,0xd,0x80,0x1e,0x3d,0xc4,0x1d,0xb7,0xd2,0xf2,0x9c,0xbd,0x7b,0xf7,0xb3,0x67,0xcf,0x4e,0x4e,0x9e,0xfc,0x86,0xb3,0x67,0x4f,0x71,0xea,0xd4,0xcf,0x9c,0x38,0xf1,0xdd,0xa2,0xff,0xdb,0x75,0xdd,0x71,0xd5,0x2d,0xba,0xf,0xab,0x4,0x2d,0xd3,0xb4,0x7a,0xc3,0xe1,0xf0,0xab,0x25,0xe9,0xf3,0x92,0x15,0x27,0xe7,0xb9,0x54,0x16,0xb9,0xc,0xba,0x34,0x8b,0xd5,0x56,0x8c,0x3f,0xab,0x39,0xbc,0x16,0xdd,0xe9,0xe8,0xe8,0x18,0x47,0x8f,0x7e,0x9,0xc0,0xf0,0xf0,0x21,0x8e,0x1d,0x3b,0x3e,0x87,0x21,0xd7,0xae,0x5d,0xa7,0x5a,0xad,0xb6,0xf4,0x5,0xb3,0x6b,0xfa,0x78,0xa9,0x54,0x38,0x3,0x4c,0x2a,0x10,0x2,0xeb,0x51,0x3,0xe8,0x6,0x5e,0x1e,0x18,0x18,0xfc,0x5e,0xd3,0x44,0xa4,0xdf,0xb4,0x59,0x6e,0x46,0xb9,0x50,0x9a,0x7c,0xe4,0x62,0x28,0x8a,0xc6,0x2b,0xd1,0x2e,0x46,0x9d,0x12,0x37,0x9c,0xd2,0xc2,0xe4,0x9a,0x36,0x98,0xef,0x7b,0xe5,0xab,0x57,0x2f,0xbd,0x5,0xfc,0x5e,0x7,0x80,0xc,0x62,0x40,0xad,0x43,0x11,0x2,0x37,0x12,0x89,0xbe,0x9e,0xf3,0x1d,0x3a,0x34,0x93,0x55,0x96,0x4d,0xde,0x77,0x1b,0x3a,0xbb,0x87,0x5b,0xb7,0x66,0xb1,0x36,0x9c,0x20,0xe7,0x3b,0x5c,0xad,0x16,0x9e,0x78,0xf0,0x52,0x4a,0xb2,0xd9,0x89,0xcf,0xcb,0xe5,0xd2,0x59,0x60,0x22,0xa8,0x23,0x6c,0x4,0xc0,0x7,0xbc,0x72,0xb9,0x74,0x3b,0x1c,0x8e,0xac,0x34,0x4d,0x73,0x60,0xdc,0x9b,0xc1,0x14,0x1a,0x83,0xe1,0xe,0xc2,0x42,0x67,0xc6,0xf7,0x70,0x9a,0xb0,0x41,0x0,0x11,0x34,0xba,0x75,0x8b,0x35,0x56,0x8c,0x81,0x50,0x8c,0x51,0xb7,0xc2,0x5f,0xd5,0xfc,0x22,0x8a,0xe9,0xc5,0x75,0x83,0x77,0xef,0xfe,0x7b,0x50,0x9,0x24,0xc5,0x20,0x4d,0xa0,0x95,0x1e,0x30,0xd0,0xd7,0xd7,0xff,0x49,0x34,0x1a,0xdd,0x2c,0x4,0x84,0x84,0xce,0x6a,0x33,0xb6,0x48,0x3d,0xe0,0x49,0x6,0x5f,0x3c,0x3d,0x36,0x76,0xe3,0x53,0xe0,0xca,0x7c,0xf5,0x80,0x46,0x45,0xa8,0x13,0xe8,0x4f,0x26,0xbb,0xb7,0x25,0x93,0xdd,0xbb,0x74,0x5d,0x8b,0xdd,0xef,0xe1,0x9b,0x9,0xc3,0xf,0x23,0xf9,0xec,0xf5,0x8d,0xf7,0x69,0x9f,0x79,0x9e,0x57,0xc8,0x66,0x27,0xe,0x66,0xb3,0x35,0x45,0x68,0x6a,0x21,0x8a,0x50,0x3d,0x8,0xa6,0x6a,0x21,0x53,0xc0,0x8a,0x54,0x6a,0xc9,0x3b,0x4a,0x13,0xec,0x5,0x61,0x3c,0x6d,0x3d,0x70,0x6e,0x91,0x23,0x5d,0xd7,0xf5,0xee,0x2a,0x4d,0xf0,0x6b,0xe0,0xa6,0x5a,0xf3,0x85,0x3a,0x95,0xf8,0x91,0x55,0xe1,0x10,0x60,0x2b,0x46,0x24,0x3,0x54,0xe1,0xa7,0x69,0x8d,0xaa,0x70,0x56,0xcd,0x78,0x11,0x98,0x59,0x8c,0x2a,0x5c,0x7f,0x7c,0x16,0x8,0x43,0x2d,0xd,0xb3,0xae,0x67,0x78,0x16,0xf6,0x5,0x24,0xf7,0xf7,0x5,0xaa,0xea,0x35,0xe7,0x31,0xcf,0x4d,0x92,0x47,0xdd,0x19,0x7a,0x56,0x76,0x85,0x1a,0x81,0x58,0xf0,0xce,0xd0,0xb,0x7b,0x61,0xcf,0xb9,0xfd,0x7,0xde,0xc4,0x73,0xf5,0xe8,0x6c,0xed,0xda,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char toggle_on_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0xa2,0x9d,0x7e,0x84,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x26,0x0,0x26,0x0,0x26,0x59,0xf,0xde,0x74,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0x17,0x2,0x12,0xee,0x6d,0xd3,0x79,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x2,0xa7,0x49,0x44,0x41,0x54,0x68,0x81,0xed,0x99,0x4d,0x4f,0x13,0x51,0x14,0x86,0x9f,0x99,0x4e,0x6c,0x4b,0xc6,0x52,0xc5,0xb6,0x49,0x1b,0x5d,0xb1,0xf4,0x63,0x69,0x28,0x89,0xfc,0x7,0x63,0x42,0x8,0xff,0x40,0x11,0xc4,0x8d,0x51,0x2,0xb,0x5,0x56,0x86,0x8f,0xb8,0x51,0xff,0x0,0x69,0x20,0x24,0x6,0x24,0xfc,0x1,0x68,0x58,0x82,0x11,0x77,0x6e,0xc,0x24,0x2d,0x6,0x3a,0x49,0xad,0xd3,0x32,0xe5,0xba,0x18,0xdb,0x94,0x71,0x2,0xb1,0xb9,0x63,0x23,0x9d,0x67,0xd5,0xde,0x73,0xe6,0xcc,0x7b,0xde,0xe9,0x9d,0xcc,0x9c,0x82,0x8f,0x4f,0x5b,0xa3,0x38,0xbe,0x77,0x0,0x51,0x40,0x7,0x2,0x2e,0xf1,0xff,0x15,0x1,0x54,0x81,0x22,0x50,0x0,0x4a,0xb5,0x80,0xe6,0x48,0x8c,0x2,0xb7,0x81,0xeb,0x40,0x88,0x8b,0x65,0x80,0x9,0x7c,0x3,0x76,0x38,0xc3,0x0,0x1d,0xb8,0x71,0xeb,0xe6,0x9d,0xd9,0x54,0x32,0x15,0xd6,0x34,0xcd,0x53,0x3,0xaa,0x55,0x8b,0xe3,0x63,0xb,0xcb,0xb2,0x10,0x8,0x5b,0xa6,0x4c,0x14,0x50,0xec,0x6b,0x28,0xe,0xbe,0x1f,0xfc,0xfc,0xbc,0xfb,0x69,0x14,0xf8,0xda,0x98,0xe2,0x34,0x40,0x3,0x82,0xa9,0x64,0xaa,0xc3,0x34,0x4d,0x4c,0xd3,0x94,0xac,0xe8,0x34,0x95,0x4a,0x85,0x52,0xe9,0x7,0xe5,0x4a,0x5,0x71,0x72,0x62,0x9b,0x20,0x11,0x5,0x5,0x45,0x55,0xd1,0x75,0x5d,0x89,0x5d,0x8b,0x75,0x0,0x41,0x1c,0x3d,0x3b,0xd,0x0,0x50,0x34,0x4d,0xf3,0xbc,0x79,0x80,0x6a,0xb5,0x4a,0xb9,0x52,0x26,0x1a,0xbd,0x42,0x3c,0x16,0xaf,0x5d,0x2d,0x69,0x8,0x4,0xf9,0x83,0x3c,0x85,0xc2,0x11,0x5d,0x57,0xbb,0xc0,0x65,0x4b,0xbb,0x19,0xf0,0xcf,0x10,0x8,0xc4,0x89,0x20,0x11,0x4f,0x60,0x9a,0x26,0xf7,0x1f,0xf4,0x4b,0xad,0xbf,0xbc,0x94,0x21,0x11,0x4f,0x70,0x74,0x78,0x88,0x10,0xee,0xbf,0x2e,0x55,0xea,0x19,0x9b,0xa0,0xb6,0xf7,0x65,0x37,0xf,0xbf,0x6b,0xa,0xce,0xdc,0x5a,0x2d,0x37,0xa0,0xd5,0xf8,0x6,0x34,0x73,0x90,0xae,0xeb,0x8c,0x4f,0x8c,0xb1,0xb6,0xbe,0xca,0xda,0xfa,0x2a,0xe3,0x13,0x63,0xe8,0xba,0xe,0x40,0x76,0x6b,0x83,0xe7,0x2f,0x9e,0xd5,0x73,0xb3,0x5b,0x1b,0x72,0x94,0x7a,0x44,0x53,0x6,0x8c,0x3e,0x1d,0x1,0x60,0xa0,0x7f,0x90,0x81,0xfe,0x41,0x54,0x35,0x50,0x5f,0x3,0x48,0xf7,0xa6,0xe9,0xee,0xee,0x96,0xa3,0xd0,0x63,0x9a,0x32,0x20,0xdd,0x9b,0x66,0x7e,0xee,0xd,0x86,0x61,0x60,0x18,0x6,0x73,0xb3,0xf3,0xf4,0xa4,0x7b,0xea,0xf1,0x77,0x6f,0xdf,0xf3,0x64,0x74,0x58,0x9a,0x48,0x2f,0xf1,0xe4,0x1e,0xb0,0xba,0xf2,0x91,0x50,0x38,0x4c,0x5f,0xdf,0x3d,0x2f,0xca,0x4b,0xa5,0x29,0x3,0x36,0x37,0x36,0x79,0x3c,0x3c,0x44,0x24,0x12,0x21,0x12,0x89,0x30,0x3c,0x32,0x44,0x76,0x33,0x7b,0x2a,0x67,0xe6,0xf5,0xc,0x8f,0x86,0x1e,0x4a,0x11,0xe9,0x25,0x4e,0x3,0x42,0x40,0xe7,0x79,0x7,0xcd,0xce,0xcc,0xa3,0xaa,0xa,0x99,0xc5,0x5,0x32,0x8b,0xb,0xf5,0xb5,0x46,0x76,0x77,0xbf,0xb0,0xbd,0xbd,0x23,0x4b,0xa7,0x2c,0x3a,0xb1,0x7b,0xac,0xe3,0x7c,0x12,0x34,0x1,0xe3,0xbc,0x2a,0xc5,0x62,0x91,0x57,0x2f,0xa7,0x5c,0x63,0x3d,0x77,0x7b,0xeb,0x9f,0xa7,0x26,0xa7,0x99,0x9a,0x9c,0xfe,0x6b,0x95,0x1e,0x62,0x60,0xf7,0x58,0xc7,0x7f,0xe,0x68,0xb5,0x80,0x56,0xe3,0x1b,0xd0,0x6a,0x1,0x8a,0x3d,0xb5,0x60,0x79,0x29,0x23,0xbd,0xf6,0xf2,0x52,0xa6,0x71,0x28,0xe2,0x4a,0x4b,0x5f,0x87,0xed,0x81,0x85,0x42,0x2e,0x9f,0x23,0x1e,0x8b,0xb3,0xb6,0xf2,0x41,0x6a,0xfd,0x60,0x30,0x48,0x2e,0x9f,0x43,0x51,0x15,0x14,0xc5,0xdd,0x4,0x37,0x3,0x84,0x65,0x59,0x84,0x42,0x21,0xcf,0x87,0x22,0x81,0x40,0x80,0xe0,0xa5,0x20,0x85,0x42,0xc1,0x7e,0x67,0xf7,0x6c,0x22,0x74,0xb9,0xb6,0xf4,0xc7,0x9,0x9c,0x6,0x58,0x40,0x79,0x6f,0x7f,0xaf,0x94,0x4a,0xa6,0xc2,0xba,0xae,0x5f,0xa8,0x99,0x20,0x50,0xc6,0xee,0xb1,0x31,0xe5,0x14,0x49,0xda,0x63,0x2a,0xbc,0x5f,0xb,0xb4,0xfd,0xff,0x2,0x3e,0x3e,0x3e,0xed,0xcd,0x2f,0xbd,0x80,0xe4,0x2f,0x1f,0x1c,0x6a,0x6c,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0xa2,0x9d,0x7e,0x84,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0xc,0x32,0xd4,0x89,0x92,0x81,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x5,0xba,0x49,0x44,0x41,0x54,0x68,0xde,0xed,0x99,0x5d,0x6c,0x93,0x55,0x18,0xc7,0x7f,0xe7,0xbc,0xdd,0xdb,0x8e,0xf6,0xed,0xba,0x76,0x8d,0x8e,0x7d,0xf0,0x31,0x15,0x88,0x9a,0x11,0x95,0x85,0x18,0x24,0x12,0x21,0xde,0x1a,0xae,0x4d,0x8c,0xd1,0xe0,0x85,0x89,0x37,0x5e,0x68,0xe4,0xca,0xb,0xcc,0x48,0xbc,0x23,0x7a,0x41,0xd4,0xa0,0x21,0x41,0x4d,0x20,0x70,0x69,0xc0,0x8f,0xe0,0x47,0xc,0x86,0x44,0x8c,0xda,0x39,0x1,0x27,0x6c,0x40,0xe8,0xe7,0xf6,0xb6,0x5b,0xfb,0xb6,0xef,0x7b,0xbc,0xe8,0x59,0xa9,0xa5,0xd4,0x32,0x96,0x6d,0x6,0x4e,0x72,0xd2,0xf4,0xeb,0xbc,0xf9,0xff,0x9f,0xff,0x79,0xce,0xf3,0xfc,0xf,0xdc,0x1b,0x77,0xf7,0x10,0xb7,0xf9,0x5b,0x51,0xf7,0x1f,0xb1,0x42,0x30,0xa8,0xba,0x57,0x55,0xf7,0x7e,0xd1,0x8,0x90,0x7a,0x76,0xd4,0x4d,0x43,0x7f,0x26,0x56,0x0,0x78,0xf,0x70,0x81,0x72,0xdd,0xf4,0xf4,0xbc,0x23,0x2,0x84,0x6,0x6a,0x2,0x21,0x20,0xa2,0x67,0x18,0xe8,0xd4,0x44,0x2c,0x27,0x9,0xf3,0xe0,0xcb,0xc0,0x1c,0x30,0x3,0xe4,0xf4,0xcc,0x3,0x8e,0x26,0x46,0x2d,0x84,0x0,0x9,0xf8,0x34,0xf0,0x38,0xd0,0x6f,0x59,0x5d,0x4f,0x59,0x56,0xd7,0x2e,0xd3,0x34,0xd7,0x4b,0x69,0x84,0xa5,0x94,0x9d,0x42,0x88,0x65,0x55,0x80,0x52,0x4a,0x79,0x9e,0x37,0xe7,0x79,0xee,0x8c,0xe3,0x38,0x17,0x6d,0x7b,0xfa,0xa4,0x6d,0x4f,0x7f,0xb,0x4c,0x2,0x49,0x4d,0x44,0xa5,0x95,0x1a,0xc4,0x2d,0xc0,0x9b,0x40,0x17,0x30,0xb8,0x6a,0x55,0x68,0x7b,0x2c,0x16,0xdf,0xe3,0xf7,0x7,0x1e,0x5a,0x66,0xbc,0xed,0x10,0x42,0xa9,0x54,0x1c,0x4f,0xa7,0x93,0x7,0x67,0x67,0xf3,0xa7,0x81,0x4b,0xc0,0xb4,0x56,0x83,0xd7,0xe,0x1,0x42,0x83,0xef,0x6,0xd6,0x77,0x77,0xf7,0x3c,0x1f,0x8d,0xf6,0xbc,0x24,0xa5,0x34,0x97,0x1c,0x8d,0x3f,0x84,0x1c,0x18,0x46,0xf6,0xac,0x45,0x74,0x46,0x40,0xfa,0x6e,0xd,0xbc,0x52,0x42,0x5d,0xfb,0x3,0x77,0xe2,0x27,0x28,0xe5,0xf1,0x3c,0xcf,0xc9,0x64,0x52,0x1f,0x66,0xb3,0xa9,0xc3,0xc0,0x45,0x20,0xab,0x49,0x50,0xad,0x8,0x98,0xdf,0xf3,0x5d,0xc0,0x50,0x34,0x1a,0x7f,0x39,0x1a,0xed,0x79,0x79,0xc9,0x65,0x2e,0xd,0x64,0xff,0x30,0xb2,0xff,0x51,0xbc,0xeb,0x17,0xf0,0xae,0x8e,0xc1,0x6c,0x16,0x54,0x93,0x0,0xa,0x1,0xfe,0x10,0x58,0x3d,0xc8,0xd8,0x1a,0x64,0x6c,0x1d,0xde,0xe4,0xcf,0x78,0x97,0xcf,0xa1,0xdc,0x8a,0xca,0x64,0x52,0x1f,0x64,0x32,0xc9,0xf,0x80,0xb,0x5a,0x9,0x37,0xe5,0x4,0xa3,0x41,0xfa,0x1,0xa0,0x37,0x18,0xb4,0x9e,0x8d,0xc7,0xef,0x7b,0x5d,0x4a,0x69,0x2c,0x39,0xf8,0x7,0xb6,0x21,0xa2,0x3,0xb8,0x63,0x5f,0xa3,0xae,0xfe,0xe,0xe5,0xd9,0x16,0x79,0x4c,0x41,0xa5,0x4,0xb3,0x59,0x54,0x6a,0x2,0xcf,0xbe,0x8e,0xec,0x1f,0x46,0x84,0x62,0x90,0x9b,0x14,0x1,0xbf,0x7f,0xd8,0x71,0x4a,0x7f,0x95,0xcb,0xce,0x65,0xa0,0xa0,0xf3,0xc1,0x2d,0x9,0x30,0x74,0x96,0x7f,0xb0,0xb7,0xb7,0xff,0xed,0x8e,0x8e,0x8e,0xd8,0xd2,0x56,0x24,0x2,0xb9,0xfa,0x61,0x44,0xcf,0x1a,0xdc,0x5f,0xbf,0x80,0x42,0xfa,0xf6,0xd7,0x28,0xda,0xa8,0xec,0x24,0x72,0x60,0x18,0x21,0x4,0xe4,0x53,0xd2,0x34,0xcd,0xa1,0xe9,0xe9,0xec,0x69,0xbd,0xd,0x4a,0x8d,0x4,0xc8,0x3a,0xf9,0x77,0x0,0x5d,0xe1,0x70,0x64,0xbb,0xdf,0x1f,0x58,0xb7,0xe4,0x7b,0xde,0x17,0x40,0xe,0x6c,0xc6,0xfd,0xf3,0x7b,0x28,0xce,0x2c,0x7c,0x9d,0xe2,0xc,0xee,0xf9,0x1f,0x90,0x83,0x8f,0x41,0x47,0x27,0x7e,0x7f,0x60,0x5d,0x38,0x1c,0x79,0x4a,0x6f,0x6d,0x5f,0xb3,0x8c,0x5f,0x4f,0x40,0x24,0x14,0xa,0xef,0x6c,0xf7,0x59,0x7d,0x7d,0xab,0x19,0x1d,0xdd,0xc7,0xf8,0xf8,0x6f,0x9c,0x3d,0xfb,0x23,0xbb,0x77,0x3f,0x7,0xc0,0xc8,0xc8,0x16,0xc6,0xc7,0x7f,0x63,0xd3,0xa6,0x8d,0xb5,0xf7,0x87,0xf,0x1f,0x6a,0xad,0xfe,0xde,0x8d,0x78,0xb9,0x29,0x98,0xbe,0x72,0xe7,0x64,0xe6,0xa6,0xf0,0xb2,0x93,0xc8,0xfb,0x37,0x0,0x10,0xa,0x59,0x3b,0x75,0x62,0x37,0x1b,0x13,0x7f,0x23,0x1,0x61,0xd3,0x34,0xdb,0x8e,0xfe,0xfe,0xfd,0xef,0x10,0xe,0x87,0xd9,0xb1,0x63,0x17,0x6f,0xbc,0xf1,0x16,0xa3,0xa3,0xfb,0xe8,0xeb,0x5b,0x5d,0xfb,0x7e,0xef,0xde,0x37,0xdb,0xdf,0x1,0xb1,0xb5,0xa8,0xcc,0xa5,0xc5,0x3b,0x12,0x53,0x7f,0x23,0x62,0x6b,0x1,0x30,0x4d,0xff,0x90,0x2e,0xe0,0x7c,0x8d,0x4,0xf8,0x1a,0x72,0x40,0x40,0x4a,0x23,0xdc,0x6e,0xf4,0x47,0x46,0xb6,0xf0,0xf8,0xe3,0x5b,0xb1,0x6d,0x9b,0xa9,0xa9,0x2b,0x9c,0x3a,0xf5,0x15,0x3b,0x77,0x3e,0x43,0x22,0x31,0x46,0x22,0x31,0xc6,0xa6,0x4d,0x1b,0x19,0x19,0xd9,0xd2,0x1e,0x1,0xc1,0x28,0xca,0x4e,0x2e,0x1e,0x1,0xf9,0x24,0x22,0x18,0xad,0x2,0x33,0x7c,0x11,0x5d,0xbd,0x1a,0xb7,0x52,0x40,0xed,0x18,0x94,0x52,0x76,0xb6,0x47,0x40,0x1f,0x89,0xc4,0x18,0xb6,0x6d,0xd7,0x3e,0x4b,0x24,0x12,0x35,0xd9,0xdb,0xb6,0xcd,0xa1,0x43,0x9f,0xb4,0xad,0x2,0xd1,0x11,0x80,0x62,0x7e,0xf1,0x72,0x4a,0x31,0x5f,0x5d,0x13,0xd0,0x75,0x4c,0xd3,0xb2,0x5d,0x36,0xd6,0xd6,0x4a,0xa9,0x72,0x3b,0xeb,0xcf,0x47,0xd8,0xb2,0xac,0x7f,0x91,0x52,0x4f,0xc8,0x81,0x3,0xef,0x13,0xe,0x87,0x6b,0xb9,0xa1,0x65,0xc4,0xca,0x45,0x8,0x84,0x16,0x8f,0x80,0x40,0xa8,0xba,0x26,0xe0,0x79,0xde,0x7c,0x25,0xa8,0x5a,0x11,0xe0,0x2,0x73,0xae,0x5b,0xc9,0xb5,0xb3,0xbe,0x6d,0xdb,0x24,0x12,0x63,0x35,0x70,0x96,0x65,0xb1,0x6b,0x57,0x55,0xfe,0xf5,0xe3,0xc0,0x81,0xf7,0xda,0x23,0xa0,0x90,0x41,0x58,0xf1,0xc5,0x3b,0x55,0x43,0x71,0x54,0x21,0x53,0x5,0x56,0xc5,0x34,0xd7,0xac,0x10,0x92,0x75,0xd1,0x2f,0x3,0xb6,0xe3,0x38,0x17,0xda,0x7d,0xc8,0xbe,0x7d,0xa3,0xbc,0xf6,0xda,0xab,0x9c,0x38,0x71,0x94,0x6f,0xbe,0x39,0xc9,0xc9,0x93,0x5f,0x72,0xec,0xd8,0xf1,0x7f,0xfd,0xe6,0xd8,0xb1,0xe3,0x37,0x91,0xd2,0x94,0x80,0xf4,0x4,0x22,0x3a,0xb8,0x78,0x4,0xf4,0xac,0x41,0xa5,0x27,0x0,0x70,0x9c,0xd2,0x5,0xdd,0x2d,0x56,0xfe,0xab,0x12,0x34,0x85,0x10,0x56,0x28,0x64,0x6d,0x6f,0xe7,0x21,0x53,0x53,0x57,0x38,0x72,0xe4,0xb3,0x9a,0xdc,0x3f,0xfd,0xf4,0xf3,0x9b,0x14,0x2,0x70,0xee,0xdc,0x2f,0xa4,0x52,0xa9,0x96,0x44,0xa8,0xd9,0x69,0x8c,0xf5,0x5b,0xf1,0xec,0x14,0x94,0xec,0x3b,0x43,0x1f,0xe9,0xc3,0x18,0xdc,0x8c,0x3b,0x7e,0x1a,0xdc,0x32,0xd9,0x6c,0xfa,0xe3,0x52,0xa9,0x78,0x6,0xc8,0x68,0x12,0x9a,0xf6,0x2,0x3e,0x20,0x6,0x3c,0x3a,0x38,0xb8,0xfe,0xe0,0x92,0x17,0x43,0x42,0x20,0x57,0x3f,0x82,0xe8,0xdd,0x58,0xad,0x4,0x17,0x5a,0xc,0x5,0xc2,0x18,0x8f,0x3c,0x8b,0xba,0x36,0x86,0x37,0xf5,0x2b,0xa5,0xe2,0xdc,0x5f,0x97,0x2e,0x5d,0x7c,0x5,0xf8,0xa5,0x8e,0x0,0xd5,0x4c,0x1,0xf3,0x5b,0x41,0x54,0x2a,0x95,0x7c,0x30,0x68,0x3d,0x2d,0x84,0x90,0x4b,0xda,0xce,0x16,0xd2,0x88,0x60,0xc,0x39,0x30,0x8c,0x2a,0x64,0xa1,0x94,0xbf,0xfd,0xc8,0x6f,0xd8,0x81,0xb2,0xaf,0xe3,0xfd,0x7d,0x16,0xcf,0xad,0x54,0x92,0xc9,0x6b,0xef,0x96,0xcb,0xce,0x19,0x20,0xd5,0xac,0x23,0x6c,0x24,0xc0,0x3,0xdc,0x72,0xd9,0x99,0x16,0x42,0xc8,0xce,0xce,0x55,0x8f,0x2d,0x69,0x37,0xa8,0x14,0x2a,0x3b,0x89,0xf0,0x99,0x18,0x43,0x4f,0x82,0xdf,0x42,0x95,0x66,0xab,0xd,0xcf,0x4d,0xb6,0xa4,0x0,0x21,0x21,0x60,0x41,0x77,0x1f,0x72,0x70,0x33,0xc6,0x9a,0x27,0xaa,0x91,0x9f,0x38,0x83,0x72,0x2b,0x2a,0x9b,0x4d,0x7f,0x34,0x33,0x93,0x3d,0xaa,0xd,0x92,0x42,0x33,0x4f,0xa0,0x95,0x1f,0x30,0x14,0x8b,0xc5,0x5f,0x8c,0x44,0x62,0x2f,0x48,0xd9,0xa2,0x19,0x5f,0x99,0x7e,0x40,0x25,0x97,0x4b,0x7f,0x9c,0x4e,0x27,0xf,0x1,0xe7,0xdb,0xf5,0x3,0x1a,0x1d,0xa1,0x8,0x30,0x18,0xc,0x86,0xb6,0x47,0xa3,0xf1,0x3d,0x81,0x40,0xe7,0x83,0xff,0x7,0x9b,0xbb,0x58,0x9c,0xfb,0x33,0x93,0x49,0x1e,0x2c,0x14,0x6a,0x8e,0x50,0xee,0x76,0x1c,0xa1,0x7a,0x12,0x3a,0xb4,0x27,0xd8,0x3,0xc,0x58,0x56,0xd7,0x36,0xed,0x9,0x3e,0x60,0x18,0xbe,0xc8,0xb2,0xb8,0x44,0x4d,0x86,0xe7,0x79,0x8e,0xeb,0x56,0x72,0x8e,0xe3,0x9c,0xd7,0x9e,0xe0,0x77,0xc0,0x65,0xbd,0xe7,0xf3,0x75,0x2e,0xf1,0x82,0x5d,0x61,0x3f,0x10,0xd4,0x8a,0xe8,0x6e,0xe2,0xa,0x2f,0x2b,0xfe,0x6,0x57,0x38,0xab,0x23,0x5e,0xd0,0xbd,0xff,0x82,0x5d,0x61,0x1a,0xb2,0x8e,0xa1,0x8f,0x49,0x93,0x1b,0xf7,0x2,0x82,0x95,0x71,0x2f,0xa0,0xb8,0x71,0x2f,0xe0,0xe8,0x63,0xce,0xa5,0xcd,0x4b,0x92,0x85,0xde,0xc,0xad,0x34,0x7b,0x58,0xb1,0xc0,0x9b,0xa1,0x7b,0xe3,0xde,0xb8,0xcb,0xc7,0x3f,0xd2,0xdb,0x54,0x98,0x63,0x18,0x87,0x7d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
@@ -465,7 +465,7 @@ static const unsigned char tree_title_pressed_png[]={
 
 
 static const unsigned char unchecked_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0xf9,0x43,0xbb,0x7f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x14,0x5,0x3b,0xd6,0x6,0x93,0xb9,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xf2,0x49,0x44,0x41,0x54,0x38,0x8d,0xed,0x93,0xb1,0x4a,0xc4,0x50,0x10,0x45,0xcf,0x4b,0x26,0x71,0x2a,0xb7,0x58,0xc1,0xca,0x6f,0xb0,0xb4,0x74,0x75,0x59,0x11,0xbf,0xc1,0x1f,0xf0,0xaf,0xac,0xfc,0x1,0x61,0x11,0x45,0x85,0x5d,0xb6,0xb0,0xf4,0x1b,0xb4,0x10,0xd1,0x42,0xc1,0x65,0x30,0xb3,0x59,0x8b,0x24,0x10,0x10,0xf2,0x82,0xb5,0xb7,0x99,0xea,0xdc,0x79,0xf3,0xb8,0x37,0x50,0x29,0x0,0x9,0x20,0xf5,0xec,0x52,0x9,0x78,0x3d,0xd7,0xa1,0x86,0x33,0x60,0x8,0xec,0x0,0x9b,0x1d,0x26,0x25,0xf0,0x9,0x3c,0x1,0xef,0x40,0xd1,0x6c,0x1c,0x4a,0x2a,0xa3,0xf1,0xe1,0xe4,0x22,0xcb,0xb2,0xce,0xf5,0x45,0x51,0x70,0x7b,0x7f,0x73,0xea,0xee,0x77,0xc0,0x6b,0x0,0x36,0x80,0xdd,0xe3,0xa3,0x93,0x7,0x33,0xc3,0xcc,0x3a,0xd,0x54,0x15,0x55,0xe5,0xea,0x7a,0xba,0x7,0x3c,0x26,0xf5,0xb,0x6,0x22,0x12,0x85,0x1,0xcc,0xc,0x11,0x1,0x18,0x0,0x49,0x73,0x6b,0x88,0x92,0xbf,0x95,0x0,0x21,0xf6,0xe3,0xbd,0x5c,0xfe,0xd,0x2a,0xad,0xff,0xc0,0x96,0x8d,0x41,0x9,0x7c,0xb8,0x3b,0xaa,0x1a,0xa5,0x54,0x15,0x77,0x87,0x2a,0xd2,0xab,0x0,0xa4,0xc0,0x76,0x9e,0xe7,0x93,0x83,0xfd,0xf1,0x79,0x9f,0x28,0xcf,0x17,0xb3,0xb3,0xe5,0xf2,0xeb,0x12,0x78,0x69,0x97,0x69,0x8b,0xfe,0x65,0x7a,0x6,0xde,0x80,0xef,0x26,0x81,0xed,0x3a,0xa7,0x91,0x2b,0x56,0xb4,0xea,0xfc,0x3,0x6e,0x28,0x47,0x29,0x38,0xc5,0x49,0x7f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x2f,0x23,0x2,0xd6,0x7b,0x4b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xe9,0x49,0x44,0x41,0x54,0x38,0xcb,0xed,0x93,0x4d,0x4e,0xc3,0x30,0x10,0x85,0x3f,0x4f,0x6c,0x71,0x1,0x1c,0x12,0x29,0x8b,0x6e,0x73,0x91,0x6e,0x10,0x7,0xe0,0x1c,0x3d,0x7,0x37,0x60,0xcf,0x1,0x10,0x8b,0xf6,0x22,0x15,0xbb,0x2e,0x2a,0xf5,0x7,0x2e,0x80,0xec,0x8e,0xd9,0x38,0x69,0x91,0x48,0x5a,0x4,0x4b,0x9e,0x34,0x2b,0xbf,0x19,0xbf,0x37,0x3f,0xf0,0x4b,0x18,0x80,0xbb,0xdb,0xfb,0x2b,0x60,0x2,0xb4,0x40,0x9,0xc8,0x0,0x5f,0x81,0x3d,0xb0,0x4,0x56,0xcf,0x2f,0x4f,0x1f,0x36,0x3f,0x4c,0xde,0xde,0x37,0xf,0xdb,0xdd,0x7a,0xaa,0xaa,0xce,0x18,0xf3,0x6d,0x76,0x4a,0x9,0x11,0x9,0xd5,0x4d,0xb3,0xf0,0xd7,0xf5,0xc,0x78,0xed,0x7e,0x6a,0xb7,0xbb,0xf5,0x14,0x70,0xd6,0x3a,0xc6,0x2,0x70,0x99,0xdb,0x2,0x74,0xa,0x4a,0x55,0x75,0xd6,0x3a,0x8a,0xa2,0x38,0xeb,0x3b,0xc6,0xe0,0xb2,0xd5,0xde,0xab,0x18,0x63,0x18,0x92,0xfe,0xa5,0x69,0x47,0x9e,0x30,0xd2,0xac,0x8b,0xf1,0x5f,0xe0,0x58,0x40,0x53,0x4a,0xa4,0x94,0xce,0x26,0x9c,0xf0,0xf4,0x74,0xf,0xf6,0x22,0x12,0x54,0xf,0xae,0x1b,0xd5,0x50,0xb2,0xea,0x1,0x11,0x89,0x79,0xa5,0x7b,0x5,0xcb,0xaa,0x6c,0x16,0x40,0x8c,0x31,0x30,0x16,0x60,0x42,0x55,0x36,0xf3,0x7c,0xf,0xbd,0x82,0x95,0xf7,0xf5,0xcc,0xfb,0xfa,0xf1,0x27,0xc7,0xc4,0x5f,0xe0,0x13,0xe5,0xc4,0x63,0x4f,0x20,0x8a,0x2e,0x80,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
@@ -480,17 +480,17 @@ static const unsigned char vseparator_png[]={
 
 
 static const unsigned char vslider_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xdd,0x0,0xdd,0x0,0xdd,0xf5,0x15,0x8,0x9d,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0xf,0xc,0x18,0x82,0xe,0xe5,0x21,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x4d,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0x18,0x68,0xc0,0x88,0x4d,0x50,0x42,0x42,0x62,0x1a,0x3,0x3,0x43,0x26,0x9a,0xf0,0xf4,0x17,0x2f,0x5e,0x64,0x11,0x6b,0xc0,0x7f,0x76,0x76,0x4e,0x14,0xb1,0x9f,0x3f,0xbf,0x33,0xbc,0x78,0xf1,0x2,0x43,0x3d,0x13,0xd1,0x6e,0xc5,0x1,0x46,0xd,0x18,0x35,0x0,0x9f,0x1,0xd3,0x7f,0xfe,0xfc,0xce,0x80,0x8c,0x19,0x18,0x18,0xa6,0x53,0x6a,0x19,0x6d,0x0,0x0,0x59,0x9c,0x18,0xe9,0x50,0xa4,0x59,0x7a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x2c,0x30,0xad,0x45,0x69,0x56,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x87,0x49,0x44,0x41,0x54,0x38,0xcb,0xcd,0x93,0xcf,0x4e,0x13,0x51,0x14,0xc6,0x7f,0xf7,0xdc,0xc6,0x3b,0xd3,0xb1,0xc0,0x66,0x48,0x5b,0x42,0xea,0xc2,0xb4,0x2b,0x9f,0x81,0x7,0x30,0x3c,0x80,0x12,0x57,0x24,0xc6,0xc4,0xc8,0xd3,0xe0,0x12,0x37,0x68,0x7c,0x0,0xe3,0x3,0xf0,0xe,0x6e,0xb0,0x2c,0x68,0x50,0x20,0xce,0x6,0x3b,0x74,0xa6,0x3,0xce,0x3d,0x6c,0x4a,0x9d,0xd2,0x62,0xa2,0x2b,0xbf,0xe4,0x2c,0xee,0x9f,0xef,0x97,0x9c,0x2f,0xe7,0x18,0x2a,0xda,0x7c,0xfa,0xc,0xa0,0x6,0xac,0x2,0x5d,0x60,0x7d,0xf2,0x74,0x2,0x1c,0x2,0x9,0xf0,0xeb,0xd3,0xe7,0x8f,0x53,0x8f,0x59,0x60,0x7e,0x3c,0x4c,0x2f,0x76,0x92,0xe4,0xf4,0x79,0x96,0x8f,0x1a,0x0,0xf5,0x30,0x4a,0xe3,0xb8,0xfd,0x7e,0xa9,0xb1,0xb2,0xb,0x1c,0x55,0x21,0xc2,0xac,0xe2,0x61,0x7a,0xf1,0xe6,0x78,0xd0,0x7f,0x99,0xe5,0xd9,0xb2,0x88,0x15,0x11,0x2b,0x59,0x9e,0x2d,0x1f,0xf,0xfa,0xaf,0xd2,0xf4,0xe7,0x6b,0x20,0xae,0x1a,0xee,0x2,0x7a,0x49,0x72,0xba,0x65,0x8c,0xb1,0xd6,0x5a,0xaa,0x65,0x8c,0xb1,0x3f,0x92,0xef,0x2f,0x80,0x5e,0xd5,0x50,0xbb,0x3,0x58,0xcf,0xf2,0x51,0x43,0xc4,0x22,0xf2,0x9b,0x2d,0x22,0xa8,0x2a,0x59,0x3e,0x7a,0x58,0xc9,0x65,0x16,0x70,0x76,0x3e,0x0,0xd8,0xf6,0x5e,0xc5,0x5a,0xe6,0x64,0xc,0x78,0xaf,0xf6,0xec,0x7c,0xb0,0xd,0xec,0xcf,0x1,0x8a,0x62,0xc,0xb0,0x61,0xcc,0x4c,0xb6,0x55,0x4,0xc6,0x40,0x51,0x8c,0x37,0xfe,0x94,0xc1,0x5f,0xeb,0x3f,0x2,0x38,0x17,0xe0,0x5c,0x70,0xa0,0xa,0xa0,0xb,0xbe,0x2a,0xaa,0xe0,0x5c,0x70,0xe0,0x5c,0x30,0xf,0x68,0x35,0x3b,0xb4,0x9a,0x9d,0x3d,0x11,0xe3,0x75,0x81,0x5f,0x15,0x44,0x4c,0xd9,0x6a,0x76,0xf6,0x5a,0xcd,0xce,0xbd,0x2d,0x9c,0xd4,0xc3,0x28,0xf5,0xde,0xe3,0xbd,0x9f,0x5e,0xde,0x9e,0xeb,0x61,0x74,0x39,0xd9,0x8b,0x7b,0x1,0x87,0x71,0xdc,0xfe,0xa0,0xaa,0x65,0x59,0x96,0x54,0x4b,0x55,0xcb,0xd5,0x78,0x6d,0x7f,0xb2,0x54,0x53,0x4d,0x47,0xa6,0xd7,0x7d,0x2,0x30,0x76,0x2e,0x38,0xa,0xc3,0xa8,0x76,0x7d,0x35,0xee,0x5e,0x5d,0x17,0xf,0x54,0x55,0xeb,0x61,0x34,0x5c,0x6b,0x3f,0x7a,0xb7,0xd4,0x58,0x79,0xb,0x7c,0x3,0xfc,0xd7,0xfe,0x17,0xe6,0x26,0xe6,0x5f,0xd6,0xf9,0x6,0xaa,0x73,0x9f,0xf0,0x6d,0xf0,0x57,0x1b,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vslider_grabber_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x92,0x0,0x92,0x0,0x99,0x25,0xc1,0x88,0x71,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x12,0x0,0x2,0x1f,0xac,0xde,0x45,0xed,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0xa4,0x49,0x44,0x41,0x54,0x38,0x8d,0x9d,0x93,0xb1,0x6e,0x1a,0x41,0x14,0x45,0xcf,0xcc,0xce,0x9a,0x85,0x25,0x44,0x58,0x8a,0x15,0xc5,0x49,0x93,0x2,0xb2,0x2,0x51,0xf2,0x7,0x2e,0x68,0xf2,0x15,0xae,0x22,0xc1,0x77,0xa4,0xe,0x65,0x5c,0xe4,0x2f,0xf8,0xb,0x47,0xb6,0x2c,0x21,0xb0,0x44,0xb7,0x22,0x52,0x9a,0x0,0x82,0x9d,0xd9,0x1d,0x76,0xd3,0xec,0x22,0x40,0xb1,0x8d,0x72,0xa5,0x29,0xe6,0xcd,0xbd,0xf7,0xbd,0x79,0x33,0x4f,0x70,0x84,0x66,0xb3,0x79,0x1c,0x3a,0xc0,0x64,0x32,0x39,0xd8,0xcb,0x7f,0x88,0x2f,0x81,0xaf,0xc0,0x1d,0x10,0xe5,0xeb,0x2e,0x8f,0x5d,0x1e,0x27,0x10,0xdd,0x6e,0x17,0x80,0xc5,0x62,0x1,0x70,0xd,0x7c,0xb,0x82,0x76,0xb9,0x52,0xf1,0x71,0xdd,0x33,0x0,0x92,0x24,0x66,0xb3,0x59,0x33,0x1e,0x3f,0x44,0xc0,0xc0,0x5a,0x7b,0xb3,0x5e,0xaf,0x49,0xd3,0x14,0xe7,0xd3,0x87,0xe,0xbf,0xff,0xfc,0x2,0xb8,0xae,0xd7,0xcf,0xbf,0xb7,0x5a,0x1d,0xb7,0x5a,0xad,0xa1,0x94,0x42,0x8,0x81,0x10,0x2,0xa5,0x14,0xe5,0x72,0x85,0x8b,0x8b,0xb7,0xae,0xd6,0xd1,0xe7,0x38,0x36,0xa1,0xef,0xfb,0xb7,0x5a,0x6b,0x9c,0x33,0xdf,0x29,0xca,0x1e,0xb5,0x5a,0x1d,0xb7,0x54,0xf2,0x9e,0xbc,0xbf,0x52,0x8a,0x5a,0xed,0x35,0xf3,0x79,0x78,0x95,0x65,0xd9,0xf,0x6b,0xed,0xaa,0xe8,0x41,0x3f,0x8,0xda,0xe5,0xe7,0xc4,0x5,0x4a,0x25,0x8f,0x20,0x68,0x97,0x81,0xbe,0xeb,0xba,0xbb,0x26,0xf6,0x2a,0x15,0xff,0x45,0x71,0x81,0x9c,0xdb,0x53,0x4a,0x21,0xb3,0x2c,0x3,0x68,0x14,0xd,0x3b,0x5,0x39,0xb7,0x21,0xa5,0x3c,0x7c,0xc6,0xff,0x81,0x14,0x42,0x0,0x4c,0x93,0x24,0x3e,0x59,0x94,0x73,0xa7,0x69,0x9a,0xee,0x2a,0x18,0x6d,0x36,0xeb,0x93,0xd,0x72,0xee,0xc8,0x5a,0xbb,0x33,0x18,0x8e,0xc7,0xf,0x91,0x31,0xfa,0x45,0xb1,0x31,0xba,0xf8,0x50,0xc3,0x24,0x49,0x90,0xef,0xeb,0x1f,0x1,0x42,0x60,0x30,0x9b,0x3d,0xf2,0x9c,0x89,0x31,0x9a,0xd9,0xec,0x11,0x60,0xe0,0x38,0x4e,0xb8,0xdd,0x6e,0x71,0xde,0xbc,0x3b,0xc7,0xf3,0x3c,0x8c,0x31,0xb7,0x5a,0x47,0xe1,0x7c,0x1e,0x5e,0x55,0xab,0xaf,0x5c,0x29,0x25,0x52,0x4a,0xb2,0x2c,0x23,0x8e,0xd,0xab,0xd5,0x82,0xfb,0xfb,0x9f,0x91,0xd6,0xd1,0x17,0x6b,0xed,0xcd,0x72,0xb9,0x24,0x4d,0x53,0xc4,0x7e,0x86,0xbd,0x61,0xea,0x3,0x3d,0xa0,0x91,0x1f,0x4d,0x81,0x11,0x30,0x4,0xc2,0xfd,0x89,0x3c,0x30,0xd8,0x33,0x79,0x12,0xc7,0xe3,0xfc,0x17,0x9c,0xcc,0xa8,0xb2,0xd4,0xe8,0x7,0x23,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x1b,0x38,0x31,0xdf,0xff,0x9,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x7d,0x49,0x44,0x41,0x54,0x38,0xcb,0xdd,0x92,0x3d,0x6b,0x53,0x61,0x14,0x80,0x9f,0xf7,0x43,0xdf,0xfb,0x11,0x6f,0x9b,0x86,0x1a,0x84,0x3a,0x84,0x98,0x25,0x29,0xd,0x11,0x87,0x40,0x3b,0x64,0x70,0x89,0x6b,0x97,0x6c,0xa5,0x7b,0x6,0xc9,0x3f,0xe8,0xe2,0xe4,0x2f,0xb8,0x8b,0x6b,0x17,0x9d,0x1d,0xb2,0x25,0x43,0x29,0x4,0x41,0x42,0x21,0x43,0x20,0x1d,0x3b,0x8,0x49,0x24,0x2f,0x5c,0xc3,0xbd,0xaf,0x4b,0xb,0xb6,0xb6,0xe,0x6e,0xfa,0x2c,0x7,0xe,0x9c,0xf,0xce,0x73,0xe0,0x9f,0x47,0x3c,0x90,0x93,0x80,0x1,0x9e,0x0,0x21,0xf0,0x18,0x70,0xc0,0xa,0x58,0x0,0x16,0x48,0xef,0x6b,0xf0,0x8,0xd8,0x28,0x95,0x4a,0xcf,0x1b,0x8d,0xc6,0xab,0x7a,0xbd,0xfe,0x26,0x8a,0xa2,0x5d,0x63,0xcc,0xb6,0x94,0xd2,0x2d,0x16,0x8b,0xaf,0xd3,0xe9,0xf4,0x63,0x1c,0xc7,0xa7,0xc0,0x37,0x20,0x15,0xbf,0x4c,0xd,0x72,0xb9,0x5c,0xa9,0xdb,0xed,0xbe,0x2d,0x16,0x8b,0xaf,0x8d,0x31,0x3b,0x49,0x92,0xa8,0xf5,0x7a,0x4d,0x9a,0xa6,0x0,0x18,0x63,0xd0,0x5a,0x5f,0x8d,0xc7,0xe3,0x77,0x71,0x1c,0x7f,0x0,0xbe,0x6b,0x40,0x3,0x9b,0xcd,0x66,0x73,0xbf,0xd3,0xe9,0xbc,0x57,0x4a,0xbd,0xb0,0xd6,0x62,0xad,0x25,0xcb,0xb2,0x5b,0xeb,0xa5,0x69,0x4a,0x10,0x4,0xc5,0x72,0xb9,0x7c,0x8,0x7c,0xba,0x69,0x60,0x7a,0xbd,0xde,0x51,0xb5,0x5a,0x3d,0x99,0xcf,0xe7,0xe1,0x6a,0xb5,0xfa,0xad,0xf0,0x6,0xe7,0x1c,0x49,0x92,0x90,0xcf,0xe7,0xf7,0xae,0x6f,0x83,0x4,0x84,0xe7,0x79,0x1,0xa0,0xfe,0xc6,0x82,0x2,0xb2,0xc1,0x60,0x70,0xb1,0x5c,0x2e,0xbf,0xd4,0x6a,0xb5,0x97,0x9e,0xe7,0x6d,0x65,0x59,0x86,0x73,0xe,0xe7,0xdc,0x6d,0x3d,0x42,0xe0,0xfb,0x3e,0xd6,0xda,0xf3,0x7e,0xbf,0x7f,0xa,0x2c,0x15,0x90,0x1,0x76,0x36,0x9b,0x5d,0xe,0x87,0xc3,0xcf,0x95,0x4a,0x85,0x42,0xa1,0xf0,0x34,0xc,0xc3,0xd,0x21,0x84,0x0,0x90,0x52,0x22,0xa5,0xc4,0xf7,0x7d,0xb4,0xd6,0x57,0x93,0xc9,0x24,0x1e,0x8d,0x46,0x67,0xc0,0x8f,0xfb,0x34,0x46,0x5a,0xeb,0xed,0x76,0xbb,0x7d,0xd0,0x6a,0xb5,0x8e,0x85,0x10,0xcf,0x8c,0x31,0x5b,0x4a,0xa9,0x3f,0x6a,0xbc,0x8b,0x4,0x2,0x20,0xba,0x8e,0xfa,0xa1,0x47,0xfa,0xf,0xf8,0x9,0xc2,0x2d,0x88,0xfe,0x7,0xd8,0xc3,0x3a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vslider_grabber_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x92,0x0,0x92,0x0,0x99,0x25,0xc1,0x88,0x71,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x12,0x0,0x2,0x21,0x6d,0xbf,0x58,0x46,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x30,0x49,0x44,0x41,0x54,0x38,0x8d,0xa5,0x93,0xb1,0x6a,0xc2,0x50,0x14,0x86,0xbf,0x63,0xe2,0x90,0xd0,0x2e,0xc1,0xad,0x8b,0xad,0x60,0x9e,0xc0,0xbe,0x41,0x7,0x33,0x38,0x7,0x1d,0xba,0x74,0x2a,0xe8,0xc3,0xe8,0x68,0xc1,0x49,0xc8,0xec,0x10,0x9f,0xa1,0x8,0xee,0x71,0xcf,0x52,0x4d,0x70,0x73,0x8a,0xb7,0x83,0x37,0x72,0x11,0xb4,0xa1,0xfe,0xe3,0xe5,0x7c,0xdf,0xbd,0x1c,0xfe,0xb,0x77,0x46,0x2e,0xf,0x7c,0xdf,0x7f,0x2,0x86,0x40,0x17,0x68,0xeb,0xe3,0xd,0xb0,0x4,0x26,0x49,0x92,0xa4,0x57,0x5,0xbe,0xef,0x7f,0x0,0xe3,0x30,0x1c,0x38,0x9e,0xd7,0x40,0xa4,0x6,0x80,0x52,0x47,0xf2,0x7c,0x47,0x14,0xcd,0xf,0xc0,0x28,0x49,0x92,0xaf,0x92,0xb1,0x4c,0xb8,0xd9,0x7c,0x9e,0xf6,0xfb,0xef,0x75,0xd7,0x7d,0xd4,0xb0,0x0,0x82,0x48,0xd,0xd7,0x7d,0xa0,0xd3,0x79,0xad,0x6f,0xb7,0x3f,0x3d,0xdb,0xb6,0xd2,0x2c,0xcb,0xd6,0x0,0x35,0xe3,0xd9,0xe3,0x20,0xe8,0x21,0x62,0x71,0x2d,0x22,0x16,0x41,0xd0,0x3,0x18,0x6b,0xe6,0x24,0x0,0x86,0x61,0x38,0x70,0x6e,0xc1,0xa6,0x24,0xc,0x7,0x8e,0xde,0xd3,0x59,0xd0,0xf5,0xbc,0xc6,0x9f,0x70,0x19,0x3d,0xdb,0x35,0x5,0xed,0x72,0x61,0x55,0xa2,0x67,0xdb,0xa6,0xe0,0xdf,0x29,0x5,0x1b,0xa5,0x8e,0x95,0x21,0x3d,0xbb,0x31,0x5,0xcb,0x3c,0xdf,0x55,0x16,0xe8,0xd9,0xa5,0x29,0x98,0x44,0xd1,0xfc,0xa0,0x54,0x51,0xe1,0xf6,0xa2,0x2c,0xd4,0xe4,0x2c,0xd0,0xf5,0x1c,0xc5,0xf1,0x82,0x5b,0x12,0xa5,0xa,0xe2,0x78,0x1,0xa7,0x36,0xa6,0x60,0x34,0x31,0xcb,0xb2,0xb5,0x6d,0x5b,0xe9,0x6a,0xf5,0xfd,0xd6,0x6a,0xbd,0xd4,0x1d,0xc7,0x41,0x44,0x34,0x78,0x24,0xcf,0xb7,0xcc,0x66,0xd3,0xc3,0x7e,0xbf,0xff,0x34,0xab,0x7c,0xf7,0x67,0xba,0x3b,0xbf,0x4d,0x78,0x75,0x34,0x1f,0x21,0x5d,0xa6,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x1c,0x11,0x3c,0x2c,0xf1,0xa2,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x93,0x49,0x44,0x41,0x54,0x38,0xcb,0xdd,0x92,0x3f,0x4c,0x13,0x71,0x14,0xc7,0x3f,0xef,0x77,0x7f,0x5a,0xae,0xde,0x1d,0x57,0x3,0x47,0x13,0x19,0x1a,0x48,0x14,0x2,0xc,0xe2,0x62,0x80,0xc8,0x40,0x22,0x31,0x71,0x20,0xec,0x18,0x77,0x7,0x27,0xb6,0xe,0x2e,0x2e,0x32,0xe1,0xc6,0xc2,0x5a,0x7,0x9,0x21,0xe,0xdd,0x88,0x9b,0x61,0x91,0x34,0x6a,0x17,0x63,0xe2,0x60,0x28,0x10,0x4c,0x28,0x96,0x96,0xbb,0xde,0xfd,0x5c,0x20,0x51,0xfe,0x98,0x38,0xea,0x67,0x79,0xc9,0x4b,0xde,0xf7,0xbd,0x7c,0xbf,0xf,0xfe,0x79,0xe4,0x8a,0x9e,0x2,0x32,0x80,0xb,0xe4,0x0,0x1b,0xd0,0x40,0x13,0x38,0x4,0x8e,0x81,0xe4,0x32,0x1,0xb,0xf0,0xc3,0xe1,0xa1,0xfe,0x81,0x7b,0xd3,0x77,0x8a,0x53,0x93,0xf,0x6c,0x37,0x1c,0x51,0xe6,0xb5,0x1e,0x65,0x2a,0x1d,0xff,0xd8,0xa9,0xd6,0x3f,0x54,0x5f,0x57,0x4a,0xa5,0x32,0x70,0x0,0x24,0xf2,0xcb,0x56,0x27,0xeb,0xfb,0xc5,0x87,0x4b,0x2f,0x9e,0xe6,0xc2,0x81,0x99,0x54,0x77,0xdf,0x68,0x35,0x62,0x23,0x6a,0x76,0xe8,0xc4,0x29,0x22,0x90,0xf5,0x6c,0xdc,0x20,0xda,0xdd,0xd9,0x7e,0xfb,0xbc,0x52,0x2a,0xad,0x2,0x47,0x26,0x60,0x2,0xdd,0x37,0x67,0xef,0x4f,0x4c,0x3c,0x59,0x5c,0x6a,0xb7,0xbc,0xc1,0xef,0xdf,0x4e,0x88,0xdb,0x47,0xa4,0x89,0xfe,0xed,0xbc,0x4e,0xd4,0x6,0xb2,0x61,0xdf,0xc8,0xd8,0x3c,0xb0,0x76,0x26,0x90,0x99,0x7b,0xb9,0xfc,0x28,0x1c,0x9d,0x7a,0xb6,0xf7,0xa5,0x95,0x6b,0x1d,0x36,0x2f,0xc,0x9e,0xa1,0x53,0x4d,0xbb,0x11,0x11,0x14,0xa,0x63,0xa7,0xde,0xa0,0x0,0xb1,0x1c,0xc7,0x41,0x30,0xb4,0xfe,0xfb,0x14,0xc,0x20,0xfd,0xb8,0xb1,0xf1,0xe9,0xa4,0xb1,0xff,0x7e,0x70,0x7a,0xfc,0xb6,0xd9,0xe5,0xe6,0xd3,0x58,0xa3,0x53,0xcd,0x79,0x41,0x51,0x82,0x13,0x64,0x30,0xa5,0xbe,0xb5,0xfd,0xaa,0x5c,0x6,0x1a,0x6,0x90,0x2,0xc7,0x7b,0xb5,0xda,0xd7,0xda,0x9b,0xf5,0x4a,0xf1,0xee,0x2d,0xf2,0xfd,0xd7,0x7b,0xbb,0x7c,0xcf,0x17,0x11,0x41,0x40,0x44,0x30,0x2c,0x85,0x13,0x64,0x70,0x83,0x68,0xb7,0x5e,0xdd,0x5a,0xf9,0xbc,0xb9,0xf9,0xe,0x88,0x2e,0x8b,0xd1,0x33,0x2c,0xab,0x67,0x7c,0x61,0x61,0x72,0x74,0x6e,0xfe,0x71,0x92,0xd8,0x5,0xc3,0xce,0xe5,0x95,0x69,0xfc,0x31,0xc6,0xf3,0x28,0xc0,0x1,0xbc,0xd3,0x6a,0x5e,0xf5,0x48,0xff,0x1,0x3f,0x1,0xa3,0x8a,0x90,0x14,0xe9,0x66,0x95,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
diff --git a/scene/resources/default_theme/toggle_off.png b/scene/resources/default_theme/toggle_off.png
index 3e92aa0ecee1e21ec1368f3b1d103f5fe9fbe443..aa1c96e5a07fc82af3eb2792fc3a36ad41094611 100644
GIT binary patch
delta 1554
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
VU*x>K#lXP8;OXk;vd$@?2>>f?-qrvB

delta 667
zcmX@hbC-33mZ2Jh8iQIS|Gg3h1_sUokH}&M25w;xW@MN(M}mQYfxX1j*OmPqr-(R{
z*h>cSgo)AW^-QjwE{-7?jc;eh`(F-_XrI4%+SW5x%hu#_O>Bwoty4_UiIGZvq;6<<
z%-d*rokB}?KF@?)qf<E>R7#I`@7ig4x8=<PwYSCBzrQ_KUAKQ<di^~|Kfh&yov(!g
z7<C-HPyS!;@jzXG!LGp4<3*>m_5tGuf(b?2c{m!^A4p#&kx<Vl?Js9vn;ZT%)xjg>
zPtjBk0gjT`^h{6p%ad*gc#F7x`tjt)@rM@=YCkxgp%)p+&a*pf`ng@{ERGFtzEA9u
z72t4L*bt}_q;+?3gpO9MeP`yZq}trQB^4zJ6E4h2+snYw^gcw3zaWQw;SUuLmA8J<
z_wA1x_$<v{F4(3xE!DC9)I`6xwwkJ&^b2LD8}L}>&egg*;d#}LzSEW4SMS-K=am?g
zRPZgdyZwH)*E2o2WfBuajq(q?t^0STAvN;K_pIcN$Lc04a8!K!^fThm+u7wSH@@Dm
zfsN-#eZ_yyhPiijUsZ2ixWT0Hx~T1`LsASEa%z@bf6cg2(0X_D;X5yc<vHs8yZ`pK
znk7iBvPxKZpC$Wi?y09nPm3zwyj-o4*}%Exj@MG@OE>bFHgazL^(`WYEv&<o&r_~Z
zV8@KDU0h8HGj3cm-twPy<1t0<T9$vTI~hOUJFsVFMnlJPv5Ixe_pEqcb$H>4J)VE%
z6j~faSk{(tA1}Lc=SE0Wh*IX(=#HityW=@C**q9d@9Ka5d;6!^f6u#|aJX!;G<$jC
zEVV!p$5RFRnGP&5rTa?t-mcoa=U2g3zq2fj+DW~Oqa~Ajb9`F;**ees*Pk$X^5on)
a#%#WWx34`ovWtO%fx*+&&t;ucLK6TB=Px$^

diff --git a/scene/resources/default_theme/toggle_on.png b/scene/resources/default_theme/toggle_on.png
index a49c234f51206926ee4bf2aa1f39ae41a0e9f180..0a69d36ae894b423af2d41f2a28a42f50207b4a2 100644
GIT binary patch
delta 1559
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

delta 766
zcmcb_v!88(mZ2Jh8iQIS|Gg3h1_sUokH}&M25w;xW@MN(M}mQYfxX1j*OmPqr-(R{
z(7W8rl@p`Y>zS5&x;TbpG`^kb>n|KA(l&plUyk>&prhM7rDHdKNzT;h{KKB?#PQ!j
z@JMeU6E|yETmO#0{|uQ5Dr_o$7&9W81k3YyRCL*_Jl9?}db&&E_LM@VjXRT-=cZr1
zSN!Zu^}UyK&&+A+_m5s|v9FvV(1D#v@8f?_#*jv(00ytE4fW4FdYHC1zIN#7PHo_<
zVJ@>c%pkj?@b$B~H$#j>ubG?;W?mKA{WzKX^d<q0=w&`40dKN3`1Z;F`LpMDrpS+5
zGai{ZFgLACS#{XN*XQz-H7`u2dbI|<WPj?#T3D1cTS1VO)iv~DX>4a~cPWFTjIA{<
zLx73z=RK7TSzEn!2C3Cc?RBydTOX^N$-(lo*{1c7U~KsA1F7D-B|n@O;5gE$An2bk
zOYOV-7w@(E_e@a~^e-r>=n#0fUoZ5P<m?68zNeb=@6YBscPC2Me8JTpY$nAM*1hiW
z@7cI*->F-_v>pp5zu3j+P?p{NTz}rx;?2?0MN_I=g4ufPWEm3{)K6&qSML~N8W7Ly
z@qO9LckiYxzK}f2Na616w7Pe^ZHWmIY{i>De_2xf>SKBS{m&^S5wkq>KR%J$u<O&r
z01Kb^`?mV0yq9V+o0*$c+Ss_L2q_A68rT@Qlo?lRr9b=1)88iNCHPX+kJ-uLc_sVV
zb7vN>;+lDs)u@~M>sGh2^8Fk3?p3b$Uan)cv3kwp8X*(L$9uGnCQS_2UmlZeTVDNo
z{&KbDGiS~DmpxT3DdBs>@p`_Dtqoz1r7vVLcG+%CsMJ*6`|VTEvO<kVUf%KTZyQ^k
z^yVweb#LDG$uaA1f`NzLeCI$>k)wB6%$ZwKBU_vl&$lZzIy5|3s?h3murB?3j#9}^
zr)^)3bIxIlaH!0$Uq8ib*`ZzQ;#bU62srj`qv2B#&s)h_d*Zpb{Qb{lXJ_~Jtp47H
WC;IX-Svd?03=E#GelF{r5}E*j)l7W=

diff --git a/scene/resources/default_theme/unchecked.png b/scene/resources/default_theme/unchecked.png
index 39a70e60038f24af482dea3832f45b1adbb2d466..f8710d03df11f7bc5b6b2166c47dfe83074bcbd8 100644
GIT binary patch
delta 315
zcmeBTZe*UIW%!@rKg0h8dzVjUU|`@Z@Q5sCVBi)8VMc~ob0ioT7}!fZeO=k_bMuPn
zD>GfI_MRB6QUB7@#WBR<^xMh4euoVNTJ8OF3K?aDG`sVPC*}#TKajCyH%~avDA4^)
zNp!cK)>n4DhBtjTEixy1M6r0!Gtu5Jx!>IWgSSM(?%Th$6PUI*aGqd@Z?xUO5_VqS
zU*62#=iWVY{@Zt}R;@ZG@j185i&K#Es_*6x*T3>qysgXHzPtXbNWnF$V@w4zZ!?u}
zd4-l<v+7!8@!I;>gH2cOt(HiZnDlRHru#gDOKZA6#y^N~2=-bs<(%4_4_`|7zbOfY
z@UN4;8nEdVqhM#{(rVVzt8&B~dJGN35}ZQKKG*Q?ZJPT1>zUubKB^x-68}K>>5*iA
Ug)Y4Y1_lNOPgg&ebxsLQ0O-Jj8UO$Q

delta 325
zcmZo<?qZ&xWyk;mKb?2iGcYi47I;J!Gca%qgD@k*tT_@43=Hfgp1!W^_c#SbSgo(I
zP2M>%TBH7xr;B5VMep0m8@-MM2)Lg2Rx8xn9&zwg{)R0jrICXB56XX7zvd5PqM&PQ
z?6wVGq_+rMbUK)7usO0@ML^(F)7I@XU)`zvyu&;|lYvv=>zg3X3ft=o+l&)9-Z0FT
zRa5=IX~X#5;bM-Am)7Es51%NV-gNG(YhXcjeetVz<p;7E>dhMNK3+VT-T3esE8Y;%
z(5J7ecCp*2edT6T5^7~U!z0Kj!Qfe(-7#tZR0hRwkN3v><JDUG|G>0fN6wlZ)~lqJ
zhKQE8Yh7B+u;f75yyugf|9-5TuW?>{^X8|YUJF%ZPS5QAms-Vkui?E~<6Eoc6Sc#(
ay!ykOr{S(?anutWP7I!|elF{r5}E+VE{NX%

diff --git a/scene/resources/default_theme/vslider_bg.png b/scene/resources/default_theme/vslider_bg.png
index 5472bb366f2421510a5c171fbd7cda4c61b6b6dc..d58d4b16591ecc2ee8539eb50b610cd3451ca0ce 100644
GIT binary patch
delta 476
zcmaFLIG<&Lmf?Sf{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&&?~Q
zW3bjWGi+kCdOc&ir;B5V#p$z?&-)1niX5x|e&?9=<&6i@JffXm9onKjzmeU*ra>rN
z<=BxEmmdh3XVfq}X8ypJw?QW(K;aylb;&a3bGA8Nb1x+=(%%0>=iU7G)92_vm(aRZ
z^NVKz+Zv|WgxXIfOfpQIA6{R6-XGi_nNVlrqhB`Z$(PD${Zb6|Uk$t-@AzA{a^og$
znNY<;YaS(5eSB7Np?>Dmo0~dB1+^pR>B{r}T7T)w^K6B6Qtz0mJd1Xv_H4WswJNn|
zqy41!`VDbc19me<oc|Q)d_?KfY+a=lT9I~D5hqi{3d-ylZhVV78ucuNr(*rLH#Hl0
z-<)UcO5)j&c*bX2D9bU2z@B>Ze^U;|zqV(x5PuL;uz+g;_dcyv4`K=)#2D~rm|Aa{
zHP=?~acN_`sEg0dtg>%WXV2}`opa@|#@Bm~_s);IH}7>~iRI1iYR2}$JO37}N{yTr
z;vIVWYDI4SrjTG?_hr{>nGDMGEVvG@D62Jn7Z)qe9}@aH(Ih6@zH0lGh)V7n1?E53
j|A{|SdlrA~C)=vx`5$sWgiA9pFfe$!`njxgN@xNA5ct_G

delta 159
zcmbQw@|1Ccmf>B7y9{@~igL_lU|`@Z@Q5sCVBi)8VMc~ob0ioT7}!fZeO=k_af<Ns
zNHp<1Rh$^Dp3LCu>Eak-(VLtgk#V5IH^9j$Ns5`-S#8#bFXH-fDT3Jt>dVUfL^jU1
z-*3F9;v<u@t?<RXql|965~d9E886rW`*W_LM^Zv!S#XwQE(1g49Eq0!OCqZn7#J8l
MUHx3vIVCg!0Q9>vO8@`>

diff --git a/scene/resources/default_theme/vslider_grabber.png b/scene/resources/default_theme/vslider_grabber.png
index 988c25d9dd8443f441c5fba90c069ce41c9b42f7..50ef5680da7820c0ec8bbc41efbb39bdc00a0da3 100644
GIT binary patch
delta 465
zcmdnPGL>b5mf?Sf{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&&?|;
zZDDx-Kj*|~jrv+o7sn8b(|0G?W(OyVG|d0*eE+v#{_HlX7OR#Ss+zol?GDx{1)bT`
zbCy=KowR@P=!yQ0?rib7vYS+$HCY^;6rB}htvNhZ^kWY1UGL4kZ5v<SFCBKiIsE5}
zAIx{RnJ~G5aUO%>2Z@3MToDXn9`Cb1aNN+C>UCba_t@&Hz5nXfx)#MIpV>C$lCD_y
z`pYlBB+DFMe!yHobiWU8(axBax8LpqN%R_8drn&MwaRzaG6sp{3sLdC#~+s$%G5LL
z%XVO%eKxIl|K*o^!oBuxxR$h5_4KCb*Gn_K1Xzw1?X2Ob*_D}4wfA1&)+pPV=bt~!
z+WKql2e#)jo|7h=fBt=4eSR}b%kxUc1^<pUF>N}SP_QvZZ~v97t<&c{&rOYNE9QHC
zC)d{L!Ed{3w?5bHujkScoxoUTHanKD{qXszUad|GKbY_w=2dKAm=L72^vL(xE!V;)
zpHz|SbxS|c|J%eZ>h;^Q-L)68w)V9OobNG=_F8G5wWphfNnuytuZ8Zv_<x9U9@6dj
V$A06m6$1kUgQu&X%Q~loCIIbj(9{3`

delta 504
zcmbQrvWI1Ymf<9ZNenYp4|WtXFfecyctjR6FmMZlFeAgPIT8#E4D2PIzOL-|IE5IP
z<k#GDeLFE)qkf5}i(`mI@7&27^Q0U_T+g35H>*|EC8A68sOMy+O-zBG*!40#iLO&R
zSiXcWHRg%_4{rBuI*J=ywkrkAVrZIsQ?~5#8zqO0y+unkpPk+NeQ%|)e?d#y=1Li>
z11Uz9H%`}g=r^uEAS>|nwO)U$oVvi>Jn@F3NsI-&HQY^QJA>*!7Tz^xn52@nInr3p
z-sQl7sOrse>pd@vJipw|xBveirXB09pWnYdN_KnH+J#e`I2r|*mWn(rYVGdczV6z^
z=N4uQ-~Zkol|9G!zUC>ptx>YuLq5&hvp=XS>aFSL%8IF}H~F*Qu6p5U&vEPN^CPTY
zs{INX(;N4_-nCopo0jN**TVY7Ik$to6gTTIXNd4xvs!LfTxwHu?0=((6NArW6}!kO
z#mh5iz0;D&HG4gox9Hu8sNKdAeaHDH8vb(KXt?V~z+n~73GZLaGdd+0%(neBr_*rO
z%{PJx4=nt4+|4Vzx5xVUXPX|w?NROzYvkfWSFexJR1Nalq@&!&yZUO=@89z$+FZLR
zp8fW0(M}cL;3IWydlO$V+b)<W@7pM7z;ftsr;Wi4<4U39kN=3zIkRHZl^5*F3=9km
Mp00i_>zopr0Ft}mGynhq

diff --git a/scene/resources/default_theme/vslider_grabber_hl.png b/scene/resources/default_theme/vslider_grabber_hl.png
index f319df3319250dc03d8e934aadd8f4aeeeb2474b..93eba4b17435193d013e15332ac08d0df64f58c2 100644
GIT binary patch
delta 487
zcmX@XyqaZ#mf?Sf{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&&?|;
zBWR=ZanZzRjrz%+E{-7<r|(X(_Yp1>Id1>Hygq8(J=t((cVS5>4-qDwM@bDQ9Fz<T
z72Zgcv#W38)6+A0c<fLVJEtPw-HzFb6HT(jlOH8$2>57Bo3{Jj-x!6!e={szrB|Nx
zzW04^&3^uWl~20nF&Q;*KVgu*;2><l(%1OJh>`ol;fD+VHCESOF7FDS%%5W}6ZmYa
zT&kAr{~If>*@wi3do498U{LvVI!yib@1yPB`tzP0YMdETem}!BNja<R#Su-V314&W
zDBQYxv+nnvAg#4b?rI54cg@q^`}^2L#$;{ZbMXCrzmD7POFI9(-Q#zKZByd?6E|!&
zl&MXaS-ta*hRocmZQqwp&90X<)90DDFxYpupr8m>^74BN7&gircQn}Y@3#n#!rvVm
zKfYYD@qb-G)t_xQpFX=Bu{ii_rDI@|aEigweOv#oieZyto4|Cudh4z0w`PC!`uI-w
z)8FgWyKByi3pzTu80fSLrxY}2Y>&Ge^>fe8pL`v9-4~5@R;Sk_CKi?C{VSYwL!0&R
vxu;Vz{}>+otZ{&G&*iMRuO9yy?HLz$O%QpRHr1Jdfq}u()z4*}Q$iB}*FfHG

delta 387
zcmZ3@a)Nn+mf<9ZNenYp4|WtXFfecyctjR6FmMZlFeAgPIT8#E4D2PIzOL-|IE5IP
z6m$1SxJ``Ks5kI*aSXBOT{?MV)}a8Aw*ASECS1@vxVC$3!n_0f9NCR6*kyN>XuUZ6
zBIBUvi8liC7jnESJRjs+P~5e>*}O<_%ff$;pVr*pEAx-L+)a<a=6*d>n}c}9>&Lts
zSkycxEeU7c_r9Ltv4M=myz352*cyV|Kh?O4oaH~D;W=sjq>VoHJ8ss@`}X^N>Gj$x
z8yK2Ac(2zkxLmn5f4jZy?QNHIPG4g%eSGt=!VATuLR}>>#|z97+0RrM+7c}a@(wOj
z;bHH)cRBLH*FDGP7f9OPHf4QVlo+}w{r0j4_cd9im-bCnwB2pUdfMiGsMw2}OEqV>
zT>P^jB=F(4MLJiW=v??JbM&KoQ?$@hu16J&%gvT0m>8bkv^6*SW!Bff*Ru9rkv;C{
uVp5@Ue*2lU%ZKas|2J7(^F4i+^?u)qQWJT_*kue13=E#GelF{r5}E*e#IC9U

diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index fdf1692495..896b4fb2fa 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -124,7 +124,7 @@ Node *SceneState::instance(bool p_gen_edit_state) const {
 					ERR_FAIL_COND_V(!node,NULL);
 				} else {
 					InstancePlaceholder *ip = memnew( InstancePlaceholder );
-					ip->set_path(path);
+					ip->set_instance_path(path);
 					node=ip;
 				}
 				node->set_scene_instance_load_placeholder(true);
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 5f5f554efc..8b2eb603e5 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -5560,9 +5560,9 @@ EditorNode::EditorNode() {
 
 	Globals::get_singleton()->set("debug/indicators_enabled",true);
 	Globals::get_singleton()->set("render/room_cull_enabled",false);
-	theme->set_color("prop_category","Editor",Color::hex(0x403d41ff));
-	theme->set_color("prop_section","Editor",Color::hex(0x383539ff));
-	theme->set_color("prop_subsection","Editor",Color::hex(0x343135ff));
+	theme->set_color("prop_category","Editor",Color::hex(0x3f3a44ff));
+	theme->set_color("prop_section","Editor",Color::hex(0x35313aff));
+	theme->set_color("prop_subsection","Editor",Color::hex(0x312e37ff));
 	theme->set_color("fg_selected","Editor",Color::html("ffbd8e8e"));
 	theme->set_color("fg_error","Editor",Color::html("ffbd8e8e"));
 
diff --git a/tools/editor/icons/icon_back.png b/tools/editor/icons/icon_back.png
index d60e3b264052764929a4d998c2920a7dda8a57fc..f7e507d92b914796f42631d4f35d8c40fe5f777a 100644
GIT binary patch
delta 141
zcmX@dxP?)%Gr-TCmrII^fq{Y7)59f*fq{X8fq_AQgN=cKLA%SYcA}m^@_lYzaRm+y
zgD;;M7#JKqT^vI+&L<}*Fh~@7{`vp^KaU@)f#({o395!73%nO;98lv7Z}6Vf*x1-8
vIA5huP2efpq8i5#3jxtdEq7e37#PeC89MuH?-F8QU|{fc^>bP0l+XkK9H}U<

delta 167
zcmdnOc#cu8Gr-TCmrII^fq{Y7)59f*fq_8)ggMw47#QR~|4(FKU|=i`a(7}_cTVQz
zL`8#w+gzdy3Rb5su>>$MF!*`8IEGl9PEJ_B{^S4u|B^99K2tK(G8h!kR`4pg8T&DJ
zT<y8a5M+`p;jk)=hgm{W(pST%LB@Flo04YRgC4ge-h;CzoZu8@^SaFXmytpEzkE?U
TXJQxw0|SGntDnm{r-UW|9Re}x

diff --git a/tools/editor/icons/icon_forward.png b/tools/editor/icons/icon_forward.png
index ca6838ae9e3aa17d225eab39494419c8a1635c98..14e8bc9a5a4d3d17dc2f5c8c281ac9d55e100172 100644
GIT binary patch
delta 152
zcmX@kxSvt6Gr-TCmrII^fq{Y7)59f*fq{X8fq_AQgN=cKLA%SYcA}m^-hFOfae2K(
zkE4wk7#Ms!T^vI+&aXXxQ1E~Phs#BN)208p-eeXR9n)Adz2I-Y!$Y%4ZA&hGjakSl
zd+OB^R%@^C6%7UU8>AVO9(ju2<~5#{(93?~F?-0z`IU^Dy5v{sF`f9pz`(%Z>FVdQ
I&MBb@0K>vH8vp<R

delta 160
zcmdnbc$`tMGr-TCmrII^fq{Y7)59f*fq_8)ggMw47#QR~|4(FKU|=i`a(7}_cTVQz
zL`8$l+gzdy3g%mqE8a3NFt~fVIEGl9PEJ_B`s4rq|B^{pjRLbcgqP|iF1ljvGo_7F
zcq!v)m&`X4QW%t#7jxcZOStT_g>i?8a4Lh{Sr%S}B{Q`u6CW@#WJkysEx$EImw|zS
N!PC{xWt~$(699nKGVuTa

diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 549a3f7ffb..d6eae51fbd 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -3514,6 +3514,7 @@ PropertyEditor::PropertyEditor() {
 	tree->connect("button_pressed", this,"_edit_button");
 	custom_editor->connect("variant_changed", this,"_custom_editor_edited");
 	custom_editor->connect("resource_edit_request", this,"_resource_edit_request",make_binds(),CONNECT_DEFERRED);
+	tree->set_hide_folding(true);
 
 	capitalize_paths=true;
 	autoclear=false;

From 8adc4ef65b76ee0e8a5fdf6c773d47716fa8511f Mon Sep 17 00:00:00 2001
From: Ariel Manzur <ariel@godotengine.org>
Date: Sat, 14 Nov 2015 11:14:17 -0300
Subject: [PATCH 60/78] windows crash and bind placeholder method

---
 platform/windows/os_windows.cpp | 6 +++---
 scene/main/node.cpp             | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 438a5a6903..55452052e4 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1350,7 +1350,9 @@ void OS_Windows::finalize() {
 		memdelete(main_loop);
 
 	main_loop=NULL;
-	
+
+	memdelete(input);
+
 	visual_server->finish();
 	memdelete(visual_server);
 #ifdef OPENGL_ENABLED
@@ -1377,8 +1379,6 @@ void OS_Windows::finalize() {
 	memdelete(audio_server);
 	memdelete(sample_manager);
 
-	memdelete(input);
-
 	physics_server->finish();
 	memdelete(physics_server);
 
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 631dc8dcc7..97c36ff71b 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2039,6 +2039,10 @@ void Node::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("duplicate:Node","use_instancing"),&Node::duplicate,DEFVAL(false));
 	ObjectTypeDB::bind_method(_MD("replace_by","node:Node","keep_data"),&Node::replace_by,DEFVAL(false));
 
+	ObjectTypeDB::bind_method(_MD("set_scene_instance_load_placeholder","load_placeholder"),&Node::set_scene_instance_load_placeholder);
+	ObjectTypeDB::bind_method(_MD("get_scene_instance_load_placeholder"),&Node::get_scene_instance_load_placeholder);
+
+
 	ObjectTypeDB::bind_method(_MD("get_viewport"),&Node::get_viewport);
 
 	ObjectTypeDB::bind_method(_MD("queue_free"),&Node::queue_delete);

From 14b95797485d3d17b8e68cf0a811a59be26f06bb Mon Sep 17 00:00:00 2001
From: masoud bh <masoud.bh@chmail.ir>
Date: Sat, 14 Nov 2015 20:40:22 +0330
Subject: [PATCH 61/78] Skip META-INF from Android Template

---
 platform/android/export/export.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index f8fc03ec61..1deeb3457a 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1123,6 +1123,10 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
 		if (file=="lib/armeabi/libgodot_android.so" && !export_arm) {
 			skip=true;
 		}
+		
+		if (file.begins_with("META-INF") && _signed) {
+			skip=true;
+		}
 
 		print_line("ADDING: "+file);
 

From c1fdc3b5d13d0ff3416a0194b576000dfc866374 Mon Sep 17 00:00:00 2001
From: Aren Villanueva <arenvillanueva@yomogi-soft.com>
Date: Mon, 2 Nov 2015 10:55:15 +1100
Subject: [PATCH 62/78] Compile fixes for mingw msys2. The drivers directory
 has way too many source files being compiled for a single library file. The
 command line length limit was getting hit.

---
 drivers/SCsub | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/drivers/SCsub b/drivers/SCsub
index bc46bf2cec..fd77931a29 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -64,26 +64,33 @@ if env['vsproj']=="yes":
 	env.AddToVSProject(env.drivers_sources)
 
 for f in env.drivers_sources:
-	fname = ""
-	if type(f) == type(""):
-		fname = env.File(f).path
-	else:
-		fname = env.File(f)[0].path
-	#base = string.join(fname.split("/")[:-1], "/")
-	fname = fname.replace("\\", "/")
-	base = string.join(fname.split("/")[:2], "/")
-	if base != cur_base and len(list) > max_src:
-		lib = env.Library("drivers"+str(num), list)
-		lib_list.append(lib)
-		list = []
-		num = num+1
-	cur_base = base
-	list.append(f)
+    fname = ""
+    if type(f) == type(""):
+        fname = env.File(f).path
+    else:
+	    fname = env.File(f)[0].path
+    fname = fname.replace("\\", "/")
+    base = string.join(fname.split("/")[:2], "/")
+    if base != cur_base or len(list) > max_src:
+        if num > 0:
+            lib = env.Library("drivers"+str(num), list)
+            lib_list.append(lib)
+            list = []
+        num = num+1
+    cur_base = base
+    list.append(f)
 
-if len(list) > 0:
-	lib = env.Library("drivers"+str(num), list)
-	lib_list.append(lib)
+lib = env.Library("drivers"+str(num), list)
+lib_list.append(lib)
 
+if len(lib_list) > 0:
+    import os, sys
+    if os.name=='posix' and sys.platform=='win32':
+        env.Replace(ARFLAGS=['rcsT'])
+
+        lib = env.Library("drivers_collated", lib_list)
+        env.Replace(ARFLAGS=['rc'])
+        lib_list = [lib]
 
 drivers_base=[]
 env.add_source_files(drivers_base,"*.cpp")

From 00d79a6d6cfeb53b9fe41ed193c8dfb3500fa863 Mon Sep 17 00:00:00 2001
From: Aren Villanueva <arenvillanueva@yomogi-soft.com>
Date: Mon, 2 Nov 2015 16:35:32 +1100
Subject: [PATCH 63/78] Optimised the oc_filter_hedge and oc_filter_vedge
 routines in theora a little.

---
 drivers/theora/decode.c | 46 +++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/drivers/theora/decode.c b/drivers/theora/decode.c
index 7be66463d8..882606ae77 100644
--- a/drivers/theora/decode.c
+++ b/drivers/theora/decode.c
@@ -1611,28 +1611,35 @@ static void oc_filter_hedge(unsigned char *_dst,int _dst_ystride,
   int                  sum1;
   int                  bx;
   int                  by;
+  int		       _rlimit1;
+  int		       _rlimit2;
   rdst=_dst;
   rsrc=_src;
-  for(bx=0;bx<8;bx++){
+  for(bx=0;bx<8;++bx){
     cdst=rdst;
     csrc=rsrc;
-    for(by=0;by<10;by++){
+    _rlimit1 = _rlimit2 = _flimit;
+    for(by=0;by<10;++by){
       r[by]=*csrc;
       csrc+=_src_ystride;
     }
     sum0=sum1=0;
-    for(by=0;by<4;by++){
-      sum0+=abs(r[by+1]-r[by]);
-      sum1+=abs(r[by+5]-r[by+6]);
+    for(by=0;by<4;++by){
+      int sumed = abs(r[by+1]-r[by]);
+      sum0+=sumed;
+      _rlimit1-=sumed;
+      sumed = abs(r[by+5]-r[by+6]);
+      sum1+=sumed;
+      _rlimit2-=sumed;
     }
     *_variance0+=OC_MINI(255,sum0);
     *_variance1+=OC_MINI(255,sum1);
-    if(sum0<_flimit&&sum1<_flimit&&r[5]-r[4]<_qstep&&r[4]-r[5]<_qstep){
+    if(_rlimit1&&_rlimit2&&!(r[5]-r[4]-_qstep)&&!(r[4]-r[5]-_qstep)){
       *cdst=(unsigned char)(r[0]*3+r[1]*2+r[2]+r[3]+r[4]+4>>3);
       cdst+=_dst_ystride;
       *cdst=(unsigned char)(r[0]*2+r[1]+r[2]*2+r[3]+r[4]+r[5]+4>>3);
       cdst+=_dst_ystride;
-      for(by=0;by<4;by++){
+      for(by=0;by<4;++by){
         *cdst=(unsigned char)(r[by]+r[by+1]+r[by+2]+r[by+3]*2+
          r[by+4]+r[by+5]+r[by+6]+4>>3);
         cdst+=_dst_ystride;
@@ -1642,13 +1649,13 @@ static void oc_filter_hedge(unsigned char *_dst,int _dst_ystride,
       *cdst=(unsigned char)(r[5]+r[6]+r[7]+r[8]*2+r[9]*3+4>>3);
     }
     else{
-      for(by=1;by<=8;by++){
+      for(by=1;by<=8;++by){
         *cdst=(unsigned char)r[by];
         cdst+=_dst_ystride;
       }
     }
-    rdst++;
-    rsrc++;
+    ++rdst;
+    ++rsrc;
   }
 }
 
@@ -1663,19 +1670,26 @@ static void oc_filter_vedge(unsigned char *_dst,int _dst_ystride,
   int                  sum1;
   int                  bx;
   int                  by;
+  int		       _rlimit1;
+  int		       _rlimit2;
   cdst=_dst;
-  for(by=0;by<8;by++){
+  for(by=0;by<8;++by){
     rsrc=cdst-1;
     rdst=cdst;
-    for(bx=0;bx<10;bx++)r[bx]=*rsrc++;
+    for(bx=0;bx<10;++bx)r[bx]=*rsrc++;
     sum0=sum1=0;
-    for(bx=0;bx<4;bx++){
-      sum0+=abs(r[bx+1]-r[bx]);
-      sum1+=abs(r[bx+5]-r[bx+6]);
+    _rlimit1 = _rlimit2 = _flimit;
+    for(bx=0;bx<4;++bx){
+      int sumed = abs(r[bx+1]-r[bx]);
+      sum0+=sumed;
+      _rlimit1-=sumed;
+      sumed = abs(r[bx+5]-r[bx+6]);
+      sum1+=sumed;
+      _rlimit2-=sumed;
     }
     _variances[0]+=OC_MINI(255,sum0);
     _variances[1]+=OC_MINI(255,sum1);
-    if(sum0<_flimit&&sum1<_flimit&&r[5]-r[4]<_qstep&&r[4]-r[5]<_qstep){
+    if(_rlimit1&&_rlimit2&&!(r[5]-r[4]-_qstep)&&!(r[4]-r[5]-_qstep)){
       *rdst++=(unsigned char)(r[0]*3+r[1]*2+r[2]+r[3]+r[4]+4>>3);
       *rdst++=(unsigned char)(r[0]*2+r[1]+r[2]*2+r[3]+r[4]+r[5]+4>>3);
       for(bx=0;bx<4;bx++){

From 402c24ec8baf10d6445213f1552cbeaaf0b55643 Mon Sep 17 00:00:00 2001
From: Aren Villanueva <arenvillanueva@yomogi-soft.com>
Date: Mon, 16 Nov 2015 11:07:21 +1100
Subject: [PATCH 64/78] iOS compile fixes.

---
 drivers/gles2/rasterizer_gles2.h      |  4 ++--
 drivers/gles2/shader_compiler_gles2.h |  2 +-
 platform/iphone/app_delegate.mm       |  2 ++
 platform/iphone/game_center.mm        |  2 +-
 platform/iphone/gl_view.mm            | 10 +++++++++-
 platform/iphone/godot_iphone.cpp      |  2 ++
 platform/iphone/icloud.mm             |  2 --
 platform/iphone/sem_iphone.cpp        |  5 +++++
 platform/iphone/view_controller.mm    |  3 +++
 9 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/drivers/gles2/rasterizer_gles2.h b/drivers/gles2/rasterizer_gles2.h
index 507e46ae75..4b512cc3a9 100644
--- a/drivers/gles2/rasterizer_gles2.h
+++ b/drivers/gles2/rasterizer_gles2.h
@@ -111,7 +111,7 @@ class RasterizerGLES2 : public Rasterizer {
 
 	Image _get_gl_image_and_format(const Image& p_image, Image::Format p_format, uint32_t p_flags,GLenum& r_gl_format,GLenum& r_gl_internal_format,int &r_gl_components,bool &r_has_alpha_cache,bool &r_compressed);
 
-	class RenderTarget;
+	struct RenderTarget;
 
 	struct Texture {
 
@@ -305,7 +305,7 @@ class RasterizerGLES2 : public Rasterizer {
 		virtual ~GeometryOwner() {}
 	};
 
-	class Mesh;
+	struct Mesh;
 
 	struct Surface : public Geometry {
 
diff --git a/drivers/gles2/shader_compiler_gles2.h b/drivers/gles2/shader_compiler_gles2.h
index 43902a7536..19c24757ba 100644
--- a/drivers/gles2/shader_compiler_gles2.h
+++ b/drivers/gles2/shader_compiler_gles2.h
@@ -34,7 +34,7 @@ class ShaderCompilerGLES2 {
 
 	class Uniform;
 public:
-	class Flags;
+	struct Flags;
 private:
 
 	ShaderLanguage::ProgramNode *program_node;
diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm
index 647bf1a2d1..e5bd7a96b4 100644
--- a/platform/iphone/app_delegate.mm
+++ b/platform/iphone/app_delegate.mm
@@ -56,6 +56,8 @@
 #import "Appirater.h"
 #endif
 
+Error _shell_open(String);
+
 Error _shell_open(String p_uri) {
 	NSString* url = [[NSString alloc] initWithUTF8String:p_uri.utf8().get_data()];
 
diff --git a/platform/iphone/game_center.mm b/platform/iphone/game_center.mm
index 79c056776d..1e46d9f014 100644
--- a/platform/iphone/game_center.mm
+++ b/platform/iphone/game_center.mm
@@ -30,8 +30,8 @@
 
 #include "game_center.h"
 
-extern "C" {
 #import <GameKit/GameKit.h>
+extern "C" {
 #import "app_delegate.h"
 };
 
diff --git a/platform/iphone/gl_view.mm b/platform/iphone/gl_view.mm
index 279fbdafa8..f19e16f3f6 100755
--- a/platform/iphone/gl_view.mm
+++ b/platform/iphone/gl_view.mm
@@ -54,6 +54,14 @@ static bool video_playing = false;
 static float video_previous_volume = 0.0f;
 static CMTime video_current_time;
 
+void _show_keyboard(String);
+void _hide_keyboard();
+bool _play_video(String, float, String, String);
+bool _is_video_playing();
+void _focus_out_video();
+void _unpause_video();
+void _stop_video();
+
 void _show_keyboard(String p_existing) {
 	keyboard_text = p_existing;
 	printf("instance on show is %p\n", _instance);
@@ -618,7 +626,7 @@ static void clear_touches() {
 
 - (void)audioRouteChangeListenerCallback:(NSNotification*)notification
 {
-	printf("*********** route changed!%i\n");
+	printf("*********** route changed!\n");
 	NSDictionary *interuptionDict = notification.userInfo;
 
 	NSInteger routeChangeReason = [[interuptionDict valueForKey:AVAudioSessionRouteChangeReasonKey] integerValue];
diff --git a/platform/iphone/godot_iphone.cpp b/platform/iphone/godot_iphone.cpp
index b7b9b747b4..f0cb929429 100644
--- a/platform/iphone/godot_iphone.cpp
+++ b/platform/iphone/godot_iphone.cpp
@@ -40,6 +40,8 @@ int add_path(int p_argc, char** p_args);
 int add_cmdline(int p_argc, char** p_args);
 };
 
+int iphone_main(int, int, int, char**);
+
 int iphone_main(int width, int height, int argc, char** argv) {
 
 	int len = strlen(argv[0]);
diff --git a/platform/iphone/icloud.mm b/platform/iphone/icloud.mm
index 2dc2f7d9c1..a35d8ecd69 100644
--- a/platform/iphone/icloud.mm
+++ b/platform/iphone/icloud.mm
@@ -30,10 +30,8 @@
 
 #include "icloud.h"
 
-extern "C" {
 #import <Foundation/Foundation.h>
 #import "app_delegate.h"
-};
 
 ICloud* ICloud::instance = NULL;
 
diff --git a/platform/iphone/sem_iphone.cpp b/platform/iphone/sem_iphone.cpp
index 5afaa7b308..36baa40427 100644
--- a/platform/iphone/sem_iphone.cpp
+++ b/platform/iphone/sem_iphone.cpp
@@ -31,6 +31,11 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+void cgsem_init(cgsem_t*);
+void cgsem_post(cgsem_t*);
+void cgsem_wait(cgsem_t*);
+void cgsem_destroy(cgsem_t*);
+
 void cgsem_init(cgsem_t *cgsem)
 {
 	int flags, fd, i;
diff --git a/platform/iphone/view_controller.mm b/platform/iphone/view_controller.mm
index 6a9c3ac9ec..f98fb7c355 100644
--- a/platform/iphone/view_controller.mm
+++ b/platform/iphone/view_controller.mm
@@ -32,6 +32,9 @@
 
 extern "C" {
 
+int add_path(int, char**);
+int add_cmdline(int, char**);
+
 int add_path(int p_argc, char** p_args) {
 
 	NSString* str = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"godot_path"];

From e420b69606dca0a4f88103440715b848e4e24093 Mon Sep 17 00:00:00 2001
From: Aren Villanueva <arenvillanueva@yomogi-soft.com>
Date: Mon, 16 Nov 2015 11:14:40 +1100
Subject: [PATCH 65/78] Properly fixes compilation in an msys environment.

---
 drivers/SCsub | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/SCsub b/drivers/SCsub
index fd77931a29..b3f83468d4 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -85,11 +85,10 @@ lib_list.append(lib)
 
 if len(lib_list) > 0:
     import os, sys
-    if os.name=='posix' and sys.platform=='win32':
+    if os.name=='posix' and sys.platform=='msys':
         env.Replace(ARFLAGS=['rcsT'])
 
         lib = env.Library("drivers_collated", lib_list)
-        env.Replace(ARFLAGS=['rc'])
         lib_list = [lib]
 
 drivers_base=[]

From e68c2c6c2a14c32e7c07ab3158fc459b104212d3 Mon Sep 17 00:00:00 2001
From: Aren Villanueva <arenvillanueva@yomogi-soft.com>
Date: Mon, 16 Nov 2015 12:31:44 +1100
Subject: [PATCH 66/78] Use macros to determine which iOS SDK we have in order
 to be backwards compatible with older SDKs when fixing template compilation
 issues.

---
 platform/iphone/game_center.mm | 10 ++++++++++
 platform/iphone/icloud.mm      |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/platform/iphone/game_center.mm b/platform/iphone/game_center.mm
index 1e46d9f014..4cb7a20a7f 100644
--- a/platform/iphone/game_center.mm
+++ b/platform/iphone/game_center.mm
@@ -30,8 +30,18 @@
 
 #include "game_center.h"
 
+#ifdef __IPHONE_9_0
+
 #import <GameKit/GameKit.h>
 extern "C" {
+
+#else
+
+extern "C" {
+#import <GameKit/GameKit.h>
+
+#endif
+
 #import "app_delegate.h"
 };
 
diff --git a/platform/iphone/icloud.mm b/platform/iphone/icloud.mm
index a35d8ecd69..518385992d 100644
--- a/platform/iphone/icloud.mm
+++ b/platform/iphone/icloud.mm
@@ -30,9 +30,17 @@
 
 #include "icloud.h"
 
+#ifndef __IPHONE_9_0
+extern "C" {
+#endif
+
 #import <Foundation/Foundation.h>
 #import "app_delegate.h"
 
+#ifndef __IPHONE_9_0
+};
+#endif
+
 ICloud* ICloud::instance = NULL;
 
 void ICloud::_bind_methods() {

From 4f40a3dc65a6bba67bf60db4f0136c1fb1632f50 Mon Sep 17 00:00:00 2001
From: Aren Villanueva <arenvillanueva@yomogi-soft.com>
Date: Mon, 16 Nov 2015 13:01:20 +1100
Subject: [PATCH 67/78] Changed drviers/SCsub spaces to tabs.

---
 drivers/SCsub | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/SCsub b/drivers/SCsub
index b3f83468d4..8015d929cb 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -64,32 +64,32 @@ if env['vsproj']=="yes":
 	env.AddToVSProject(env.drivers_sources)
 
 for f in env.drivers_sources:
-    fname = ""
-    if type(f) == type(""):
-        fname = env.File(f).path
-    else:
-	    fname = env.File(f)[0].path
-    fname = fname.replace("\\", "/")
-    base = string.join(fname.split("/")[:2], "/")
-    if base != cur_base or len(list) > max_src:
-        if num > 0:
-            lib = env.Library("drivers"+str(num), list)
-            lib_list.append(lib)
-            list = []
-        num = num+1
-    cur_base = base
-    list.append(f)
+	fname = ""
+	if type(f) == type(""):
+		fname = env.File(f).path
+	else:
+		fname = env.File(f)[0].path
+	fname = fname.replace("\\", "/")
+	base = string.join(fname.split("/")[:2], "/")
+	if base != cur_base or len(list) > max_src:
+		if num > 0:
+			lib = env.Library("drivers"+str(num), list)
+			lib_list.append(lib)
+			list = []
+		num = num+1
+	cur_base = base
+	list.append(f)
 
 lib = env.Library("drivers"+str(num), list)
 lib_list.append(lib)
 
 if len(lib_list) > 0:
-    import os, sys
-    if os.name=='posix' and sys.platform=='msys':
-        env.Replace(ARFLAGS=['rcsT'])
+	import os, sys
+	if os.name=='posix' and sys.platform=='msys':
+		env.Replace(ARFLAGS=['rcsT'])
 
-        lib = env.Library("drivers_collated", lib_list)
-        lib_list = [lib]
+		lib = env.Library("drivers_collated", lib_list)
+		lib_list = [lib]
 
 drivers_base=[]
 env.add_source_files(drivers_base,"*.cpp")

From 906c6374dc98006d70055ed0ecc376f8c0bbdc66 Mon Sep 17 00:00:00 2001
From: Ariel Manzur <ariel@okamstudio.com>
Date: Mon, 16 Nov 2015 08:44:03 -0300
Subject: [PATCH 68/78] drivers and theora

---
 drivers/SCsub                          |  2 +-
 drivers/theora/video_stream_theora.cpp | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/drivers/SCsub b/drivers/SCsub
index 8015d929cb..2361968a43 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -71,7 +71,7 @@ for f in env.drivers_sources:
 		fname = env.File(f)[0].path
 	fname = fname.replace("\\", "/")
 	base = string.join(fname.split("/")[:2], "/")
-	if base != cur_base or len(list) > max_src:
+	if base != cur_base and len(list) > max_src:
 		if num > 0:
 			lib = env.Library("drivers"+str(num), list)
 			lib_list.append(lib)
diff --git a/drivers/theora/video_stream_theora.cpp b/drivers/theora/video_stream_theora.cpp
index ed87227876..e2756fe70c 100644
--- a/drivers/theora/video_stream_theora.cpp
+++ b/drivers/theora/video_stream_theora.cpp
@@ -269,15 +269,22 @@ void VideoStreamPlaybackTheora::set_file(const String& p_file) {
 				copymem(&to,&test,sizeof(test));
 				theora_p=1;
 			}else if(!vorbis_p && vorbis_synthesis_headerin(&vi,&vc,&op)>=0){
+
+
 				/* it is vorbis */
-		if (audio_track_skip) {
-		    vorbis_info_clear(&vi);
-		    vorbis_comment_clear(&vc);
-		    audio_track_skip--;
-		} else {
-		    copymem(&vo,&test,sizeof(test));
-		    vorbis_p=1;
-		}
+				if (audio_track_skip) {
+					vorbis_info_clear(&vi);
+					vorbis_comment_clear(&vc);
+					ogg_stream_clear(&test);
+					vorbis_info_init(&vi);
+					vorbis_comment_init(&vc);
+
+					audio_track_skip--;
+
+                } else {
+                    copymem(&vo,&test,sizeof(test));
+					vorbis_p=1;
+                }
 			}else{
 				/* whatever it is, we don't care about it */
 				ogg_stream_clear(&test);

From 48113130566e5aba8d794df7d22947edda3fca38 Mon Sep 17 00:00:00 2001
From: Ariel Manzur <ariel@okamstudio.com>
Date: Mon, 16 Nov 2015 09:29:00 -0300
Subject: [PATCH 69/78] tabs

---
 drivers/theora/video_stream_theora.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/theora/video_stream_theora.cpp b/drivers/theora/video_stream_theora.cpp
index e2756fe70c..5b6bc5b41b 100644
--- a/drivers/theora/video_stream_theora.cpp
+++ b/drivers/theora/video_stream_theora.cpp
@@ -281,10 +281,10 @@ void VideoStreamPlaybackTheora::set_file(const String& p_file) {
 
 					audio_track_skip--;
 
-                } else {
+				} else {
                     copymem(&vo,&test,sizeof(test));
 					vorbis_p=1;
-                }
+				}
 			}else{
 				/* whatever it is, we don't care about it */
 				ogg_stream_clear(&test);

From f59a1fd50d3e2df4ea9fa9e43544c2886ebc78f1 Mon Sep 17 00:00:00 2001
From: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
Date: Mon, 16 Nov 2015 17:05:39 +0200
Subject: [PATCH 70/78] Change handling of invalid JSON escape sequences.

Instead of reporting an error, just ignore the first backslash and continue.
Fixes #2521
---
 core/io/json.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/io/json.cpp b/core/io/json.cpp
index 14890abd26..22c99d0465 100644
--- a/core/io/json.cpp
+++ b/core/io/json.cpp
@@ -177,9 +177,6 @@ Error JSON::_get_token(const CharType *p_str, int &idx, int p_len, Token& r_toke
 							case 'n': res=10; break;
 							case 'f': res=12; break;
 							case 'r': res=13; break;
-							case '\"': res='\"'; break;
-							case '\\': res='\\'; break;
-							case '/': res='/'; break; //wtf
 							case 'u': {
 								//hexnumbarh - oct is deprecated
 
@@ -218,10 +215,13 @@ Error JSON::_get_token(const CharType *p_str, int &idx, int p_len, Token& r_toke
 
 
 							} break;
+							//case '\"': res='\"'; break;
+							//case '\\': res='\\'; break;
+							//case '/': res='/'; break;
 							default: {
-
-								r_err_str="Invalid escape sequence";
-								return ERR_PARSE_ERROR;
+								res = next;
+								//r_err_str="Invalid escape sequence";
+								//return ERR_PARSE_ERROR;
 							} break;
 						}
 

From 081a236c6739e7f6d45731ec0c002d2269f2367b Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Tue, 17 Nov 2015 09:46:08 -0300
Subject: [PATCH 71/78] -Merged Script and Help tabs -Help tabs can be opened
 many at the same time -Color temperatures for opened scripts -Dominant script
 opening when switching scene tab

---
 drivers/theora/video_stream_theora.cpp        |   24 +-
 scene/gui/item_list.cpp                       |   31 +
 scene/gui/item_list.h                         |    1 +
 scene/gui/menu_button.cpp                     |    2 +
 scene/gui/rich_text_label.cpp                 |    3 +-
 scene/gui/video_player.cpp                    |    2 +-
 .../resources/default_theme/default_theme.cpp |    5 +-
 tools/editor/code_editor.cpp                  |    4 +-
 tools/editor/editor_help.cpp                  |  516 +++----
 tools/editor/editor_help.h                    |   97 +-
 tools/editor/editor_node.cpp                  |   56 +-
 tools/editor/icons/icon_help.png              |  Bin 822 -> 841 bytes
 tools/editor/plugins/script_editor_plugin.cpp | 1368 +++++++++++------
 tools/editor/plugins/script_editor_plugin.h   |   49 +
 14 files changed, 1362 insertions(+), 796 deletions(-)

diff --git a/drivers/theora/video_stream_theora.cpp b/drivers/theora/video_stream_theora.cpp
index ed87227876..a3c951c484 100644
--- a/drivers/theora/video_stream_theora.cpp
+++ b/drivers/theora/video_stream_theora.cpp
@@ -243,7 +243,9 @@ void VideoStreamPlaybackTheora::set_file(const String& p_file) {
 	/* Only interested in Vorbis/Theora streams */
 	int stateflag = 0;
 
-    int audio_track_skip=audio_track;
+	int audio_track_skip=audio_track;
+
+
 	while(!stateflag){
 		int ret=buffer_data();
 		if(ret==0)break;
@@ -270,14 +272,18 @@ void VideoStreamPlaybackTheora::set_file(const String& p_file) {
 				theora_p=1;
 			}else if(!vorbis_p && vorbis_synthesis_headerin(&vi,&vc,&op)>=0){
 				/* it is vorbis */
-		if (audio_track_skip) {
-		    vorbis_info_clear(&vi);
-		    vorbis_comment_clear(&vc);
-		    audio_track_skip--;
-		} else {
-		    copymem(&vo,&test,sizeof(test));
-		    vorbis_p=1;
-		}
+				if (audio_track_skip) {
+					vorbis_info_clear(&vi);
+					vorbis_comment_clear(&vc);
+					ogg_stream_clear(&test);
+					vorbis_info_init(&vi);
+					vorbis_comment_init(&vc);
+
+					audio_track_skip--;
+				} else {
+					copymem(&vo,&test,sizeof(test));
+					vorbis_p=1;
+				}
 			}else{
 				/* whatever it is, we don't care about it */
 				ogg_stream_clear(&test);
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index 40fade840c..f035cb7722 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -235,6 +235,37 @@ int ItemList::get_current() const {
 	return current;
 }
 
+void ItemList::move_item(int p_item,int p_to_pos) {
+
+	ERR_FAIL_INDEX(p_item,items.size());
+	ERR_FAIL_INDEX(p_to_pos,items.size()+1);
+
+	Item it=items[p_item];
+	items.remove(p_item);;
+
+	if (p_to_pos>p_item) {
+		p_to_pos--;
+	}
+
+	if (p_to_pos>=items.size()) {
+		items.push_back(it);
+	} else {
+		items.insert(p_to_pos,it);
+	}
+
+	if (current<0) {
+		//do none
+	} if (p_item==current) {
+		current=p_to_pos;
+	} else if (p_to_pos>p_item && current>p_item && current<p_to_pos) {
+		current--;
+	} else if (p_to_pos<p_item && current<p_item && current>p_to_pos) {
+		current++;
+	}
+
+
+	update();
+}
 
 int ItemList::get_item_count() const{
 
diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h
index 7cf58a6426..bd3cf6484e 100644
--- a/scene/gui/item_list.h
+++ b/scene/gui/item_list.h
@@ -101,6 +101,7 @@ public:
 	void set_current(int p_current);
 	int get_current() const;
 
+	void move_item(int p_item,int p_to_pos);
 
 	int get_item_count() const;
 	void remove_item(int p_idx);
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index 13ff7074ea..be7a6b468a 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -54,6 +54,8 @@ void MenuButton::_unhandled_key_input(InputEvent p_event) {
 
 
 		int item = popup->find_item_by_accelerator(code);
+
+
 		if (item>=0 && ! popup->is_item_disabled(item))
 			popup->activate_item(item);
 		/*
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index ef6a2ba6aa..b98fec1bde 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -719,7 +719,7 @@ void RichTextLabel::_input_event(InputEvent p_event) {
 		case InputEvent::KEY: {
 
 			const InputEventKey &k=p_event.key;
-			if (k.pressed) {
+			if (k.pressed && !k.mod.alt && !k.mod.shift && !k.mod.command && !k.mod.meta) {
 				bool handled=true;
 				switch(k.scancode) {
 					case KEY_PAGEUP: {
@@ -765,6 +765,7 @@ void RichTextLabel::_input_event(InputEvent p_event) {
 					default: handled=false;
 				}
 
+
 				if (handled)
 					accept_event();
 			}
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp
index b4cd437d35..9b9c797ed9 100644
--- a/scene/gui/video_player.cpp
+++ b/scene/gui/video_player.cpp
@@ -384,12 +384,12 @@ void VideoPlayer::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_buffering_msec","msec"),&VideoPlayer::set_buffering_msec);
 	ObjectTypeDB::bind_method(_MD("get_buffering_msec"),&VideoPlayer::get_buffering_msec);
 
+	ADD_PROPERTY( PropertyInfo(Variant::INT, "stream/audio_track",PROPERTY_HINT_RANGE,"0,128,1"), _SCS("set_audio_track"), _SCS("get_audio_track") );
 	ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"VideoStream"), _SCS("set_stream"), _SCS("get_stream") );
 //	ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/loop"), _SCS("set_loop"), _SCS("has_loop") );
 	ADD_PROPERTY( PropertyInfo(Variant::REAL, "stream/volume_db", PROPERTY_HINT_RANGE,"-80,24,0.01"), _SCS("set_volume_db"), _SCS("get_volume_db") );
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/autoplay"), _SCS("set_autoplay"), _SCS("has_autoplay") );
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/paused"), _SCS("set_paused"), _SCS("is_paused") );
-	ADD_PROPERTY( PropertyInfo(Variant::INT, "stream/audio_track",PROPERTY_HINT_RANGE,"0,128,1"), _SCS("set_audio_track"), _SCS("get_audio_track") );
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "expand" ), _SCS("set_expand"),_SCS("has_expand") );
 }
 
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 0f4c2ecd23..e50f184f9b 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -188,6 +188,7 @@ void make_default_theme() {
 	// Font Colors
 
 	Color control_font_color = Color::html("e0e0e0");
+	Color control_font_color_lower = Color::html("a0a0a0");
 	Color control_font_color_low = Color::html("b0b0b0");
 	Color control_font_color_hover = Color::html("f0f0f0");
 	Color control_font_color_disabled = Color(0.9,0.9,0.9,0.2);
@@ -273,7 +274,7 @@ void make_default_theme() {
 	t->set_color("font_color_hover","ToolButton", control_font_color_hover );
 	t->set_color("font_color_disabled","ToolButton", Color(0.9,0.95,1,0.3) );
 
-	t->set_constant("hseparation","ToolButton", 0 );
+	t->set_constant("hseparation","ToolButton", 3 );
 
 
 
@@ -649,7 +650,7 @@ void make_default_theme() {
 	t->set_constant("icon_margin","ItemList",4);
 	t->set_constant("line_separation","ItemList",2);
 	t->set_font("font","ItemList", default_font );
-	t->set_color("font_color","ItemList", control_font_color_low );
+	t->set_color("font_color","ItemList", control_font_color_lower );
 	t->set_color("font_color_selected","ItemList", control_font_color_pressed );
 	t->set_color("guide_color","ItemList", Color(0,0,0,0.1) );
 	t->set_stylebox("selected","ItemList", item_selected_oof );
diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp
index 2ed03a1858..685763cadb 100644
--- a/tools/editor/code_editor.cpp
+++ b/tools/editor/code_editor.cpp
@@ -618,7 +618,7 @@ CodeTextEditor::CodeTextEditor() {
 	line_col = memnew( Label );
 	add_child(line_col);
 	line_col->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_END,135);
-	line_col->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,20);
+	line_col->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,15);
 	line_col->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,1);
 	line_col->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,5);
 	//line_col->set_align(Label::ALIGN_RIGHT);
@@ -637,7 +637,7 @@ CodeTextEditor::CodeTextEditor() {
 	error = memnew( Label );
 	add_child(error);
 	error->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,5);
-	error->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,20);
+	error->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,15);
 	error->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,1);
 	error->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,130);
 	error->hide();
diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp
index 46ed2194a8..4f44331b0b 100644
--- a/tools/editor/editor_help.cpp
+++ b/tools/editor/editor_help.cpp
@@ -300,9 +300,9 @@ void EditorHelpSearch::_bind_methods() {
 }
 
 
-EditorHelpSearch::EditorHelpSearch(EditorNode *p_editor) {
+EditorHelpSearch::EditorHelpSearch() {
 
-	editor=p_editor;
+	editor=EditorNode::get_singleton();
 	VBoxContainer *vbc = memnew( VBoxContainer );
 	add_child(vbc);
 	set_child_rect(vbc);
@@ -318,17 +318,138 @@ EditorHelpSearch::EditorHelpSearch(EditorNode *p_editor) {
 	search_box->connect("input_event",this,"_sbox_input");
 	search_options = memnew( Tree );
 	vbc->add_margin_child("Matches:",search_options,true);
-	get_ok()->set_text("View");
+	get_ok()->set_text("Open");
 	get_ok()->set_disabled(true);
 	register_text_enter(search_box);
 	set_hide_on_ok(false);
 	search_options->connect("item_activated",this,"_confirmed");
 	set_title("Search Classes");
+
 //	search_options->set_hide_root(true);
 
 }
 
+/////////////////////////////////
 
+////////////////////////////////////
+/// /////////////////////////////////
+
+
+
+void EditorHelpIndex::add_type(const String& p_type,HashMap<String,TreeItem*>& p_types,TreeItem *p_root) {
+
+	if (p_types.has(p_type))
+		return;
+//	if (!ObjectTypeDB::is_type(p_type,base) || p_type==base)
+//		return;
+
+	String inherits=EditorHelp::get_doc_data()->class_list[p_type].inherits;
+
+	TreeItem *parent=p_root;
+
+
+	if (inherits.length()) {
+
+		if (!p_types.has(inherits)) {
+
+			add_type(inherits,p_types,p_root);
+		}
+
+		if (p_types.has(inherits) )
+			parent=p_types[inherits];
+	}
+
+	TreeItem *item = class_list->create_item(parent);
+	item->set_metadata(0,p_type);
+	item->set_tooltip(0,EditorHelp::get_doc_data()->class_list[p_type].brief_description);
+	item->set_text(0,p_type);
+
+
+	if (has_icon(p_type,"EditorIcons")) {
+
+		item->set_icon(0, get_icon(p_type,"EditorIcons"));
+	}
+
+	p_types[p_type]=item;
+}
+
+
+void EditorHelpIndex::_tree_item_selected() {
+
+
+	TreeItem *s=class_list->get_selected();
+	if (!s)
+		return;
+
+	emit_signal("open_class",s->get_text(0));
+
+	hide();
+
+	//_goto_desc(s->get_text(0));
+
+}
+
+void EditorHelpIndex::select_class(const String& p_class) {
+
+	if (!tree_item_map.has(p_class))
+		return;
+	tree_item_map[p_class]->select(0);
+	class_list->ensure_cursor_is_visible();
+}
+
+void EditorHelpIndex::_notification(int p_what) {
+
+	if (p_what==NOTIFICATION_ENTER_TREE) {
+
+		class_list->clear();
+		tree_item_map.clear();
+		TreeItem *root = class_list->create_item();
+		class_list->set_hide_root(true);
+		connect("confirmed",this,"_tree_item_selected");
+
+
+		for(Map<String,DocData::ClassDoc>::Element *E=EditorHelp::get_doc_data()->class_list.front();E;E=E->next()) {
+
+
+			add_type(E->key(),tree_item_map,root);
+		}
+
+	}
+}
+
+void EditorHelpIndex::_bind_methods() {
+
+	ObjectTypeDB::bind_method("_tree_item_selected",&EditorHelpIndex::_tree_item_selected);
+	ObjectTypeDB::bind_method("select_class",&EditorHelpIndex::select_class);
+	ADD_SIGNAL( MethodInfo("open_class"));
+}
+
+
+
+EditorHelpIndex::EditorHelpIndex() {
+
+
+	VBoxContainer *vbc = memnew( VBoxContainer );
+	add_child(vbc);
+	set_child_rect(vbc);
+
+	class_list = memnew( Tree );
+	vbc->add_margin_child("Class List: ",class_list,true);
+	class_list->set_v_size_flags(SIZE_EXPAND_FILL);
+
+
+	class_list->connect("item_activated",this,"_tree_item_selected");
+
+
+	get_ok()->set_text("Open");
+}
+
+
+
+/////////////////////////////////
+
+////////////////////////////////////
+/// /////////////////////////////////
 DocData *EditorHelp::doc=NULL;
 
 void EditorHelp::_unhandled_key_input(const InputEvent& p_ev) {
@@ -339,8 +460,6 @@ void EditorHelp::_unhandled_key_input(const InputEvent& p_ev) {
 
 		search->grab_focus();
 		search->select_all();
-	} else if (p_ev.key.mod.shift && p_ev.key.scancode==KEY_F1) {
-		class_search->popup();
 	}
 }
 
@@ -351,17 +470,19 @@ void EditorHelp::_search(const String&) {
 
 
 	String stext=search->get_text();
-	bool keep = prev_search==stext && class_list->get_selected() && prev_search_page==class_list->get_selected()->get_text(0);
+	bool keep = prev_search==stext;
 
-	class_desc->search(stext, keep);
+	bool ret = class_desc->search(stext, keep);
+	if (!ret) {
+		class_desc->search(stext, false);
+	}
 
 	prev_search=stext;
-	if (class_list->get_selected())
-		prev_search_page=class_list->get_selected()->get_text(0);
 
 
 }
 
+#if 0
 void EditorHelp::_button_pressed(int p_idx) {
 
 	if (p_idx==PAGE_CLASS_LIST) {
@@ -399,16 +520,11 @@ void EditorHelp::_button_pressed(int p_idx) {
 	} else if (p_idx==PAGE_SEARCH) {
 
 		_search("");
-	} else if (p_idx==CLASS_SEARCH) {
-
-		class_search->popup();
 	}
-
-
 }
 
 
-
+#endif
 
 void EditorHelp::_class_list_select(const String& p_select) {
 
@@ -417,16 +533,28 @@ void EditorHelp::_class_list_select(const String& p_select) {
 
 void EditorHelp::_class_desc_select(const String& p_select) {
 
+
+
+//	print_line("LINK: "+p_select);
 	if (p_select.begins_with("#")) {
-		_goto_desc(p_select.substr(1,p_select.length()));
+		//_goto_desc(p_select.substr(1,p_select.length()));
+		emit_signal("go_to_help","class_name:"+p_select.substr(1,p_select.length()));
 		return;
 	} else if (p_select.begins_with("@")) {
 
 		String m = p_select.substr(1,p_select.length());
-		if (!method_line.has(m))
-			return;
-		class_desc->scroll_to_line(method_line[m]);
-		return;
+
+		if (m.find(".")!=-1) {
+			//must go somewhere else
+
+			emit_signal("go_to_help","class_method:"+m.get_slice(".",0)+":"+m.get_slice(".",0));
+		} else {
+
+			if (!method_line.has(m))
+				return;
+			class_desc->scroll_to_line(method_line[m]);
+		}
+
 	}
 
 
@@ -449,68 +577,40 @@ void EditorHelp::_add_type(const String& p_type) {
 
 }
 
-void EditorHelp::_update_history_buttons() {
-
-	back->set_disabled(history_pos<2);
-	forward->set_disabled(history_pos>=history.size());
-
-}
-
-
 void EditorHelp::_scroll_changed(double p_scroll) {
 
 	if (scroll_locked)
 		return;
 
-	int p = history_pos -1;
-	if (p<0 || p>=history.size())
-		return;
-
 	if (class_desc->get_v_scroll()->is_hidden())
 		p_scroll=0;
 
-	history[p].scroll=p_scroll;
+	//history[p].scroll=p_scroll;
 }
 
-Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_vscr) {
+Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) {
 
 	//ERR_FAIL_COND(!doc->class_list.has(p_class));
 	if (!doc->class_list.has(p_class))
 		return ERR_DOES_NOT_EXIST;
 
 
-	if (tree_item_map.has(p_class)) {
+	//if (tree_item_map.has(p_class)) {
 		select_locked = true;
-		tree_item_map[p_class]->select(0);
-		class_list->ensure_cursor_is_visible();
-	}
+	//}
 
 	class_desc->show();
 	//tabs->set_current_tab(PAGE_CLASS_DESC);
-	edited_class->set_pressed(true);
-	class_list_button->set_pressed(false);
 	description_line=0;
 
-	if (p_class==edited_class->get_text())
+	if (p_class==edited_class)
 		return OK; //already there
 
 	scroll_locked=true;
 
-	if (p_update_history) {
-
-		history.resize(history_pos);
-		history_pos++;
-		History h;
-		h.c=p_class;
-		h.scroll=0;
-		history.push_back(h);
-		_update_history_buttons();
-		class_desc->get_v_scroll()->set_val(0);
-	}
-
 	class_desc->clear();
 	method_line.clear();
-	edited_class->set_text(p_class);
+	edited_class=p_class;
 	//edited_class->show();
 
 
@@ -925,10 +1025,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 
 	}
 
-	if (!p_update_history) {
 
-		class_desc->get_v_scroll()->set_val(history[history_pos-1].scroll);
-	}
 
 	scroll_locked=false;
 
@@ -939,8 +1036,6 @@ void EditorHelp::_request_help(const String& p_string) {
 	Error err = _goto_desc(p_string);
 	if (err==OK) {
 		editor->call("_editor_select",3);
-	} else {
-		class_search->popup(p_string);
 	}
 	//100 palabras
 }
@@ -1209,63 +1304,11 @@ void EditorHelp::_add_text(const String& p_bbcode) {
 }
 
 
-void EditorHelp::add_type(const String& p_type,HashMap<String,TreeItem*>& p_types,TreeItem *p_root) {
-
-	if (p_types.has(p_type))
-		return;
-//	if (!ObjectTypeDB::is_type(p_type,base) || p_type==base)
-//		return;
-
-	String inherits=doc->class_list[p_type].inherits;
-
-	TreeItem *parent=p_root;
-
-
-	if (inherits.length()) {
-
-		if (!p_types.has(inherits)) {
-
-			add_type(inherits,p_types,p_root);
-		}
-
-		if (p_types.has(inherits) )
-			parent=p_types[inherits];
-	}
-
-	TreeItem *item = class_list->create_item(parent);
-	item->set_metadata(0,p_type);
-	item->set_tooltip(0,doc->class_list[p_type].brief_description);
-	item->set_text(0,p_type);
-
-
-	if (has_icon(p_type,"EditorIcons")) {
-
-		item->set_icon(0, get_icon(p_type,"EditorIcons"));
-	}
-
-	p_types[p_type]=item;
-}
-
 
 
 void EditorHelp::_update_doc() {
 
 
-	class_list->clear();
-
-	List<StringName> type_list;
-
-	tree_item_map.clear();
-
-	TreeItem *root = class_list->create_item();
-	class_list->set_hide_root(true);
-	List<StringName>::Element *I=type_list.front();
-
-	for(Map<String,DocData::ClassDoc>::Element *E=doc->class_list.front();E;E=E->next()) {
-
-
-		add_type(E->key(),tree_item_map,root);
-	}
 
 }
 
@@ -1289,8 +1332,8 @@ void EditorHelp::_notification(int p_what) {
 		case NOTIFICATION_READY: {
 
 
-			forward->set_icon(get_icon("Forward","EditorIcons"));
-			back->set_icon(get_icon("Back","EditorIcons"));
+//			forward->set_icon(get_icon("Forward","EditorIcons"));
+//			back->set_icon(get_icon("Back","EditorIcons"));
 			_update_doc();
 			editor->connect("request_help",this,"_request_help");
 
@@ -1298,226 +1341,121 @@ void EditorHelp::_notification(int p_what) {
 	}
 }
 
-void EditorHelp::_tree_item_selected() {
 
-	if (select_locked) {
-		select_locked = false;
-		return;
-	}
-	TreeItem *s=class_list->get_selected();
-	if (!s)
-		return;
-	select_locked=true;
-	_goto_desc(s->get_text(0));
-	select_locked=false;
+
+
+void EditorHelp::go_to_help(const String& p_help) {
+
+	_help_callback(p_help);
+}
+
+void EditorHelp::go_to_class(const String& p_class,int p_scroll) {
+
+	_goto_desc(p_class,p_scroll);
+}
+
+void EditorHelp::popup_search() {
+
+
+	search_dialog->popup_centered(Size2(250,80));
+	search->grab_focus();
+}
+
+void EditorHelp::_search_cbk() {
+
+	_search(search->get_text());
+}
+
+String EditorHelp::get_class_name() {
+
+	return edited_class;
+}
+
+void EditorHelp::search_again() {
+	_search(prev_search);
+}
+
+int EditorHelp::get_scroll() const {
+
+	return class_desc->get_v_scroll()->get_val();
+}
+void EditorHelp::set_scroll(int p_scroll) {
+
+
+	class_desc->get_v_scroll()->set_val(p_scroll);
+
 }
 
 void EditorHelp::_bind_methods() {
 
 	ObjectTypeDB::bind_method("_class_list_select",&EditorHelp::_class_list_select);
 	ObjectTypeDB::bind_method("_class_desc_select",&EditorHelp::_class_desc_select);
-	ObjectTypeDB::bind_method("_button_pressed",&EditorHelp::_button_pressed);
+//	ObjectTypeDB::bind_method("_button_pressed",&EditorHelp::_button_pressed);
 	ObjectTypeDB::bind_method("_scroll_changed",&EditorHelp::_scroll_changed);
 	ObjectTypeDB::bind_method("_request_help",&EditorHelp::_request_help);
 	ObjectTypeDB::bind_method("_unhandled_key_input",&EditorHelp::_unhandled_key_input);
 	ObjectTypeDB::bind_method("_search",&EditorHelp::_search);
-	ObjectTypeDB::bind_method("_tree_item_selected",&EditorHelp::_tree_item_selected);
+	ObjectTypeDB::bind_method("_search_cbk",&EditorHelp::_search_cbk);
+
 	ObjectTypeDB::bind_method("_help_callback",&EditorHelp::_help_callback);
 
+	ADD_SIGNAL(MethodInfo("go_to_help"));
+
 }
 
-EditorHelp::EditorHelp(EditorNode *p_editor) {
+EditorHelp::EditorHelp() {
 
-	editor=p_editor;
+	editor=EditorNode::get_singleton();
 
 	VBoxContainer *vbc = this;
 
-	HBoxContainer *panel_hb = memnew( HBoxContainer );
 
-	Button *b = memnew( Button );
-	b->set_text("Class List");
-	panel_hb->add_child(b);
-	vbc->add_child(panel_hb);
-	b->set_toggle_mode(true);
-	b->set_pressed(true);
-	b->connect("pressed",this,"_button_pressed",make_binds(PAGE_CLASS_LIST));
-	class_list_button=b;
-	class_list_button->hide();
-
-	b = memnew( Button );
-	b->set_text("Class");
-	panel_hb->add_child(b);
-	edited_class=b;
-	edited_class->hide();
-	b->set_toggle_mode(true);
-	b->connect("pressed",this,"_button_pressed",make_binds(PAGE_CLASS_DESC));
-
-	b = memnew( Button );
-	b->set_text("Search in Classes");
-	panel_hb->add_child(b);
-	b->connect("pressed",this,"_button_pressed",make_binds(CLASS_SEARCH));
-
-	Control *expand = memnew( Control );
-	expand->set_h_size_flags(SIZE_EXPAND_FILL);
-	panel_hb->add_child(expand);
-
-	b = memnew( Button );
-	panel_hb->add_child(b);
-	back=b;
-	b->connect("pressed",this,"_button_pressed",make_binds(PAGE_CLASS_PREV));
-
-	b = memnew( Button );
-	panel_hb->add_child(b);
-	forward=b;
-	b->connect("pressed",this,"_button_pressed",make_binds(PAGE_CLASS_NEXT));
-
-	Separator *hs = memnew( VSeparator );
-	panel_hb->add_child(hs);
-	Control *ec = memnew( Control );
-	ec->set_custom_minimum_size(Size2(200,1));
-	panel_hb->add_child(ec);
-	search = memnew( LineEdit );
-	ec->add_child(search);
-	search->set_area_as_parent_rect();
-	search->connect("text_entered",this,"_search");
-
-	b = memnew( Button );
-	b->set_text("Find");
-	panel_hb->add_child(b);
-	b->connect("pressed",this,"_button_pressed",make_binds(PAGE_SEARCH));
-
-	hs = memnew( VSeparator );
-	panel_hb->add_child(hs);
-
-	h_split = memnew( HSplitContainer );
-	h_split->set_v_size_flags(SIZE_EXPAND_FILL);
-
-
-	vbc->add_child(h_split);
-
-	class_list = memnew( Tree );
-	h_split->add_child(class_list);
 	//class_list->connect("meta_clicked",this,"_class_list_select");
 	//class_list->set_selection_enabled(true);
 
 	{
-		PanelContainer *pc = memnew( PanelContainer );
+		Panel *pc = memnew( Panel );
 		Ref<StyleBoxFlat> style( memnew( StyleBoxFlat ) );
 		style->set_bg_color( EditorSettings::get_singleton()->get("text_editor/background_color") );	
-		style->set_default_margin(MARGIN_LEFT,20);
-		style->set_default_margin(MARGIN_TOP,20);
+		pc->set_v_size_flags(SIZE_EXPAND_FILL);
 		pc->add_style_override("panel", style); //get_stylebox("normal","TextEdit"));
-		h_split->add_child(pc);
+		vbc->add_child(pc);
 		class_desc = memnew( RichTextLabel );
 		pc->add_child(class_desc);
+		class_desc->set_area_as_parent_rect(8);
 		class_desc->connect("meta_clicked",this,"_class_desc_select");
 	}
 
 	class_desc->get_v_scroll()->connect("value_changed",this,"_scroll_changed");
 	class_desc->set_selection_enabled(true);
-	editor=p_editor;
-	history_pos=0;
+
 	scroll_locked=false;
 	select_locked=false;
 	set_process_unhandled_key_input(true);
-	h_split->set_split_offset(200);
-	class_list->connect("cell_selected",this,"_tree_item_selected");
 	class_desc->hide();
 
-	class_search = memnew( EditorHelpSearch(editor) );
+	search_dialog = memnew( ConfirmationDialog );
+	add_child(search_dialog);
+	VBoxContainer *search_vb = memnew( VBoxContainer );
+	search_dialog->add_child(search_vb);
+	search_dialog->set_child_rect(search_vb);
+	search = memnew( LineEdit );
+	search_dialog->register_text_enter(search);
+	search_vb->add_margin_child("Search Text",search);
+	search_dialog->get_ok()->set_text("Find");
+	search_dialog->connect("confirmed",this,"_search_cbk");
+	search_dialog->set_hide_on_ok(false);
+	search_dialog->set_self_opacity(0.8);
+
+
+	/*class_search = memnew( EditorHelpSearch(editor) );
 	editor->get_gui_base()->add_child(class_search);
-	class_search->connect("go_to_help",this,"_help_callback");
+	class_search->connect("go_to_help",this,"_help_callback");*/
+
 //	prev_search_page=-1;
 }
 
 EditorHelp::~EditorHelp() {
-	if (doc)
-		memdelete(doc);
-}
-
-
-void EditorHelpPlugin::edit(Object *p_object) {
-
-	if (!p_object->cast_to<Script>())
-		return;
-
-	//editor_help->edit(p_object->cast_to<Script>());
-}
-
-bool EditorHelpPlugin::handles(Object *p_object) const {
-
-	return false;
-}
-
-void EditorHelpPlugin::make_visible(bool p_visible) {
-
-	if (p_visible) {
-		editor_help->show();
-	} else {
-
-		editor_help->hide();
-	}
 
 }
 
-void EditorHelpPlugin::selected_notify() {
-
-	//editor_help->ensure_select_current();
-}
-
-Dictionary EditorHelpPlugin::get_state() const {
-
-	return Dictionary();
-}
-
-void EditorHelpPlugin::set_state(const Dictionary& p_state) {
-
-	//editor_help->set_state(p_state);
-}
-void EditorHelpPlugin::clear() {
-
-	//editor_help->clear();
-}
-
-void EditorHelpPlugin::save_external_data() {
-
-	//editor_help->save_external_data();
-}
-
-void EditorHelpPlugin::apply_changes() {
-
-	//editor_help->apply_helps();
-}
-
-void EditorHelpPlugin::restore_global_state() {
-
-	//if (bool(EDITOR_DEF("text_editor/restore_helps_on_load",true))) {
-//		editor_help->_load_files_state();
-	//}
-
-}
-
-void EditorHelpPlugin::save_global_state() {
-
-	//if (bool(EDITOR_DEF("text_editor/restore_helps_on_load",true))) {
-//		editor_help->_save_files_state();
-//	}
-
-}
-
-
-EditorHelpPlugin::EditorHelpPlugin(EditorNode *p_node) {
-
-	editor=p_node;
-	editor_help = memnew( EditorHelp(p_node) );
-	editor->get_viewport()->add_child(editor_help);
-	editor_help->set_area_as_parent_rect();
-	editor_help->hide();
-
-
-}
-
-
-EditorHelpPlugin::~EditorHelpPlugin()
-{
-}
diff --git a/tools/editor/editor_help.h b/tools/editor/editor_help.h
index d4066d076a..b5ee6eca6c 100644
--- a/tools/editor/editor_help.h
+++ b/tools/editor/editor_help.h
@@ -70,9 +70,29 @@ public:
 
 	void popup(const String& p_term="");
 
-	EditorHelpSearch(EditorNode *p_editor);
+	EditorHelpSearch();
 };
 
+class EditorHelpIndex : public ConfirmationDialog {
+	OBJ_TYPE( EditorHelpIndex, ConfirmationDialog );
+
+
+	Tree *class_list;
+	HashMap<String,TreeItem*> tree_item_map;
+
+	void _tree_item_selected();
+	void add_type(const String& p_type,HashMap<String,TreeItem*>& p_types,TreeItem *p_root);
+protected:
+
+	void _notification(int p_what);
+	static void _bind_methods();
+
+public:
+
+	void select_class(const String& p_class);
+
+	EditorHelpIndex();
+};
 
 
 class EditorHelp : public VBoxContainer {
@@ -91,17 +111,11 @@ class EditorHelp : public VBoxContainer {
 	};
 
 
-	struct History {
-		String c;
-		int scroll;
-	};
-
-	Vector<History> history;
-	int history_pos;
 	bool select_locked;
 
 	String prev_search;
-	String prev_search_page;
+
+	String edited_class;
 
 	EditorNode *editor;
 	Map<String,int> method_line;
@@ -111,21 +125,17 @@ class EditorHelp : public VBoxContainer {
 	Map<String,int> constant_line;
 	int description_line;
 
-	Tree *class_list;
 
 	RichTextLabel *class_desc;
 	HSplitContainer *h_split;
 	static DocData *doc;
 
-	Button *class_list_button;
-	Button *edited_class;
-	Button *back;
-	Button *forward;
+
+	ConfirmationDialog *search_dialog;
 	LineEdit *search;
 
-	String base_path;
 
-	HashMap<String,TreeItem*> tree_item_map;
+	String base_path;
 
 
 	void _help_callback(const String& p_topic);
@@ -133,25 +143,24 @@ class EditorHelp : public VBoxContainer {
 	void _add_text(const String& p_text);
 	bool scroll_locked;
 
-	void _button_pressed(int p_idx);
+	//void _button_pressed(int p_idx);
 	void _add_type(const String& p_type);
 
 	void _scroll_changed(double p_scroll);
 	void _class_list_select(const String& p_select);
 	void _class_desc_select(const String& p_select);
 
-	Error _goto_desc(const String& p_class,bool p_update_history=true,int p_vscr=-1);
-	void _update_history_buttons();
+	Error _goto_desc(const String& p_class, int p_vscr=-1);
+	//void _update_history_buttons();
 	void _update_doc();
 
 	void _request_help(const String& p_string);
 	void _search(const String& p_str);
+	void _search_cbk();
 
 	void _unhandled_key_input(const InputEvent& p_ev);
-	void add_type(const String& p_type,HashMap<String,TreeItem*>& p_types,TreeItem *p_root);
-	void _tree_item_selected();
 
-	EditorHelpSearch *class_search;
+
 
 protected:
 
@@ -163,41 +172,25 @@ public:
 	static void generate_doc();
 	static DocData *get_doc_data() { return doc; }
 
-	EditorHelp(EditorNode *p_editor=NULL);
+	void go_to_help(const String& p_help);
+	void go_to_class(const String& p_class,int p_scroll=0);
+
+	void popup_search();
+	void search_again();
+
+	String get_class_name();
+
+	void set_focused() { class_desc->grab_focus(); }
+
+	int get_scroll() const;
+	void set_scroll(int p_scroll);
+
+	EditorHelp();
 	~EditorHelp();
 };
 
 
 
-class EditorHelpPlugin : public EditorPlugin {
-
-	OBJ_TYPE( EditorHelpPlugin, EditorPlugin );
-
-	EditorHelp *editor_help;
-	EditorNode *editor;
-public:
-
-	virtual String get_name() const { return "Help"; }
-	bool has_main_screen() const { return true; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
-	virtual void make_visible(bool p_visible);
-	virtual void selected_notify();
-
-	Dictionary get_state() const;
-	virtual void set_state(const Dictionary& p_state);
-	virtual void clear();
-
-	virtual void save_external_data();
-	virtual void apply_changes();
-
-	virtual void restore_global_state();
-	virtual void save_global_state();
-
-	EditorHelpPlugin(EditorNode *p_node);
-	~EditorHelpPlugin();
-
-};
 
 
 #endif // EDITOR_HELP_H
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 8b2eb603e5..0aeb3955c7 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -163,12 +163,12 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
 
 		switch(p_event.key.scancode) {
 
-			case KEY_F1:
+			/*case KEY_F1:
 				if (!p_event.key.mod.shift && !p_event.key.mod.command)
 					_editor_select(3);
-			break;
-			case KEY_F2: _editor_select(0); break;
-			case KEY_F3: _editor_select(1); break;
+			break;*/
+			case KEY_F1: _editor_select(0); break;
+			case KEY_F2: _editor_select(1); break;
 			case KEY_F4: _editor_select(2); break;
 			case KEY_F5: _menu_option_confirm((p_event.key.mod.control&&p_event.key.mod.shift)?RUN_PLAY_CUSTOM_SCENE:RUN_PLAY,true); break;
 			case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break;
@@ -2846,7 +2846,7 @@ Control* EditorNode::get_viewport() {
 void EditorNode::_editor_select(int p_which) {
 
 	static bool selecting=false;
-	if (selecting)
+	if (selecting || changing_scene)
 		return;
 
 	selecting=true;
@@ -3223,9 +3223,14 @@ Dictionary EditorNode::_get_main_scene_state() {
 void EditorNode::_set_main_scene_state(Dictionary p_state) {
 
 	//print_line("set current 7 ");
+	changing_scene=false;
 
+#if 0
 	if (p_state.has("main_tab")) {
 		int idx = p_state["main_tab"];
+
+
+		print_line("comes with tab: "+itos(idx));
 		int current=-1;
 		for(int i=0;i<editor_table.size();i++) {
 			if (editor_plugin_screen==editor_table[i]) {
@@ -3234,12 +3239,41 @@ void EditorNode::_set_main_scene_state(Dictionary p_state) {
 			}
 		}
 
+
 		if (idx<2 && current<2) {
 			//only set tab for 2D and 3D
-			_editor_select(p_state["main_tab"]);
+			_editor_select(idx);
 			//print_line(" setting main tab: "+itos(p_state["main_tab"]));
 		}
 	}
+#else
+
+	if (get_edited_scene()) {
+
+		int current=-1;
+		for(int i=0;i<editor_table.size();i++) {
+			if (editor_plugin_screen==editor_table[i]) {
+				current=i;
+				break;
+			}
+		}
+
+		if (current<2) {
+			//use heuristic instead
+
+			int n2d=0,n3d=0;
+			_find_node_types(get_edited_scene(),n2d,n3d);
+			if (n2d>n3d) {
+				_editor_select(0);
+			} else if (n3d>n2d) {
+				_editor_select(1);
+
+			}
+		}
+
+	}
+#endif
+
 
 	if (p_state.has("scene_tree_offset"))
 		scene_tree_dock->get_tree_editor()->get_scene_tree()->get_vscroll_bar()->set_val(p_state["scene_tree_offset"]);
@@ -3248,6 +3282,12 @@ void EditorNode::_set_main_scene_state(Dictionary p_state) {
 
 	//print_line("set current 8 ");
 
+	//this should only happen at the very end
+
+	//changing_scene=true; //avoid script change from opening editor
+	ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root();
+	ScriptEditor::get_singleton()->set_scene_root_script( editor_data.get_scene_root_script(editor_data.get_edited_scene()) );
+	//changing_scene=false;
 
 }
 
@@ -3312,8 +3352,6 @@ void EditorNode::set_current_scene(int p_idx) {
 
 	call_deferred("_set_main_scene_state",state); //do after everything else is done setting up
 	//print_line("set current 6 ");
-	changing_scene=false;
-	ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root();
 
 
 }
@@ -5493,7 +5531,6 @@ EditorNode::EditorNode() {
 	add_editor_plugin( memnew( CanvasItemEditorPlugin(this) ) );
 	add_editor_plugin( memnew( SpatialEditorPlugin(this) ) );
 	add_editor_plugin( memnew( ScriptEditorPlugin(this) ) );
-	add_editor_plugin( memnew( EditorHelpPlugin(this) ) );
 	add_editor_plugin( memnew( AnimationPlayerEditorPlugin(this) ) );
 	add_editor_plugin( memnew( ShaderGraphEditorPlugin(this,true) ) );
 	add_editor_plugin( memnew( ShaderGraphEditorPlugin(this,false) ) );
@@ -5669,6 +5706,7 @@ EditorNode::EditorNode() {
 EditorNode::~EditorNode() {	
 
 
+	memdelete( EditorHelp::get_doc_data() );
 	memdelete(editor_selection);
 	memdelete(file_server);
 	EditorSettings::destroy();
diff --git a/tools/editor/icons/icon_help.png b/tools/editor/icons/icon_help.png
index 3f4f8453a71e5641ca639711839ca9322b5698e0..d2085589ae051b14aa234f0c174000fba9f07ba6 100644
GIT binary patch
delta 791
zcmdnSc9Ly^3O`$tx4R3&e-K=-clqRr4s!MPx%v6Hc>B)JQD9(Ty5{NP7-Dg{bn;pM
zm{gHt_3x{nJ9EV7UDj~%SRSzIs-9HXW2ea{RouLKyzcC{u;lbZ`Go5!m!{6zp^$0x
zc%66nT6s=+!ILvG)^y)e(#quKNj)}0(rWrb<LRes?^nLxp&;b-^o`%S%6UgC&-oWD
zni8b>pnjF1+S)0*R&14LP}Ou5+%eOG=TB8lyiEQbYy0P}@$uJQ`8$;JduiUvl~-h`
z_${&B??=gcgE=#2)SX*k_5JOhqSwO5B#t~ded38mVz~G*mJ<imb#fE`{gl>Je54{a
zDOf(%(x{;Rr{?=yn^V8GN*&vB@vg1GH?3z&8JC#2lx1zG|HpANOQ}U+)(iD{GP*qJ
zYRi_s|E*c|cFiTJwWf6oGIo8PYQH~zj+DH-xOra9&F>q2JPx^#vra<z(#sNt4hz3)
zrK>d`R>s*C%ukVCz1rlu{HEu-wAWUbU!HvbjCtSv^unx5k~N>#Chgh&y(s*XjDAc-
z>x#?a6ZYNrTAd+dY|>J1RX*?S-sL+dCpDDkoi}~8Yi@V!E|;1dp3~bHFKxPPs2uhF
za-VDF{u}4{d!HFCzw#)r*s{v(=X{9-7bXrxK_`V&5zVKWRZFIDe0&qbwAAB>(kiB;
zud?^-lGFW+E9yV^91GEUaqM1VRMhk(0-GevqFZi9M=ULM`}OwDBlgMXJnKJRYJYEK
zJJ;a(|2p~i2c_=$@m??OK2*ATW%Jpy*7yG24=5GCY`CR$Yf!M2dEwh%*Nu&hzg07L
z_UN97bc;7TcH!ka$Ns)eUye7Mvp7^{>a9N&9T|Jy_RP&~oqN7nUEJ)cbNW!oDVa6v
z7Tr<*!QQ1Hm%Lk6%x+&<?XMS8<?sK?s@-?DK>d)wBIm<L&cz?tRL#$LJNH6V^y1K4
z3%2g}U;0wF=F?5_@OjNEH|?3wZ{Zha(Ybhq)!YdR0b8;{v!rMLDg7R&`1|Ga%m2NV
z8(xP69|%?8jkyxVKJWSTQ%{c{jo!X*x23i9Z=Q4inOc1l=lu*1c*MZKz~JfX=d#Wz
Gp$Pzz^@aif

delta 799
zcmX@fwvBCqN<Cw7kh>GZx^prw85kJYlDyqr7{K7C^X_^E1_sUokH}&M25w;xW@MN(
zM}mQYfxX1j*OmP?mnf47*Fi<|;|vT;+dN$yLo800PTrdzoGx;#{(bdZlYd@5b0@HD
z4Y?N~z{}hhurzAsp%cdrI7EkTx*jGQWmvIlS4dC&H=)k`3|obLPB^(LEme}2jhf))
zG%G@FoA&+cxwC(NtSfQoz2k7Mtnb`=$$9Sm500pK1~KMICa>~Z$sKiEaD#4326H)g
z>!Vvg_DjV75wACMHH)6S(`Ju(XAsxg<Q4$|*BKN0d7HvsK1%wl+xT$v^6yjMua!s^
zNcZZvY5C>|OZ_pG4wYkaG70}A6<92O9%{aMO8t5t>!0WKCX4fyi}ANhti3o{(&9T~
z+O7@(w&TSMH}_j`2{=6v;aYP3+;%T<@z+LOi@0Xy_-gisby;{?e7bY??)|#GaeC8_
z?ya`>FE=w=r|!5Rv*%zGcf*;dS^MnQbQti=K6zq2>+bayuigmPSG-Hxu{Cb*pTlz>
z?y#4>UmL3v7n!wu^G$Ez^yeP>a}J+Oi#F;zys9W@#&_=(J6Ws#ttb>?`|;zqeEYsj
zy;pwrdz{r*FqUjswdLBBt$i0Y*=?t$pOv+JGNtmBtX)Z3+W%(8Q$h|LjRH)XvP-5c
z|LCE4-^HqqdE3${7Fvo=t99z<YU<2aE7)qXH;0Y6L?EHZF?+9Wt3a-F+l_mSn{FrO
zY2Cl^<J;;-o)xdZnIHAcmi~Cod(mH8rSqvKQd?W!^J||x_*(tq>HPuo+BdT4K3O(<
z#j!`dv+dWeTjv+6>#Lv6%DeKaYBEomQS-d`gxcrtRT(ebueuhp_qyrZpZP`Sp4J!G
z+4LJ5cTW*AeldB^Eyqf|!Z{O`T>i2pv$pDS+TR-!@7>b>{`ExsMzJ}U&Qye~IP83A
zukE3{b_1T5@^ZE->i#|5y8V>NkJ`PO#XD!6c-o(st?Q-fbp7btvYWO47H$1>Q~YcB
zHo*hm+eIIU1+eO6tX-_pwf*<sxZf8SA1{CX^_Rr|SAX=Y_9wmD;###Bl<+-W{an^L
HB{Ts5Ouu)X

diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index bd0f580a34..0de9adebc8 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -572,28 +572,119 @@ void ScriptEditor::_goto_script_line(REF p_script,int p_line) {
 
 }
 
+
+void ScriptEditor::_update_history_arrows() {
+
+	script_back->set_disabled( history_pos<=0 );
+	script_forward->set_disabled( history_pos>=history.size()-1 );
+}
+
+
+void ScriptEditor::_go_to_tab(int p_idx) {
+
+	Node *cn = tab_container->get_child(p_idx);
+	if (!cn)
+		return;
+	Control *c = cn->cast_to<Control>();
+	if (!c)
+		return;
+
+	if (history_pos>=0 && history_pos<history.size() && history[history_pos].control==tab_container->get_current_tab_control()) {
+
+		Node *n = tab_container->get_current_tab_control();
+
+		if (n->cast_to<ScriptTextEditor>()) {
+
+			history[history_pos].scroll_pos=n->cast_to<ScriptTextEditor>()->get_text_edit()->get_v_scroll();
+			history[history_pos].cursor_column=n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_column();
+			history[history_pos].cursor_row=n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_line();
+		}
+		if (n->cast_to<EditorHelp>()) {
+
+			history[history_pos].scroll_pos=n->cast_to<EditorHelp>()->get_scroll();
+		}
+	}
+
+	history.resize(history_pos+1);
+	ScriptHistory sh;
+	sh.control=c;
+	sh.scroll_pos=0;
+
+	history.push_back(sh);
+	history_pos++;
+
+
+	tab_container->set_current_tab(p_idx);
+
+	c = tab_container->get_current_tab_control();
+
+	if (c->cast_to<ScriptTextEditor>()) {
+
+		script_name_label->set_text(c->cast_to<ScriptTextEditor>()->get_name());
+		script_icon->set_texture(c->cast_to<ScriptTextEditor>()->get_icon());
+		if (is_visible())
+			c->cast_to<ScriptTextEditor>()->get_text_edit()->grab_focus();
+	}
+	if (c->cast_to<EditorHelp>()) {
+
+		script_name_label->set_text(c->cast_to<EditorHelp>()->get_class_name());
+		script_icon->set_texture(get_icon("Help","EditorIcons"));
+		if (is_visible())
+			c->cast_to<EditorHelp>()->set_focused();
+	}
+
+
+
+	c->set_meta("__editor_pass",++edit_pass);
+	_update_history_arrows();
+	_update_script_colors();
+}
+
 void ScriptEditor::_close_current_tab() {
 
 	int selected = tab_container->get_current_tab();
 	if (selected<0 || selected>=tab_container->get_child_count())
 		return;
 	
+	Node *tselected = tab_container->get_child(selected);
 	ScriptTextEditor *current = tab_container->get_child(selected)->cast_to<ScriptTextEditor>();
-	if (!current)
-		return;
+	if (current) {
+		apply_scripts();
+	}
 
-	apply_scripts();
+	//remove from history
+	history.resize(history_pos+1);
+
+	for(int i=0;i<history.size();i++) {
+		if (history[i].control==tselected) {
+			history.remove(i);
+			i--;
+			history_pos--;
+		}
+	}
+
+	if (history_pos>=history.size()) {
+		history_pos=history.size()-1;
+	}
 
 	int idx = tab_container->get_current_tab();
-	memdelete(current);
+	memdelete(tselected);
 	if (idx>=tab_container->get_child_count())
 		idx=tab_container->get_child_count()-1;
 	if (idx>=0) {
+
+		if (history_pos>=0) {
+			idx = history[history_pos].control->get_index();
+		}
 		tab_container->set_current_tab(idx);
+
 		//script_list->select(idx);
 	}
 
 
+	_update_history_arrows();
+
+
 
 	_update_script_names();
 	EditorNode::get_singleton()->save_layout();
@@ -755,33 +846,15 @@ void ScriptEditor::swap_lines(TextEdit *tx, int line1, int line2)
 void ScriptEditor::_menu_option(int p_option) {
 
 
-	if (p_option==FILE_OPEN) {
-		editor->open_resource("Script");
-		return;
-	}
-	int selected = tab_container->get_current_tab();
-	if (selected<0 || selected>=tab_container->get_child_count())
-		return;
-
-	ScriptTextEditor *current = tab_container->get_child(selected)->cast_to<ScriptTextEditor>();
-	if (!current)
-		return;
-
 	switch(p_option) {
 		case FILE_NEW: {
 			script_create_dialog->config("Node", ".gd");
 			script_create_dialog->popup_centered(Size2(300, 300));
 		} break;
-		case FILE_SAVE: {
-			if (!_test_script_times_on_disk())
-				return;
-			editor->save_resource( current->get_edited_script() );
-
-		} break;
-		case FILE_SAVE_AS: {
-
-			editor->save_resource_as( current->get_edited_script() );
+		case FILE_OPEN: {
 
+			editor->open_resource("Script");
+			return;
 		} break;
 		case FILE_SAVE_ALL: {
 
@@ -806,387 +879,470 @@ void ScriptEditor::_menu_option(int p_option) {
 
 
 		} break;
-		case EDIT_UNDO: {
-			current->get_text_edit()->undo();
-			current->get_text_edit()->call_deferred("grab_focus");
+		case SEARCH_HELP: {
+
+			help_search_dialog->popup("current");
 		} break;
-		case EDIT_REDO: {
-			current->get_text_edit()->redo();
-			current->get_text_edit()->call_deferred("grab_focus");
-		} break;
-		case EDIT_CUT: {
+		case SEARCH_CLASSES: {
 
-			current->get_text_edit()->cut();
-			current->get_text_edit()->call_deferred("grab_focus");
-		} break;
-		case EDIT_COPY: {
-			current->get_text_edit()->copy();
-			current->get_text_edit()->call_deferred("grab_focus");
+			if (tab_container->get_tab_count()==0)
+				break;
 
-		} break;
-		case EDIT_PASTE: {
-			current->get_text_edit()->paste();
-			current->get_text_edit()->call_deferred("grab_focus");
+			String current;
 
-		} break;
-		case EDIT_SELECT_ALL: {
-
-			current->get_text_edit()->select_all();
-			current->get_text_edit()->call_deferred("grab_focus");
-
-		} break;
-        case EDIT_MOVE_LINE_UP: {
-
-            TextEdit *tx = current->get_text_edit();
-            Ref<Script> scr = current->get_edited_script();
-            if (scr.is_null())
-                return;
-
-            if (tx->is_selection_active())
-            {
-                int from_line = tx->get_selection_from_line();
-                int from_col  = tx->get_selection_from_column();
-                int to_line   = tx->get_selection_to_line();
-                int to_column = tx->get_selection_to_column();
-
-                for (int i = from_line; i <= to_line; i++)
-                {
-                    int line_id = i;
-                    int next_id = i - 1;
-
-                    if (line_id == 0 || next_id < 0)
-                        return;
-
-                    swap_lines(tx, line_id, next_id);
-                }
-                int from_line_up = from_line > 0 ? from_line-1 : from_line;
-                int to_line_up   = to_line   > 0 ? to_line-1   : to_line;
-                tx->select(from_line_up, from_col, to_line_up, to_column);
-            }
-            else
-            {
-                int line_id = tx->cursor_get_line();
-                int next_id = line_id - 1;
-
-                if (line_id == 0 || next_id < 0)
-                    return;
-
-                swap_lines(tx, line_id, next_id);
-            }
-            tx->update();
-
-        } break;
-        case EDIT_MOVE_LINE_DOWN: {
-
-            TextEdit *tx = current->get_text_edit();
-            Ref<Script> scr = current->get_edited_script();
-            if (scr.is_null())
-                return;
-
-            if (tx->is_selection_active())
-            {
-                int from_line = tx->get_selection_from_line();
-                int from_col  = tx->get_selection_from_column();
-                int to_line   = tx->get_selection_to_line();
-                int to_column = tx->get_selection_to_column();
-
-                for (int i = to_line; i >= from_line; i--)
-                {
-                    int line_id = i;
-                    int next_id = i + 1;
-
-                    if (line_id == tx->get_line_count()-1 || next_id > tx->get_line_count())
-                        return;
-
-                    swap_lines(tx, line_id, next_id);
-                }
-                int from_line_down = from_line < tx->get_line_count() ? from_line+1 : from_line;
-                int to_line_down   = to_line   < tx->get_line_count() ? to_line+1   : to_line;
-                tx->select(from_line_down, from_col, to_line_down, to_column);
-            }
-            else
-            {
-                int line_id = tx->cursor_get_line();
-                int next_id = line_id + 1;
-
-                if (line_id == tx->get_line_count()-1 || next_id > tx->get_line_count())
-                    return;
-
-                swap_lines(tx, line_id, next_id);
-            }
-            tx->update();
-
-        } break;
-        case EDIT_INDENT_LEFT: {
-
-            TextEdit *tx = current->get_text_edit();
-            Ref<Script> scr = current->get_edited_script();
-            if (scr.is_null())
-                return;
-
-
-            if (tx->is_selection_active())
-            {
-		int begin = tx->get_selection_from_line();
-		int end = tx->get_selection_to_line();
-                for (int i = begin; i <= end; i++)
-                {
-                    String line_text = tx->get_line(i);
-                    // begins with tab
-                    if (line_text.begins_with("\t"))
-                    {
-                        line_text = line_text.substr(1, line_text.length());
-                        tx->set_line(i, line_text);
-                    }
-                    // begins with 4 spaces
-                    else if (line_text.begins_with("    "))
-                    {
-                        line_text = line_text.substr(4, line_text.length());
-                        tx->set_line(i, line_text);
-                    }
-                }
-            }
-            else
-            {
-		int begin = tx->cursor_get_line();
-                String line_text = tx->get_line(begin);
-                // begins with tab
-                if (line_text.begins_with("\t"))
-                {
-                    line_text = line_text.substr(1, line_text.length());
-                    tx->set_line(begin, line_text);
-                }
-                // begins with 4 spaces
-                else if (line_text.begins_with("    "))
-                {
-                    line_text = line_text.substr(4, line_text.length());
-                    tx->set_line(begin, line_text);
-                }
-            }
-            tx->update();
-            //tx->deselect();
-
-        } break;
-        case EDIT_INDENT_RIGHT: {
-
-            TextEdit *tx = current->get_text_edit();
-            Ref<Script> scr = current->get_edited_script();
-            if (scr.is_null())
-                return;
-
-            if (tx->is_selection_active())
-            {
-		int begin = tx->get_selection_from_line();
-		int end = tx->get_selection_to_line();
-                for (int i = begin; i <= end; i++)
-                {
-                    String line_text = tx->get_line(i);
-                    line_text = '\t' + line_text;
-                    tx->set_line(i, line_text);
-                }
-            }
-            else
-            {
-		int begin = tx->cursor_get_line();
-                String line_text = tx->get_line(begin);
-                line_text = '\t' + line_text;
-                tx->set_line(begin, line_text);
-            }
-            tx->update();
-            //tx->deselect();
-
-        } break;
-        case EDIT_CLONE_DOWN: {
-
-            TextEdit *tx = current->get_text_edit();
-            Ref<Script> scr = current->get_edited_script();
-            if (scr.is_null())
-                return;
-            int line = tx->cursor_get_line();
-            int next_line = line + 1;
-
-            if (line == tx->get_line_count() || next_line > tx->get_line_count())
-                return;
-
-            String line_clone = tx->get_line(line);
-            tx->insert_at(line_clone, next_line);
-            tx->update();
-
-        } break;
-        case EDIT_TOGGLE_COMMENT: {
-
-            TextEdit *tx = current->get_text_edit();
-            Ref<Script> scr = current->get_edited_script();
-            if (scr.is_null())
-                return;
-
-
-
-            if (tx->is_selection_active())
-            {
-		int begin = tx->get_selection_from_line();
-		int end = tx->get_selection_to_line();
-                for (int i = begin; i <= end; i++)
-                {
-                    String line_text = tx->get_line(i);
-
-                    if (line_text.begins_with("#"))
-                        line_text = line_text.substr(1, line_text.length());
-                    else
-                        line_text = "#" + line_text;
-                    tx->set_line(i, line_text);
-                }
-            }
-            else
-            {
-		int begin = tx->cursor_get_line();
-                String line_text = tx->get_line(begin);
-
-                if (line_text.begins_with("#"))
-                    line_text = line_text.substr(1, line_text.length());
-                else
-                    line_text = "#" + line_text;
-                tx->set_line(begin, line_text);
-            }
-            tx->update();
-            //tx->deselect();
-
-        } break;
-		case EDIT_COMPLETE: {
-
-			current->get_text_edit()->query_code_comple();
-
-		} break;
-		case EDIT_AUTO_INDENT: {
-
-			TextEdit *te = current->get_text_edit();
-			String text = te->get_text();
-			Ref<Script> scr = current->get_edited_script();
-			if (scr.is_null())
-				return;
-			int begin,end;
-			if (te->is_selection_active()) {
-				begin=te->get_selection_from_line();
-				end=te->get_selection_to_line();
-			} else {
-				begin=0;
-				end=te->get_line_count()-1;
+			EditorHelp *eh = tab_container->get_child( tab_container->get_current_tab() )->cast_to<EditorHelp>();
+			if (eh) {
+				current=eh->get_class_name();
 			}
-			scr->get_language()->auto_indent_code(text,begin,end);
-			te->set_text(text);
 
+			help_index->popup_centered_ratio(0.6);
 
+			if (current!="") {
+				help_index->call_deferred("select_class",current);
+			}
 		} break;
-		case SEARCH_FIND: {
+		case SEARCH_WEBSITE: {
 
-			find_replace_dialog->set_text_edit(current->get_text_edit());
-			find_replace_dialog->popup_search();
+			OS::get_singleton()->shell_open("http://www.godotengine.org/projects/godot-engine/wiki/Documentation#Tutorials");
 		} break;
-		case SEARCH_FIND_NEXT: {
 
-			find_replace_dialog->set_text_edit(current->get_text_edit());
-			 find_replace_dialog->search_next();
+		case WINDOW_NEXT: {
+
+			_history_forward();
 		} break;
-		case SEARCH_REPLACE: {
-
-			find_replace_dialog->set_text_edit(current->get_text_edit());
-			find_replace_dialog->popup_replace();
+		case WINDOW_PREV: {
+			_history_back();
 		} break;
-		case SEARCH_LOCATE_FUNCTION: {
 
-			if (!current)
-				return;
-			quick_open->popup(current->get_functions());
-		} break;
-		case SEARCH_GOTO_LINE: {
+	}
 
-			goto_line_dialog->popup_find_line(current->get_text_edit());
-		} break;
-		case DEBUG_TOGGLE_BREAKPOINT: {
-			int line=current->get_text_edit()->cursor_get_line();
-			bool dobreak = !current->get_text_edit()->is_line_set_as_breakpoint(line);
-			current->get_text_edit()->set_line_as_breakpoint(line,dobreak);
-			get_debugger()->set_breakpoint(current->get_edited_script()->get_path(),line+1,dobreak);
-		} break;
-		case DEBUG_NEXT: {
 
-			if (debugger)
-				debugger->debug_next();
-		} break;
-		case DEBUG_STEP: {
+	int selected = tab_container->get_current_tab();
+	if (selected<0 || selected>=tab_container->get_child_count())
+		return;
 
-			if (debugger)
-				debugger->debug_step();
+	ScriptTextEditor *current = tab_container->get_child(selected)->cast_to<ScriptTextEditor>();
+	if (current) {
 
-		} break;
-		case DEBUG_BREAK: {
+		switch(p_option) {
+			case FILE_NEW: {
+				script_create_dialog->config("Node", ".gd");
+				script_create_dialog->popup_centered(Size2(300, 300));
+			} break;
+			case FILE_SAVE: {
+				if (!_test_script_times_on_disk())
+					return;
+				editor->save_resource( current->get_edited_script() );
 
-			if (debugger)
-				debugger->debug_break();
+			} break;
+			case FILE_SAVE_AS: {
 
-		} break;
-		case DEBUG_CONTINUE: {
+				editor->save_resource_as( current->get_edited_script() );
 
-			if (debugger)
-				debugger->debug_continue();
+			} break;
+			case EDIT_UNDO: {
+				current->get_text_edit()->undo();
+				current->get_text_edit()->call_deferred("grab_focus");
+			} break;
+			case EDIT_REDO: {
+				current->get_text_edit()->redo();
+				current->get_text_edit()->call_deferred("grab_focus");
+			} break;
+			case EDIT_CUT: {
 
-		} break;
-		case DEBUG_SHOW: {
-			if (debugger) {
-				bool visible = debug_menu->get_popup()->is_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW) );
-				debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), !visible);
-				if (visible)
-					debugger->hide();
+				current->get_text_edit()->cut();
+				current->get_text_edit()->call_deferred("grab_focus");
+			} break;
+			case EDIT_COPY: {
+				current->get_text_edit()->copy();
+				current->get_text_edit()->call_deferred("grab_focus");
+
+			} break;
+			case EDIT_PASTE: {
+				current->get_text_edit()->paste();
+				current->get_text_edit()->call_deferred("grab_focus");
+
+			} break;
+			case EDIT_SELECT_ALL: {
+
+				current->get_text_edit()->select_all();
+				current->get_text_edit()->call_deferred("grab_focus");
+
+			} break;
+			case EDIT_MOVE_LINE_UP: {
+
+				TextEdit *tx = current->get_text_edit();
+				Ref<Script> scr = current->get_edited_script();
+				if (scr.is_null())
+					return;
+
+				if (tx->is_selection_active())
+				{
+					int from_line = tx->get_selection_from_line();
+					int from_col  = tx->get_selection_from_column();
+					int to_line   = tx->get_selection_to_line();
+					int to_column = tx->get_selection_to_column();
+
+					for (int i = from_line; i <= to_line; i++)
+					{
+						int line_id = i;
+						int next_id = i - 1;
+
+						if (line_id == 0 || next_id < 0)
+							return;
+
+						swap_lines(tx, line_id, next_id);
+					}
+					int from_line_up = from_line > 0 ? from_line-1 : from_line;
+					int to_line_up   = to_line   > 0 ? to_line-1   : to_line;
+					tx->select(from_line_up, from_col, to_line_up, to_column);
+				}
 				else
-					debugger->show();
-			}
-		} break;
-		case HELP_CONTEXTUAL: {
-			String text = current->get_text_edit()->get_selection_text();
-			if (text == "")
-				text = current->get_text_edit()->get_word_under_cursor();
-			if (text != "")
-				editor->emit_signal("request_help", text);
-		} break;
-		case FILE_CLOSE: {
-			if (current->get_text_edit()->get_version()!=current->get_text_edit()->get_saved_version()) {
-				erase_tab_confirm->set_text("Close and save changes?\n\""+current->get_name()+"\"");
-				erase_tab_confirm->popup_centered_minsize();
-			} else {
-				_close_current_tab();
-			}
-		} break;
-		case WINDOW_MOVE_LEFT: {
+				{
+					int line_id = tx->cursor_get_line();
+					int next_id = line_id - 1;
 
-			if (tab_container->get_current_tab()>0) {
-				tab_container->call_deferred("set_current_tab",tab_container->get_current_tab()-1);
-				script_list->call_deferred("select",tab_container->get_current_tab()-1);
-				tab_container->move_child(current,tab_container->get_current_tab()-1);
-				_update_script_names();
-			}
-		} break;
-		case WINDOW_MOVE_RIGHT: {
+					if (line_id == 0 || next_id < 0)
+						return;
 
-			if (tab_container->get_current_tab()<tab_container->get_child_count()-1) {
-				tab_container->call_deferred("set_current_tab",tab_container->get_current_tab()+1);
-				script_list->call_deferred("select",tab_container->get_current_tab()+1);
-				tab_container->move_child(current,tab_container->get_current_tab()+1);
-				_update_script_names();
-			}
+					swap_lines(tx, line_id, next_id);
+				}
+				tx->update();
+
+			} break;
+			case EDIT_MOVE_LINE_DOWN: {
+
+				TextEdit *tx = current->get_text_edit();
+				Ref<Script> scr = current->get_edited_script();
+				if (scr.is_null())
+					return;
+
+				if (tx->is_selection_active())
+				{
+					int from_line = tx->get_selection_from_line();
+					int from_col  = tx->get_selection_from_column();
+					int to_line   = tx->get_selection_to_line();
+					int to_column = tx->get_selection_to_column();
+
+					for (int i = to_line; i >= from_line; i--)
+					{
+						int line_id = i;
+						int next_id = i + 1;
+
+						if (line_id == tx->get_line_count()-1 || next_id > tx->get_line_count())
+							return;
+
+						swap_lines(tx, line_id, next_id);
+					}
+					int from_line_down = from_line < tx->get_line_count() ? from_line+1 : from_line;
+					int to_line_down   = to_line   < tx->get_line_count() ? to_line+1   : to_line;
+					tx->select(from_line_down, from_col, to_line_down, to_column);
+				}
+				else
+				{
+					int line_id = tx->cursor_get_line();
+					int next_id = line_id + 1;
+
+					if (line_id == tx->get_line_count()-1 || next_id > tx->get_line_count())
+						return;
+
+					swap_lines(tx, line_id, next_id);
+				}
+				tx->update();
+
+			} break;
+			case EDIT_INDENT_LEFT: {
+
+				TextEdit *tx = current->get_text_edit();
+				Ref<Script> scr = current->get_edited_script();
+				if (scr.is_null())
+					return;
 
 
-		} break;
-		default: {
+				if (tx->is_selection_active())
+				{
+					int begin = tx->get_selection_from_line();
+					int end = tx->get_selection_to_line();
+					for (int i = begin; i <= end; i++)
+					{
+						String line_text = tx->get_line(i);
+						// begins with tab
+						if (line_text.begins_with("\t"))
+						{
+							line_text = line_text.substr(1, line_text.length());
+							tx->set_line(i, line_text);
+						}
+						// begins with 4 spaces
+						else if (line_text.begins_with("    "))
+						{
+							line_text = line_text.substr(4, line_text.length());
+							tx->set_line(i, line_text);
+						}
+					}
+				}
+				else
+				{
+					int begin = tx->cursor_get_line();
+					String line_text = tx->get_line(begin);
+					// begins with tab
+					if (line_text.begins_with("\t"))
+					{
+						line_text = line_text.substr(1, line_text.length());
+						tx->set_line(begin, line_text);
+					}
+					// begins with 4 spaces
+					else if (line_text.begins_with("    "))
+					{
+						line_text = line_text.substr(4, line_text.length());
+						tx->set_line(begin, line_text);
+					}
+				}
+				tx->update();
+				//tx->deselect();
 
-			if (p_option>=WINDOW_SELECT_BASE) {
+			} break;
+			case EDIT_INDENT_RIGHT: {
 
-				tab_container->set_current_tab(p_option-WINDOW_SELECT_BASE);
-				script_list->select(p_option-WINDOW_SELECT_BASE);
+				TextEdit *tx = current->get_text_edit();
+				Ref<Script> scr = current->get_edited_script();
+				if (scr.is_null())
+					return;
 
+				if (tx->is_selection_active())
+				{
+					int begin = tx->get_selection_from_line();
+					int end = tx->get_selection_to_line();
+					for (int i = begin; i <= end; i++)
+					{
+						String line_text = tx->get_line(i);
+						line_text = '\t' + line_text;
+						tx->set_line(i, line_text);
+					}
+				}
+				else
+				{
+					int begin = tx->cursor_get_line();
+					String line_text = tx->get_line(begin);
+					line_text = '\t' + line_text;
+					tx->set_line(begin, line_text);
+				}
+				tx->update();
+				//tx->deselect();
+
+			} break;
+			case EDIT_CLONE_DOWN: {
+
+				TextEdit *tx = current->get_text_edit();
+				Ref<Script> scr = current->get_edited_script();
+				if (scr.is_null())
+					return;
+				int line = tx->cursor_get_line();
+				int next_line = line + 1;
+
+				if (line == tx->get_line_count() || next_line > tx->get_line_count())
+					return;
+
+				String line_clone = tx->get_line(line);
+				tx->insert_at(line_clone, next_line);
+				tx->update();
+
+			} break;
+			case EDIT_TOGGLE_COMMENT: {
+
+				TextEdit *tx = current->get_text_edit();
+				Ref<Script> scr = current->get_edited_script();
+				if (scr.is_null())
+					return;
+
+
+
+				if (tx->is_selection_active())
+				{
+					int begin = tx->get_selection_from_line();
+					int end = tx->get_selection_to_line();
+					for (int i = begin; i <= end; i++)
+					{
+						String line_text = tx->get_line(i);
+
+						if (line_text.begins_with("#"))
+							line_text = line_text.substr(1, line_text.length());
+						else
+							line_text = "#" + line_text;
+						tx->set_line(i, line_text);
+					}
+				}
+				else
+				{
+					int begin = tx->cursor_get_line();
+					String line_text = tx->get_line(begin);
+
+					if (line_text.begins_with("#"))
+						line_text = line_text.substr(1, line_text.length());
+					else
+						line_text = "#" + line_text;
+					tx->set_line(begin, line_text);
+				}
+				tx->update();
+				//tx->deselect();
+
+			} break;
+			case EDIT_COMPLETE: {
+
+				current->get_text_edit()->query_code_comple();
+
+			} break;
+			case EDIT_AUTO_INDENT: {
+
+				TextEdit *te = current->get_text_edit();
+				String text = te->get_text();
+				Ref<Script> scr = current->get_edited_script();
+				if (scr.is_null())
+					return;
+				int begin,end;
+				if (te->is_selection_active()) {
+					begin=te->get_selection_from_line();
+					end=te->get_selection_to_line();
+				} else {
+					begin=0;
+					end=te->get_line_count()-1;
+				}
+				scr->get_language()->auto_indent_code(text,begin,end);
+				te->set_text(text);
+
+
+			} break;
+			case SEARCH_FIND: {
+
+				find_replace_dialog->set_text_edit(current->get_text_edit());
+				find_replace_dialog->popup_search();
+			} break;
+			case SEARCH_FIND_NEXT: {
+
+				find_replace_dialog->set_text_edit(current->get_text_edit());
+				find_replace_dialog->search_next();
+			} break;
+			case SEARCH_REPLACE: {
+
+				find_replace_dialog->set_text_edit(current->get_text_edit());
+				find_replace_dialog->popup_replace();
+			} break;
+			case SEARCH_LOCATE_FUNCTION: {
+
+				if (!current)
+					return;
+				quick_open->popup(current->get_functions());
+			} break;
+			case SEARCH_GOTO_LINE: {
+
+				goto_line_dialog->popup_find_line(current->get_text_edit());
+			} break;
+			case DEBUG_TOGGLE_BREAKPOINT: {
+				int line=current->get_text_edit()->cursor_get_line();
+				bool dobreak = !current->get_text_edit()->is_line_set_as_breakpoint(line);
+				current->get_text_edit()->set_line_as_breakpoint(line,dobreak);
+				get_debugger()->set_breakpoint(current->get_edited_script()->get_path(),line+1,dobreak);
+			} break;
+			case DEBUG_NEXT: {
+
+				if (debugger)
+					debugger->debug_next();
+			} break;
+			case DEBUG_STEP: {
+
+				if (debugger)
+					debugger->debug_step();
+
+			} break;
+			case DEBUG_BREAK: {
+
+				if (debugger)
+					debugger->debug_break();
+
+			} break;
+			case DEBUG_CONTINUE: {
+
+				if (debugger)
+					debugger->debug_continue();
+
+			} break;
+			case DEBUG_SHOW: {
+				if (debugger) {
+					bool visible = debug_menu->get_popup()->is_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW) );
+					debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), !visible);
+					if (visible)
+						debugger->hide();
+					else
+						debugger->show();
+				}
+			} break;
+			case HELP_CONTEXTUAL: {
+				String text = current->get_text_edit()->get_selection_text();
+				if (text == "")
+					text = current->get_text_edit()->get_word_under_cursor();
+				if (text != "")
+					help_search_dialog->popup(text);
+			} break;
+			case FILE_CLOSE: {
+				if (current->get_text_edit()->get_version()!=current->get_text_edit()->get_saved_version()) {
+					erase_tab_confirm->set_text("Close and save changes?\n\""+current->get_name()+"\"");
+					erase_tab_confirm->popup_centered_minsize();
+				} else {
+					_close_current_tab();
+				}
+			} break;
+			case WINDOW_MOVE_LEFT: {
+
+				if (tab_container->get_current_tab()>0) {
+					tab_container->call_deferred("set_current_tab",tab_container->get_current_tab()-1);
+					script_list->call_deferred("select",tab_container->get_current_tab()-1);
+					tab_container->move_child(current,tab_container->get_current_tab()-1);
+					_update_script_names();
+				}
+			} break;
+			case WINDOW_MOVE_RIGHT: {
+
+				if (tab_container->get_current_tab()<tab_container->get_child_count()-1) {
+					tab_container->call_deferred("set_current_tab",tab_container->get_current_tab()+1);
+					script_list->call_deferred("select",tab_container->get_current_tab()+1);
+					tab_container->move_child(current,tab_container->get_current_tab()+1);
+					_update_script_names();
+				}
+
+
+			} break;
+
+			default: {
+
+				if (p_option>=WINDOW_SELECT_BASE) {
+
+					tab_container->set_current_tab(p_option-WINDOW_SELECT_BASE);
+					script_list->select(p_option-WINDOW_SELECT_BASE);
+
+				}
 			}
 		}
 	}
 
+	EditorHelp *help = tab_container->get_child(selected)->cast_to<EditorHelp>();
+	if (help) {
+
+		switch(p_option) {
+
+			case SEARCH_FIND: {
+				help->popup_search();
+			} break;
+			case SEARCH_FIND_NEXT: {
+				help->search_again();
+			} break;
+			case FILE_CLOSE: {
+				_close_current_tab();
+			} break;
+
+
+		}
+	}
+
+
 }
 
 void ScriptEditor::_tab_changed(int p_which) {
@@ -1217,6 +1373,14 @@ void ScriptEditor::_notification(int p_what) {
 		}
 
 		EditorSettings::get_singleton()->connect("settings_changed",this,"_editor_settings_changed");
+		help_search->set_icon(get_icon("Help","EditorIcons"));
+		site_search->set_icon(get_icon("Godot","EditorIcons"));
+		class_search->set_icon(get_icon("ClassList","EditorIcons"));
+
+		script_forward->set_icon(get_icon("Forward","EditorIcons"));
+		script_back->set_icon(get_icon("Back","EditorIcons"));
+
+
 
 
 	}
@@ -1346,7 +1510,7 @@ void ScriptEditor::set_state(const Dictionary& p_state) {
 
 }
 void ScriptEditor::clear() {
-
+#if 0
 	List<ScriptTextEditor*> stes;
 	for(int i=0;i<tab_container->get_child_count();i++) {
 
@@ -1371,7 +1535,7 @@ void ScriptEditor::clear() {
 		script_list->select( script_list->find_metadata(idx) );
 	}
 
-
+#endif
 
 
 }
@@ -1402,31 +1566,6 @@ void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
 
 
 
-void ScriptEditor::_bind_methods() {
-
-	ObjectTypeDB::bind_method("_tab_changed",&ScriptEditor::_tab_changed);
-	ObjectTypeDB::bind_method("_menu_option",&ScriptEditor::_menu_option);
-	ObjectTypeDB::bind_method("_close_current_tab",&ScriptEditor::_close_current_tab);
-	ObjectTypeDB::bind_method("_editor_play",&ScriptEditor::_editor_play);
-	ObjectTypeDB::bind_method("_editor_pause",&ScriptEditor::_editor_pause);
-	ObjectTypeDB::bind_method("_editor_stop",&ScriptEditor::_editor_stop);
-	ObjectTypeDB::bind_method("_add_callback",&ScriptEditor::_add_callback);
-	ObjectTypeDB::bind_method("_reload_scripts",&ScriptEditor::_reload_scripts);
-	ObjectTypeDB::bind_method("_resave_scripts",&ScriptEditor::_resave_scripts);
-	ObjectTypeDB::bind_method("_res_saved_callback",&ScriptEditor::_res_saved_callback);
-	ObjectTypeDB::bind_method("_goto_script_line",&ScriptEditor::_goto_script_line);
-	ObjectTypeDB::bind_method("_goto_script_line2",&ScriptEditor::_goto_script_line2);
-	ObjectTypeDB::bind_method("_breaked",&ScriptEditor::_breaked);
-	ObjectTypeDB::bind_method("_show_debugger",&ScriptEditor::_show_debugger);
-	ObjectTypeDB::bind_method("_get_debug_tooltip",&ScriptEditor::_get_debug_tooltip);
-	ObjectTypeDB::bind_method("_autosave_scripts",&ScriptEditor::_autosave_scripts);
-	ObjectTypeDB::bind_method("_editor_settings_changed",&ScriptEditor::_editor_settings_changed);
-	ObjectTypeDB::bind_method("_update_script_names",&ScriptEditor::_update_script_names);
-	ObjectTypeDB::bind_method("_tree_changed",&ScriptEditor::_tree_changed);
-	ObjectTypeDB::bind_method("_script_selected",&ScriptEditor::_script_selected);
-	ObjectTypeDB::bind_method("_script_created",&ScriptEditor::_script_created);
-	ObjectTypeDB::bind_method("_script_split_dragged",&ScriptEditor::_script_split_dragged);
-}
 
 
 void ScriptEditor::ensure_focus_current() {
@@ -1448,7 +1587,8 @@ void ScriptEditor::ensure_focus_current() {
 void ScriptEditor::_script_selected(int p_idx) {
 
 	grab_focus_block = !Input::get_singleton()->is_mouse_button_pressed(1); //amazing hack, simply amazing
-	tab_container->set_current_tab(script_list->get_item_metadata(p_idx));
+
+	_go_to_tab(script_list->get_item_metadata(p_idx));
 	grab_focus_block=false;
 }
 
@@ -1457,16 +1597,38 @@ void ScriptEditor::ensure_select_current() {
 
 	if (tab_container->get_child_count() && tab_container->get_current_tab()>=0) {
 
-		ScriptTextEditor *ste = tab_container->get_child(tab_container->get_current_tab())->cast_to<ScriptTextEditor>();
-		if (!ste)
-			return;
-		Ref<Script> script = ste->get_edited_script();
+		Node *current = tab_container->get_child(tab_container->get_current_tab());
 
-		if (!grab_focus_block && is_inside_tree())
-			ste->get_text_edit()->grab_focus();
+
+		ScriptTextEditor *ste = current->cast_to<ScriptTextEditor>();
+		if (ste) {
+
+			Ref<Script> script = ste->get_edited_script();
+
+			if (!grab_focus_block && is_inside_tree())
+				ste->get_text_edit()->grab_focus();
+
+			edit_menu->show();
+			search_menu->show();
+			script_search_menu->hide();
+
+
+		}
+
+		EditorHelp *eh = current->cast_to<EditorHelp>();
+
+		if (eh) {
+			edit_menu->hide();
+			search_menu->hide();
+			script_search_menu->show();
+
+		}
 	}
 
 
+
+
+
 }
 
 void ScriptEditor::_find_scripts(Node* p_base, Node* p_current, Set<Ref<Script> > &used) {
@@ -1485,6 +1647,56 @@ void ScriptEditor::_find_scripts(Node* p_base, Node* p_current, Set<Ref<Script>
 
 }
 
+struct _ScriptEditorItemData {
+
+	String name;
+	Ref<Texture> icon;
+	int index;
+	String tooltip;
+	bool used;
+
+
+	bool operator<(const _ScriptEditorItemData& id) const {
+
+		return name.nocasecmp_to(id.name)<0;
+	}
+
+};
+
+
+void ScriptEditor::_update_script_colors() {
+
+	bool enabled = EditorSettings::get_singleton()->get("text_editor/script_temperature_enabled");
+	if (!enabled)
+		return;
+
+	int hist_size = EditorSettings::get_singleton()->get("text_editor/script_temperature_history_size");
+	Color hot_color=EditorSettings::get_singleton()->get("text_editor/script_temperature_hot_color");
+	Color cold_color=EditorSettings::get_singleton()->get("text_editor/script_temperature_cold_color");
+
+	for(int i=0;i<script_list->get_item_count();i++) {
+
+		int c = script_list->get_item_metadata(i);
+		Node *n = tab_container->get_child(c);
+		if (!n)
+			continue;
+
+		script_list->set_item_custom_bg_color(i,Color(0,0,0,0));
+		if (!n->has_meta("__editor_pass")) {
+			continue;
+		}
+
+		int pass=n->get_meta("__editor_pass");
+		int h = edit_pass - pass;
+		if (h>hist_size) {
+			continue;
+		}
+		float v = Math::ease((edit_pass-pass)/float_t(hist_size),0.4);
+
+
+		script_list->set_item_custom_bg_color(i,hot_color.linear_interpolate(cold_color,v));
+	}
+}
 
 void ScriptEditor::_update_script_names() {
 
@@ -1496,31 +1708,73 @@ void ScriptEditor::_update_script_names() {
 	}
 
 	script_list->clear();
+
+	Vector<_ScriptEditorItemData> sedata;
+
 	for(int i=0;i<tab_container->get_child_count();i++) {
 
+
 		ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>();
-		if (!ste)
-			continue;
+		if (ste) {
 
-		String script = ste->get_name();
-		Ref<Texture> icon = ste->get_icon();
-		String path = ste->get_edited_script()->get_path();
-		script_list->add_item(script,icon);
+			String name = ste->get_name();
+			Ref<Texture> icon = ste->get_icon();
+			String tooltip = ste->get_edited_script()->get_path();
 
+			_ScriptEditorItemData sd;
+			sd.icon=icon;
+			sd.name=name;
+			sd.tooltip=tooltip;
+			sd.index=i;
+			sd.used=used.has(ste->get_edited_script());
+
+			sedata.push_back(sd);
+		}
+
+		EditorHelp *eh = tab_container->get_child(i)->cast_to<EditorHelp>();
+		if (eh) {
+
+			String name = eh->get_class_name();
+			Ref<Texture> icon = get_icon("Help","EditorIcons");
+			String tooltip = name+" Class Reference";
+
+			_ScriptEditorItemData sd;
+			sd.icon=icon;
+			sd.name=name;
+			sd.tooltip=tooltip;
+			sd.index=i;
+			sd.used=false;
+			sedata.push_back(sd);
+
+		}
+
+
+	}
+
+	sedata.sort();
+
+	for(int i=0;i<sedata.size();i++) {
+
+		script_list->add_item(sedata[i].name,sedata[i].icon);
 		int index = script_list->get_item_count()-1;
-
-		script_list->set_item_tooltip(index,path);
-		script_list->set_item_metadata(index,i);
-		if (used.has(ste->get_edited_script())) {
+		script_list->set_item_tooltip(index,sedata[i].tooltip);
+		script_list->set_item_metadata(index,sedata[i].index);
+		if (sedata[i].used) {
 
 			script_list->set_item_custom_bg_color(index,Color(88/255.0,88/255.0,60/255.0));
 		}
-		if (tab_container->get_current_tab()==index) {
+		if (tab_container->get_current_tab()==sedata[i].index) {
 			script_list->select(index);
+			script_name_label->set_text(sedata[i].name);
+			script_icon->set_texture(sedata[i].icon);
+
 		}
 	}
 
-	script_list->sort_items_by_text();
+	_update_script_colors();
+
+
+
 
 }
 
@@ -1531,6 +1785,8 @@ void ScriptEditor::edit(const Ref<Script>& p_script) {
 
 	// see if already has it
 
+	bool open_dominant = EditorSettings::get_singleton()->get("text_editor/open_dominant_script_on_scene_change");
+
 	if (p_script->get_path().is_resource_file() && bool(EditorSettings::get_singleton()->get("external_editor/use_external_editor"))) {
 
 		String path = EditorSettings::get_singleton()->get("external_editor/exec_path");
@@ -1559,12 +1815,13 @@ void ScriptEditor::edit(const Ref<Script>& p_script) {
 
 		if (ste->get_edited_script()==p_script) {
 
-			if (!EditorNode::get_singleton()->is_changing_scene()) {
+			if (open_dominant || !EditorNode::get_singleton()->is_changing_scene()) {
 				if (tab_container->get_current_tab()!=i) {
-					tab_container->set_current_tab(i);
+					_go_to_tab(i);
 					script_list->select( script_list->find_metadata(i) );
 				}
-				ste->get_text_edit()->grab_focus();
+				if (is_visible())
+					ste->get_text_edit()->grab_focus();
 			}
 			return;
 		}
@@ -1576,7 +1833,8 @@ void ScriptEditor::edit(const Ref<Script>& p_script) {
 	ste->set_edited_script(p_script);
 	ste->get_text_edit()->set_tooltip_request_func(this,"_get_debug_tooltip",ste);
 	tab_container->add_child(ste);
-	tab_container->set_current_tab(tab_container->get_tab_count()-1);
+	_go_to_tab(tab_container->get_tab_count()-1);
+
 
 
 
@@ -1675,7 +1933,7 @@ void ScriptEditor::_add_callback(Object *p_obj, const String& p_function, const
 			ste->get_text_edit()->insert_text_at_cursor("\n\n"+func);
 		}
 
-		tab_container->set_current_tab(i);
+		_go_to_tab(i);
 		ste->get_text_edit()->cursor_set_line(pos);
 		ste->get_text_edit()->cursor_set_column(1);
 
@@ -1726,10 +1984,13 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
 		return;
 	}
 
-	if (!p_layout->has_section_key("ScriptEditor","open_scripts"))
+	if (!p_layout->has_section_key("ScriptEditor","open_scripts") && !p_layout->has_section_key("ScriptEditor","open_help"))
 		return;
 
 	Array scripts = p_layout->get_value("ScriptEditor","open_scripts");
+	Array helps;
+	if (p_layout->has_section_key("ScriptEditor","open_help"))
+		helps=p_layout->get_value("ScriptEditor","open_help");
 
 	restoring_layout=true;
 
@@ -1742,6 +2003,18 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
 		}
 	}
 
+
+	for(int i=0;i<helps.size();i++) {
+
+		String path = helps[i];
+		_help_class_open(path);
+	}
+
+	for(int i=0;i<tab_container->get_child_count();i++) {
+		tab_container->get_child(i)->set_meta("__editor_pass",Variant());
+	}
+
+
 	if (p_layout->has_section_key("ScriptEditor","split_offset")) {
 		script_split->set_split_offset(p_layout->get_value("ScriptEditor","split_offset"));
 	}
@@ -1754,27 +2027,184 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
 void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) {
 
 	Array scripts;
+	Array helps;
 
 	for(int i=0;i<tab_container->get_child_count();i++) {
 
 		ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>();
-		if (!ste)
-			continue;
+		if (ste) {
 
-		String path = ste->get_edited_script()->get_path();
-		if (!path.is_resource_file())
-			continue;
+			String path = ste->get_edited_script()->get_path();
+			if (!path.is_resource_file())
+				continue;
+
+			scripts.push_back(path);
+		}
+
+		EditorHelp *eh = tab_container->get_child(i)->cast_to<EditorHelp>();
+
+		if (eh) {
+
+			helps.push_back(eh->get_class_name());
+		}
 
-		scripts.push_back(path);
 
 	}
 
 	p_layout->set_value("ScriptEditor","open_scripts",scripts);
+	p_layout->set_value("ScriptEditor","open_help",helps);
 	p_layout->set_value("ScriptEditor","split_offset",script_split->get_split_offset());
 
 }
 
 
+void ScriptEditor::_help_class_open(const String& p_class) {
+
+
+	for(int i=0;i<tab_container->get_child_count();i++) {
+
+		EditorHelp *eh = tab_container->get_child(i)->cast_to<EditorHelp>();
+
+		if (eh && eh->get_class_name()==p_class) {
+
+			_go_to_tab(i);
+			_update_script_names();
+			return;
+		}
+	}
+
+	EditorHelp * eh = memnew( EditorHelp );
+
+
+	eh->set_name(p_class);
+	tab_container->add_child(eh);
+	_go_to_tab(tab_container->get_tab_count()-1);
+	eh->go_to_class(p_class,0);
+	eh->connect("go_to_help",this,"_help_class_goto");
+	_update_script_names();
+
+}
+
+void ScriptEditor::_help_class_goto(const String& p_desc) {
+
+
+	String cname=p_desc.get_slice(":",1);
+
+	for(int i=0;i<tab_container->get_child_count();i++) {
+
+		EditorHelp *eh = tab_container->get_child(i)->cast_to<EditorHelp>();
+
+		if (eh && eh->get_class_name()==cname) {
+
+			_go_to_tab(i);
+			eh->go_to_help(p_desc);
+			_update_script_names();
+			return;
+		}
+	}
+
+	EditorHelp * eh = memnew( EditorHelp );
+
+	eh->set_name(cname);
+	tab_container->add_child(eh);
+	_go_to_tab(tab_container->get_tab_count()-1);
+	eh->go_to_help(p_desc);
+	eh->connect("go_to_help",this,"_help_class_goto");
+	_update_script_names();
+
+}
+
+void ScriptEditor::_update_history_pos(int p_new_pos) {
+
+	Node *n = tab_container->get_current_tab_control();
+
+	if (n->cast_to<ScriptTextEditor>()) {
+
+		history[history_pos].scroll_pos=n->cast_to<ScriptTextEditor>()->get_text_edit()->get_v_scroll();
+		history[history_pos].cursor_column=n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_column();
+		history[history_pos].cursor_row=n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_line();
+	}
+	if (n->cast_to<EditorHelp>()) {
+
+		history[history_pos].scroll_pos=n->cast_to<EditorHelp>()->get_scroll();
+	}
+
+	history_pos=p_new_pos;
+	tab_container->set_current_tab(history[history_pos].control->get_index());
+
+	n = history[history_pos].control;
+
+	if (n->cast_to<ScriptTextEditor>()) {
+
+		n->cast_to<ScriptTextEditor>()->get_text_edit()->set_v_scroll(history[history_pos].scroll_pos);
+		n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_set_column( history[history_pos].cursor_column );
+		n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_set_line( history[history_pos].cursor_row );
+		n->cast_to<ScriptTextEditor>()->get_text_edit()->grab_focus();
+	}
+
+	if (n->cast_to<EditorHelp>()) {
+
+		n->cast_to<EditorHelp>()->set_scroll(history[history_pos].scroll_pos);
+		n->cast_to<EditorHelp>()->set_focused();
+	}
+
+	n->set_meta("__editor_pass",++edit_pass);
+	_update_script_names();
+	_update_history_arrows();
+
+}
+
+void ScriptEditor::_history_forward() {
+
+	if (history_pos<history.size()-1) {
+		_update_history_pos(history_pos+1);
+	}
+}
+
+void ScriptEditor::_history_back(){
+
+	if (history_pos>0) {
+		_update_history_pos(history_pos-1);
+	}
+
+}
+void ScriptEditor::set_scene_root_script( Ref<Script> p_script ) {
+
+	bool open_dominant = EditorSettings::get_singleton()->get("text_editor/open_dominant_script_on_scene_change");
+	if (open_dominant && p_script.is_valid()) {
+		edit(p_script);
+	}
+}
+
+void ScriptEditor::_bind_methods() {
+
+	ObjectTypeDB::bind_method("_tab_changed",&ScriptEditor::_tab_changed);
+	ObjectTypeDB::bind_method("_menu_option",&ScriptEditor::_menu_option);
+	ObjectTypeDB::bind_method("_close_current_tab",&ScriptEditor::_close_current_tab);
+	ObjectTypeDB::bind_method("_editor_play",&ScriptEditor::_editor_play);
+	ObjectTypeDB::bind_method("_editor_pause",&ScriptEditor::_editor_pause);
+	ObjectTypeDB::bind_method("_editor_stop",&ScriptEditor::_editor_stop);
+	ObjectTypeDB::bind_method("_add_callback",&ScriptEditor::_add_callback);
+	ObjectTypeDB::bind_method("_reload_scripts",&ScriptEditor::_reload_scripts);
+	ObjectTypeDB::bind_method("_resave_scripts",&ScriptEditor::_resave_scripts);
+	ObjectTypeDB::bind_method("_res_saved_callback",&ScriptEditor::_res_saved_callback);
+	ObjectTypeDB::bind_method("_goto_script_line",&ScriptEditor::_goto_script_line);
+	ObjectTypeDB::bind_method("_goto_script_line2",&ScriptEditor::_goto_script_line2);
+	ObjectTypeDB::bind_method("_breaked",&ScriptEditor::_breaked);
+	ObjectTypeDB::bind_method("_show_debugger",&ScriptEditor::_show_debugger);
+	ObjectTypeDB::bind_method("_get_debug_tooltip",&ScriptEditor::_get_debug_tooltip);
+	ObjectTypeDB::bind_method("_autosave_scripts",&ScriptEditor::_autosave_scripts);
+	ObjectTypeDB::bind_method("_editor_settings_changed",&ScriptEditor::_editor_settings_changed);
+	ObjectTypeDB::bind_method("_update_script_names",&ScriptEditor::_update_script_names);
+	ObjectTypeDB::bind_method("_tree_changed",&ScriptEditor::_tree_changed);
+	ObjectTypeDB::bind_method("_script_selected",&ScriptEditor::_script_selected);
+	ObjectTypeDB::bind_method("_script_created",&ScriptEditor::_script_created);
+	ObjectTypeDB::bind_method("_script_split_dragged",&ScriptEditor::_script_split_dragged);
+	ObjectTypeDB::bind_method("_help_class_open",&ScriptEditor::_help_class_open);
+	ObjectTypeDB::bind_method("_help_class_goto",&ScriptEditor::_help_class_goto);
+	ObjectTypeDB::bind_method("_history_forward",&ScriptEditor::_history_forward);
+	ObjectTypeDB::bind_method("_history_back",&ScriptEditor::_history_back);
+}
 
 ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 
@@ -1816,6 +2246,9 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	file_menu->get_popup()->add_item("Save As..",FILE_SAVE_AS);
 	file_menu->get_popup()->add_item("Save All",FILE_SAVE_ALL,KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_S);
 	file_menu->get_popup()->add_separator();
+	file_menu->get_popup()->add_item("History Prev",WINDOW_PREV,KEY_MASK_CTRL|KEY_MASK_ALT|KEY_LEFT);
+	file_menu->get_popup()->add_item("History Next",WINDOW_NEXT,KEY_MASK_CTRL|KEY_MASK_ALT|KEY_RIGHT);
+	file_menu->get_popup()->add_separator();
 	file_menu->get_popup()->add_item("Close",FILE_CLOSE,KEY_MASK_CMD|KEY_W);
 	file_menu->get_popup()->connect("item_pressed", this,"_menu_option");
 
@@ -1851,13 +2284,22 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	menu_hb->add_child(search_menu);
 	search_menu->set_text("Search");
 	search_menu->get_popup()->add_item("Find..",SEARCH_FIND,KEY_MASK_CMD|KEY_F);
-	search_menu->get_popup()->add_item("Find Next",SEARCH_FIND_NEXT,KEY_MASK_CMD|KEY_G);
+	search_menu->get_popup()->add_item("Find Next",SEARCH_FIND_NEXT,KEY_F3);
 	search_menu->get_popup()->add_item("Replace..",SEARCH_REPLACE,KEY_MASK_CMD|KEY_R);
 	search_menu->get_popup()->add_separator();
 	search_menu->get_popup()->add_item("Goto Function..",SEARCH_LOCATE_FUNCTION,KEY_MASK_SHIFT|KEY_MASK_CMD|KEY_F);
 	search_menu->get_popup()->add_item("Goto Line..",SEARCH_GOTO_LINE,KEY_MASK_CMD|KEY_L);
 	search_menu->get_popup()->connect("item_pressed", this,"_menu_option");
 
+	script_search_menu = memnew( MenuButton );
+	menu_hb->add_child(script_search_menu);
+	script_search_menu->set_text("Search");
+	script_search_menu->get_popup()->add_item("Find..",SEARCH_FIND,KEY_MASK_CMD|KEY_F);
+	script_search_menu->get_popup()->add_item("Find Next",SEARCH_FIND_NEXT,KEY_F3);
+	script_search_menu->get_popup()->connect("item_pressed", this,"_menu_option");
+	script_search_menu->hide();
+
+
 	debug_menu = memnew( MenuButton );
 	menu_hb->add_child(debug_menu);
 	debug_menu->set_text("Debug");
@@ -1897,6 +2339,53 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	help_menu->get_popup()->add_item("Contextual", HELP_CONTEXTUAL, KEY_MASK_SHIFT|KEY_F1);
 	help_menu->get_popup()->connect("item_pressed", this,"_menu_option");
 
+	menu_hb->add_spacer();
+
+
+	script_icon = memnew( TextureFrame );
+	menu_hb->add_child(script_icon);
+	script_name_label = memnew( Label );
+	menu_hb->add_child(script_name_label);
+
+	script_icon->hide();
+	script_name_label->hide();
+
+	menu_hb->add_spacer();
+
+	site_search = memnew( ToolButton );
+	site_search->set_text("Tutorials");
+	site_search->connect("pressed",this,"_menu_option",varray(SEARCH_WEBSITE));
+	menu_hb->add_child(site_search);
+	site_search->set_tooltip("Open http://www.godotengine.org at tutorials section.");
+
+	class_search = memnew( ToolButton );
+	class_search->set_text("Classes");
+	class_search->connect("pressed",this,"_menu_option",varray(SEARCH_CLASSES));
+	menu_hb->add_child(class_search);
+	class_search->set_tooltip("Search the class hierarchy.");
+
+	help_search = memnew( ToolButton );
+	help_search->set_text("Search Help");
+	help_search->connect("pressed",this,"_menu_option",varray(SEARCH_HELP));
+	menu_hb->add_child(help_search);
+	help_search->set_tooltip("Search the reference documentation.");
+
+	menu_hb->add_child( memnew( VSeparator) );
+
+	script_back = memnew( ToolButton );
+	script_back->connect("pressed",this,"_history_back");
+	menu_hb->add_child(script_back);
+	script_back->set_disabled(true);
+	help_search->set_tooltip("Go to previous edited document.");
+
+	script_forward = memnew( ToolButton );
+	script_forward->connect("pressed",this,"_history_forward");
+	menu_hb->add_child(script_forward);
+	script_forward->set_disabled(true);
+	help_search->set_tooltip("Go to next edited document.");
+
+
+
 	tab_container->connect("tab_changed", this,"_tab_changed");
 
 	find_replace_dialog = memnew(FindReplaceDialog);
@@ -1959,8 +2448,20 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 
 	grab_focus_block=false;
 
+	help_search_dialog = memnew( EditorHelpSearch );
+	add_child(help_search_dialog);
+	help_search_dialog->connect("go_to_help",this,"_help_class_goto");
+
+
+	help_index = memnew( EditorHelpIndex );
+	add_child(help_index);
+	help_index->connect("open_class",this,"_help_class_open");
+
+	history_pos=-1;
 //	debugger_gui->hide();
 
+	edit_pass=0;
+
 }
 
 
@@ -2062,8 +2563,13 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) {
 	script_editor->hide();
 
 	EDITOR_DEF("text_editor/auto_reload_changed_scripts",false);
+	EDITOR_DEF("text_editor/open_dominant_script_on_scene_change",true);
 	EDITOR_DEF("external_editor/use_external_editor",false);
 	EDITOR_DEF("external_editor/exec_path","");
+	EDITOR_DEF("text_editor/script_temperature_enabled",true);
+	EDITOR_DEF("text_editor/script_temperature_history_size",15);
+	EDITOR_DEF("text_editor/script_temperature_hot_color",Color(1,0,0,0.3));
+	EDITOR_DEF("text_editor/script_temperature_cold_color",Color(0,0,1,0.3));
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"external_editor/exec_path",PROPERTY_HINT_GLOBAL_FILE));
 	EDITOR_DEF("external_editor/exec_flags","");
 
diff --git a/tools/editor/plugins/script_editor_plugin.h b/tools/editor/plugins/script_editor_plugin.h
index e635a1974b..e755f570ef 100644
--- a/tools/editor/plugins/script_editor_plugin.h
+++ b/tools/editor/plugins/script_editor_plugin.h
@@ -41,6 +41,7 @@
 #include "tools/editor/code_editor.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/item_list.h"
+#include "tools/editor/editor_help.h"
 
 class ScriptEditorQuickOpen : public ConfirmationDialog {
 
@@ -141,6 +142,9 @@ class ScriptEditor : public VBoxContainer {
 		SEARCH_REPLACE,
 		SEARCH_LOCATE_FUNCTION,
 		SEARCH_GOTO_LINE,
+		SEARCH_HELP,
+		SEARCH_CLASSES,
+		SEARCH_WEBSITE,
 		DEBUG_TOGGLE_BREAKPOINT,
 		DEBUG_NEXT,
 		DEBUG_STEP,
@@ -150,6 +154,8 @@ class ScriptEditor : public VBoxContainer {
 		HELP_CONTEXTUAL,		
 		WINDOW_MOVE_LEFT,
 		WINDOW_MOVE_RIGHT,
+		WINDOW_NEXT,
+		WINDOW_PREV,
 		WINDOW_SELECT_BASE=100
 	};
 
@@ -157,11 +163,17 @@ class ScriptEditor : public VBoxContainer {
 	MenuButton *file_menu;
 	MenuButton *edit_menu;
 	MenuButton *search_menu;
+	MenuButton *script_search_menu;
 	MenuButton *debug_menu;
 	MenuButton *help_menu;
 	Timer *autosave_timer;
 	uint64_t idle;
 
+	Button *help_search;
+	Button *site_search;
+	Button *class_search;
+	EditorHelpSearch *help_search_dialog;
+
 	ItemList *script_list;
 	HSplitContainer *script_split;
 	TabContainer *tab_container;
@@ -172,6 +184,27 @@ class ScriptEditor : public VBoxContainer {
 	ScriptEditorDebugger* debugger;
 	ToolButton *scripts_visible;
 
+	TextureFrame *script_icon;
+	Label *script_name_label;
+
+	ToolButton *script_back;
+	ToolButton *script_forward;
+
+
+	struct ScriptHistory {
+
+		Control *control;
+		int scroll_pos;
+		int cursor_column;
+		int cursor_row;
+	};
+
+	Vector<ScriptHistory> history;
+	int history_pos;
+
+
+	EditorHelpIndex *help_index;
+
 	void _tab_changed(int p_which);
 	void _menu_option(int p_optin);
 
@@ -201,6 +234,8 @@ class ScriptEditor : public VBoxContainer {
 	void _editor_pause();
 	void _editor_stop();
 
+	int edit_pass;
+
 	void _add_callback(Object *p_obj, const String& p_function, const StringArray& p_args);
 	void _res_saved_callback(const Ref<Resource>& p_res);
 
@@ -224,8 +259,20 @@ class ScriptEditor : public VBoxContainer {
 
 	void _script_split_dragged(float);
 
+
+	void _history_forward();
+	void _history_back();
+
 	bool waiting_update_names;
 
+	void _help_class_open(const String& p_class);
+	void _help_class_goto(const String& p_desc);
+	void _update_history_arrows();
+	void _go_to_tab(int p_idx);
+	void _update_history_pos(int p_new_pos);
+	void _update_script_colors();
+
+
 	static ScriptEditor *script_editor;
 protected:
 	void _notification(int p_what);
@@ -253,6 +300,8 @@ public:
 	void set_window_layout(Ref<ConfigFile> p_layout);
 	void get_window_layout(Ref<ConfigFile> p_layout);
 
+	void set_scene_root_script( Ref<Script> p_script );
+
 	ScriptEditorDebugger *get_debugger() { return debugger; }
 
 	ScriptEditor(EditorNode *p_editor);

From 17bde66cd8b26c468178405c8b9d8e078f173596 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Tue, 17 Nov 2015 09:47:18 -0300
Subject: [PATCH 72/78] missing icons

---
 tools/editor/icons/icon_class_list.png | Bin 0 -> 241 bytes
 tools/editor/icons/icon_godot.png      | Bin 0 -> 671 bytes
 tools/editor/icons/icon_multi_edit.png | Bin 0 -> 576 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tools/editor/icons/icon_class_list.png
 create mode 100644 tools/editor/icons/icon_godot.png
 create mode 100644 tools/editor/icons/icon_multi_edit.png

diff --git a/tools/editor/icons/icon_class_list.png b/tools/editor/icons/icon_class_list.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb756c0fe16ab76d2fb312c64988539adaff63fe
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG
za29w(7Bet#3xP1>rMq>17#JAXOFVsD+3$1n^RX!kEZTpbfq|jU)5S5w;`G*FN4^FF
z4(+z~5C6lzs()T2XfCj5<8)PKH_g=y44xJ|YXle!HmfdBS=_`LXvmP0rk2iLt~Vnh
zj>l+ME?Y)Z%85mP9oTdqDJK-&?g(R@Di_6Jv9C|zs#%@*#y{*<>Z$t*zCZe08g;S4
o_Rz!5KI8eJ=X@r=+{oN=NptGyo!=uE7#J8lUHx3vIVCg!0LcPT*#H0l

literal 0
HcmV?d00001

diff --git a/tools/editor/icons/icon_godot.png b/tools/editor/icons/icon_godot.png
new file mode 100644
index 0000000000000000000000000000000000000000..e80820fc1003ceb28b5dba88f24057db67a9dc36
GIT binary patch
literal 671
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG
za29w(7BevLUI$@DCym(^3=9nHC7!;n?Dx6(`M8+m3K};uFfi$Ox;TbdobH|M?GX|v
zalHQiOzXwQODFcb>aB8347lOd`{p6<!=y$*Pq*%<mwMu*g_13{9PgA?r0On;JQMcv
zpz4cBAwo&ITa<d5IC!qCC@7LEf0uc2rxAzkzXG%8f9mgB-ha#yTC~TZ=K8fh@h=Rn
z2|^bRFf!cV+I&OU_>h!k+y}uMTvKYV`_0@dQSokfS@_m?%Q%H&OU~SrR$w{uktz3q
zfClsYReSryJ$U*V)f+w^Nd32N^MTk0+uq;$`>4WE%z`b&XWya!D;e$t9`I8Tz3y^y
z{!i0%u?x!_zA;bZc+#!d`+Cxo?x$C|j{9i#tXS>)VRMAqLKVIXOKY}QODe>3aJunb
z+WD#J;=Zs`iLFbPu2}D@#N_<VjL%iS(&Ubxi0g^>+p@SFTrzG3IP1-Rdh)X87L94#
zYrmA|Bo;fjX+JjBIcInHyZq;$r<vxyW%j9!h&s!>*7UQzSB`y6$oDX%pSv>o&%PI1
z=_2UW(zeUwv-Is3ucH?(e%>K>?(77=$flQH^&VJVkPTaOWP45HvRzxQDFyK<GXza@
z>fG?b_WZ9BUel8<oE6+(q7FDe;MtI(dgb-9UuR4T{2w@;3MyXq=<LL6%cWi$J0GxP
z_GehH^FXRVeg{j8!TOyXJ<ONY9P~fPWia|ND<6<3(3^Ke#(=@4;n#77qw}KoW%Fx&
zKJCY3dmv`&#*}CKQ^M9nCaiydt9i}N+(YGWWgT=2WOi`fVaa1yoOb7E`P;h(LU{f%
Z$@v^{_*?Iq!@$76;OXk;vd$@?2>>QECK&(#

literal 0
HcmV?d00001

diff --git a/tools/editor/icons/icon_multi_edit.png b/tools/editor/icons/icon_multi_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..70faee3d6a3f7db31ba07b273ffd54b89d48d880
GIT binary patch
literal 576
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG
za29w(7Bet#3xhBt!>l<H3=9nHC7!;n?Dsh&nfT55YOE9(7#Ji=Tq8=H^K)}k^GX<;
zi&7IyQd1PlGfOfQ+&z5*!W;R-85kH>c)B=-Se(wiY@02bD8TyQ`Muq4M--x>Z}Em{
zHMK@aYyWSY+uB+t7B(&LLX^orW=Fvg0mB;_EN|vCn0Z~9@uTsh@{H4GV`uN&aYQEK
zUh4Fjmg(mzt7qO!;E(!maOix;1=qALj+r;zg#{1W^*z+yS32+cjhnhUCZ%zQ|DLhA
zu;6)pPM&e8fZ*aYdm27}{T<UBYIBV1n8X9$?VbzIp4l65+|6*#{k&h>W+^AlnYmf@
zv2|VYx|3&wXWWnKb{5<i=zDBtCD-X4ecBZwg4us_R~(vu(%W#xvAP(Yo%za1ipHit
znwD>6e)0J0lESoa1ro+v7mHV1+nOpFzIuUf_%(xdJzFfA7w>527yP&?=4OsSMML~k
zhi29}Jst8hD_8E@e>lYD&WdA;Iqy1dyxALjBk;L~@%K=#bgx%AOAD?{-4MkS*7a_|
zv@P>yrf+Q7UD4D(`GkMcy$8XOn<IZ!KQ)v&o_Xexp9{}+m+0o^)Uz9w@qgH4R?os;
zXspyW`OrJn>@0qRt0x`v3kwT(<=#HMLsl@iJWHJS-eWPl@^^=VZf}zoG@L%OIq$}{
cxR3jLZ4PL()qjy>U|?YIboFyt=akR{0O^eR<p2Nx

literal 0
HcmV?d00001


From 3974fbb8528c9250289e60b8ac1d3cbac762cda2 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Wed, 18 Nov 2015 04:47:41 -0300
Subject: [PATCH 73/78] -fixed tabs

---
 scene/gui/tabs.cpp               |  33 +++---
 tools/editor/editor_log.cpp      |  13 ++-
 tools/editor/editor_log.h        |   4 +-
 tools/editor/editor_node.cpp     | 179 ++++++++++++++++++++-----------
 tools/editor/editor_node.h       |   6 +-
 tools/editor/editor_settings.cpp |   2 +-
 6 files changed, 151 insertions(+), 86 deletions(-)

diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp
index 6d84f028b3..8e448dfb2b 100644
--- a/scene/gui/tabs.cpp
+++ b/scene/gui/tabs.cpp
@@ -58,7 +58,7 @@ Size2 Tabs::get_minimum_size() const {
 
 		if (tabs[i].right_button.is_valid()) {
 			Ref<Texture> rb=tabs[i].right_button;
-			Size2 bms = rb->get_size()+get_stylebox("button")->get_minimum_size();
+			Size2 bms = rb->get_size();//+get_stylebox("button")->get_minimum_size();
 			bms.width+=get_constant("hseparation");
 
 			ms.width+=bms.width;
@@ -67,9 +67,8 @@ Size2 Tabs::get_minimum_size() const {
 
 		if (tabs[i].close_button.is_valid()) {
 			Ref<Texture> cb=tabs[i].close_button;
-			Size2 bms = cb->get_size()+get_stylebox("button")->get_minimum_size();
+			Size2 bms = cb->get_size();//+get_stylebox("button")->get_minimum_size();
 			bms.width+=get_constant("hseparation");
-
 			ms.width+=bms.width;
 			ms.height=MAX(bms.height+tab_bg->get_minimum_size().height,ms.height);
 		}
@@ -262,9 +261,9 @@ void Tabs::_notification(int p_what) {
 					Ref<Texture> rb=tabs[i].right_button;
 
 					lsize+=get_constant("hseparation");
-					lsize+=style->get_margin(MARGIN_LEFT);
+					//lsize+=style->get_margin(MARGIN_LEFT);
 					lsize+=rb->get_width();
-					lsize+=style->get_margin(MARGIN_RIGHT);
+					//lsize+=style->get_margin(MARGIN_RIGHT);
 
 				}
 
@@ -276,9 +275,9 @@ void Tabs::_notification(int p_what) {
 						Ref<Texture> rb=tabs[i].close_button;
 
 						lsize+=get_constant("hseparation");
-						lsize+=style->get_margin(MARGIN_LEFT);
+						//lsize+=style->get_margin(MARGIN_LEFT);
 						lsize+=rb->get_width();
-						lsize+=style->get_margin(MARGIN_RIGHT);
+						//lsize+=style->get_margin(MARGIN_RIGHT);
 
 					}
 				} break;
@@ -289,9 +288,9 @@ void Tabs::_notification(int p_what) {
 							Ref<Texture> rb=tabs[i].close_button;
 
 							lsize+=get_constant("hseparation");
-							lsize+=style->get_margin(MARGIN_LEFT);
+							//lsize+=style->get_margin(MARGIN_LEFT);
 							lsize+=rb->get_width();
-							lsize+=style->get_margin(MARGIN_RIGHT);
+							//lsize+=style->get_margin(MARGIN_RIGHT);
 
 						}
 					}
@@ -303,9 +302,9 @@ void Tabs::_notification(int p_what) {
 							Ref<Texture> rb=tabs[i].close_button;
 
 							lsize+=get_constant("hseparation");
-							lsize+=style->get_margin(MARGIN_LEFT);
+							//lsize+=style->get_margin(MARGIN_LEFT);
 							lsize+=rb->get_width();
-							lsize+=style->get_margin(MARGIN_RIGHT);
+							//lsize+=style->get_margin(MARGIN_RIGHT);
 
 						}
 					}
@@ -404,11 +403,11 @@ void Tabs::_notification(int p_what) {
 								style->draw(ci,cb_rect);
 						}
 
-						w+=style->get_margin(MARGIN_LEFT);
+						//w+=style->get_margin(MARGIN_LEFT);
 
 						cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
 						w+=cb->get_width();
-						w+=style->get_margin(MARGIN_RIGHT);
+						//w+=style->get_margin(MARGIN_RIGHT);
 						tabs[i].cb_rect=cb_rect;
 					}
 				} break;
@@ -432,11 +431,11 @@ void Tabs::_notification(int p_what) {
 									style->draw(ci,cb_rect);
 							}
 
-							w+=style->get_margin(MARGIN_LEFT);
+							//w+=style->get_margin(MARGIN_LEFT);
 
 							cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
 							w+=cb->get_width();
-							w+=style->get_margin(MARGIN_RIGHT);
+							//w+=style->get_margin(MARGIN_RIGHT);
 							tabs[i].cb_rect=cb_rect;
 						}
 					}
@@ -461,11 +460,11 @@ void Tabs::_notification(int p_what) {
 									style->draw(ci,cb_rect);
 							}
 
-							w+=style->get_margin(MARGIN_LEFT);
+							//w+=style->get_margin(MARGIN_LEFT);
 
 							cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
 							w+=cb->get_width();
-							w+=style->get_margin(MARGIN_RIGHT);
+							//w+=style->get_margin(MARGIN_RIGHT);
 							tabs[i].cb_rect=cb_rect;
 						}
 					}
diff --git a/tools/editor/editor_log.cpp b/tools/editor/editor_log.cpp
index 2d26490a8a..264117eecd 100644
--- a/tools/editor/editor_log.cpp
+++ b/tools/editor/editor_log.cpp
@@ -81,6 +81,7 @@ void EditorLog::_notification(int p_what) {
 		log->add_color_override("default_color",get_color("font_color","Tree"));
 		tb->set_normal_texture( get_icon("Collapse","EditorIcons"));
 		tb->set_hover_texture( get_icon("CollapseHl","EditorIcons"));
+		//button->set_icon(get_icon("Console","EditorIcons"));
 
 	}
 
@@ -125,6 +126,7 @@ void EditorLog::add_message(const String& p_msg,bool p_error) {
 		log->push_color(get_color("fg_error","Editor"));
 	} else {
 		button->set_icon(Ref<Texture>());
+
 	}
 
 
@@ -154,17 +156,20 @@ void EditorLog::_dragged(const Point2& p_ofs) {
 */
 
 
-ToolButton *EditorLog::get_button() {
+Button *EditorLog::get_button() {
 
 	return button;
 }
 
 void EditorLog::_flip_request() {
 
-	if (is_visible())
+	if (is_visible()) {
 		hide();
-	else
+		button->show();
+	} else {
 		show();
+		button->hide();
+	}
 }
 
 void EditorLog::_undo_redo_cbk(void *p_self,const String& p_name) {
@@ -200,7 +205,7 @@ EditorLog::EditorLog() {
 	hb->add_child(title);
 
 
-	button = memnew( ToolButton );
+	button = memnew( Button );
 	button->set_text_align(Button::ALIGN_LEFT);
 	button->connect("pressed",this,"_flip_request");
 	button->set_focus_mode(FOCUS_NONE);
diff --git a/tools/editor/editor_log.h b/tools/editor/editor_log.h
index 6950ffa1a0..93044f9a2d 100644
--- a/tools/editor/editor_log.h
+++ b/tools/editor/editor_log.h
@@ -44,7 +44,7 @@ class EditorLog : public PanelContainer {
 
 	OBJ_TYPE( EditorLog, PanelContainer );
 
-	ToolButton *button;
+	Button *button;
 	Button *clearbutton;
 	Label *title;
 	RichTextLabel *log;
@@ -73,7 +73,7 @@ public:
 	void add_message(const String& p_msg, bool p_error=false);
 	void deinit();
 
-	ToolButton *get_button();
+	Button *get_button();
 	void clear();
 	EditorLog();
 	~EditorLog();
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 0aeb3955c7..8c76c9e9c8 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -111,6 +111,8 @@ EditorNode *EditorNode::singleton=NULL;
 
 void EditorNode::_update_scene_tabs() {
 
+	bool show_rb = EditorSettings::get_singleton()->get("global/show_script_in_scene_tabs");
+
 	scene_tabs->clear_tabs();
 	Ref<Texture> script_icon = gui_base->get_icon("Script","EditorIcons");
 	for(int i=0;i<editor_data.get_edited_scene_count();i++) {
@@ -133,7 +135,7 @@ void EditorNode::_update_scene_tabs() {
 		bool unsaved = (i==current)?saved_version!=editor_data.get_undo_redo().get_version():editor_data.get_scene_version(i)!=0;
 		scene_tabs->add_tab(editor_data.get_scene_title(i)+(unsaved?"(*)":""),icon);
 
-		if (editor_data.get_scene_root_script(i).is_valid()) {
+		if (show_rb && editor_data.get_scene_root_script(i).is_valid()) {
 			scene_tabs->set_tab_right_button(i,script_icon);
 		}
 
@@ -169,7 +171,7 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
 			break;*/
 			case KEY_F1: _editor_select(0); break;
 			case KEY_F2: _editor_select(1); break;
-			case KEY_F4: _editor_select(2); break;
+			case KEY_F3: _editor_select(2); break;
 			case KEY_F5: _menu_option_confirm((p_event.key.mod.control&&p_event.key.mod.shift)?RUN_PLAY_CUSTOM_SCENE:RUN_PLAY,true); break;
 			case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break;
 			case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break;
@@ -1617,10 +1619,8 @@ void EditorNode::_edit_current() {
 
 
 				for(int i=0;i<editor_table.size();i++) {
-					if (editor_table[i]==main_plugin) {
-						main_editor_tabs->set_current_tab(i);
-						break;
-					}
+
+					main_editor_buttons[i]->set_pressed(editor_table[i]==main_plugin);
 				}
 			}
 
@@ -2854,7 +2854,9 @@ void EditorNode::_editor_select(int p_which) {
 
 	ERR_FAIL_INDEX(p_which,editor_table.size());
 
-	main_editor_tabs->set_current_tab(p_which);
+	for(int i=0;i<main_editor_buttons.size();i++) {
+		main_editor_buttons[i]->set_pressed(i==p_which);
+	}
 
 	selecting=false;
 
@@ -2872,6 +2874,8 @@ void EditorNode::_editor_select(int p_which) {
 	editor_plugin_screen=new_editor;
 	editor_plugin_screen->make_visible(true);
 	editor_plugin_screen->selected_notify();
+
+
 }
 
 void EditorNode::add_editor_plugin(EditorPlugin *p_editor) {
@@ -2879,7 +2883,12 @@ void EditorNode::add_editor_plugin(EditorPlugin *p_editor) {
 
 	if (p_editor->has_main_screen()) {
 	
-		singleton->main_editor_tabs->add_tab(p_editor->get_name());
+		ToolButton *tb = memnew( ToolButton );
+		tb->set_toggle_mode(true);
+		tb->connect("pressed",singleton,"_editor_select",varray(singleton->main_editor_buttons.size()));
+		tb->set_text(p_editor->get_name());
+		singleton->main_editor_buttons.push_back(tb);
+		singleton->main_editor_button_vb->add_child(tb);
 		singleton->editor_table.push_back(p_editor);
 	}
 	singleton->editor_data.add_editor_plugin( p_editor );
@@ -2891,16 +2900,18 @@ void EditorNode::remove_editor_plugin(EditorPlugin *p_editor) {
 
 	if (p_editor->has_main_screen()) {
 
-		for(int i=0;i<singleton->main_editor_tabs->get_tab_count();i++) {
+		for(int i=0;i<singleton->main_editor_buttons.size();i++) {
 
-			if (p_editor->get_name()==singleton->main_editor_tabs->get_tab_title(i)) {
+			if (p_editor->get_name()==singleton->main_editor_buttons[i]->get_name()) {
+
+				memdelete( singleton->main_editor_buttons[i] );
+				singleton->main_editor_buttons.remove(i);
 
-				singleton->main_editor_tabs->remove_tab(i);
 				break;
 			}
 		}
 
-		singleton->main_editor_tabs->add_tab(p_editor->get_name());
+		//singleton->main_editor_tabs->add_tab(p_editor->get_name());
 		singleton->editor_table.erase(p_editor);
 	}
 	singleton->remove_child(p_editor);
@@ -3209,10 +3220,20 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
 }
 
 
+int EditorNode::_get_current_main_editor() {
+
+	for(int i=0;i<editor_table.size();i++) {
+		if (editor_table[i]==editor_plugin_screen)
+			return i;
+	}
+
+	return 0;
+}
+
 Dictionary EditorNode::_get_main_scene_state() {
 
 	Dictionary state;
-	state["main_tab"]=main_editor_tabs->get_current_tab();
+	state["main_tab"]=_get_current_main_editor();
 	state["scene_tree_offset"]=scene_tree_dock->get_tree_editor()->get_scene_tree()->get_vscroll_bar()->get_val();
 	state["property_edit_offset"]=get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_val();
 	state["saved_version"]=saved_version;
@@ -4589,6 +4610,7 @@ EditorNode::EditorNode() {
 	gui_base->add_child(main_vbox);
 	main_vbox->set_area_as_parent_rect(8);
 
+#if 0
 	PanelContainer *top_dark_panel = memnew( PanelContainer );
 	Ref<StyleBoxTexture> top_dark_sb;
 	top_dark_sb.instance();;
@@ -4604,21 +4626,14 @@ EditorNode::EditorNode() {
 	VBoxContainer *top_dark_vb = memnew( VBoxContainer );
 	main_vbox->add_child(top_dark_panel);
 	top_dark_panel->add_child(top_dark_vb);
-
+#endif
 
 
 
 	menu_hb = memnew( HBoxContainer );
-	top_dark_vb->add_child(menu_hb);
+	main_vbox->add_child(menu_hb);
 
-	scene_tabs=memnew( Tabs );
-	scene_tabs->add_tab("unsaved");
-	scene_tabs->set_tab_align(Tabs::ALIGN_CENTER);
-	scene_tabs->set_tab_close_display_policy(Tabs::SHOW_HOVER);
-	scene_tabs->connect("tab_changed",this,"_scene_tab_changed");
-	scene_tabs->connect("right_button_pressed",this,"_scene_tab_script_edited");
-	scene_tabs->connect("tab_close", this, "_scene_tab_closed");
-	top_dark_vb->add_child(scene_tabs);
+//	top_dark_vb->add_child(scene_tabs);
 	//left
 	left_l_hsplit = memnew( HSplitContainer );
 	main_vbox->add_child(left_l_hsplit);
@@ -4651,11 +4666,15 @@ EditorNode::EditorNode() {
 	main_hsplit = memnew( HSplitContainer );
 	left_r_hsplit->add_child(main_hsplit);
 	//main_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	VBoxContainer * center_vb = memnew( VBoxContainer);
+	main_hsplit->add_child(center_vb);
+	center_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
 	center_split = memnew( VSplitContainer );
-	main_hsplit->add_child(center_split);
-	center_split->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	//main_hsplit->add_child(center_split);
+	center_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	center_split->set_collapsed(false);
+	center_vb->add_child(center_split);
 
 	right_hsplit = memnew( HSplitContainer );
 	main_hsplit->add_child(right_hsplit);
@@ -4752,20 +4771,19 @@ EditorNode::EditorNode() {
 	srt->add_constant_override("separation",0);
 
 
-	main_editor_tabs  = memnew( Tabs );
+/*	main_editor_tabs  = memnew( Tabs );
 	main_editor_tabs->connect("tab_changed",this,"_editor_select");
 	main_editor_tabs->set_tab_close_display_policy(Tabs::SHOW_NEVER);
-	HBoxContainer *srth = memnew( HBoxContainer );
-	srt->add_child( srth );
-	Control *tec = memnew( Control );
-	tec->set_custom_minimum_size(Size2(100,0));
-	tec->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	srth->add_child(tec);
-	srth->add_child(main_editor_tabs);
-	tec = memnew( Control );
-	tec->set_custom_minimum_size(Size2(100,0));
-	srth->add_child(tec);
-	tec->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+*/
+	scene_tabs=memnew( Tabs );
+	scene_tabs->add_tab("unsaved");
+	scene_tabs->set_tab_align(Tabs::ALIGN_CENTER);
+	scene_tabs->set_tab_close_display_policy(Tabs::SHOW_ACTIVE_ONLY);
+	scene_tabs->connect("tab_changed",this,"_scene_tab_changed");
+	scene_tabs->connect("right_button_pressed",this,"_scene_tab_script_edited");
+	scene_tabs->connect("tab_close", this, "_scene_tab_closed");
+
+	srt->add_child(scene_tabs);
 
 	scene_root_parent = memnew( Panel );
 
@@ -4842,6 +4860,8 @@ EditorNode::EditorNode() {
 	anim_close->set_pressed_texture( anim_close->get_icon("Close","EditorIcons"));
 
 
+
+
 	PanelContainer *top_region = memnew( PanelContainer );
 	top_region->add_style_override("panel",gui_base->get_stylebox("hover","Button"));
 	HBoxContainer *left_menu_hb = memnew( HBoxContainer );
@@ -4918,6 +4938,18 @@ EditorNode::EditorNode() {
 	p->add_child(recent_scenes);
 	recent_scenes->connect("item_pressed",this,"_open_recent_scene");
 
+	{
+		Control *sp = memnew( Control );
+		sp->set_custom_minimum_size(Size2(30,0));
+		menu_hb->add_child(sp);
+	}
+
+	PanelContainer *editor_region = memnew( PanelContainer );
+	editor_region->add_style_override("panel",gui_base->get_stylebox("hover","Button"));
+	main_editor_button_vb = memnew( HBoxContainer );
+	editor_region->add_child(main_editor_button_vb);
+	menu_hb->add_child(editor_region);
+
 	//menu_hb->add_spacer();
 #if 0
 	node_menu = memnew( MenuButton );
@@ -5078,6 +5110,39 @@ EditorNode::EditorNode() {
 */
 
 
+	progress_hb = memnew( BackgroundProgress );
+	menu_hb->add_child(progress_hb);
+
+	{
+		Control *sp = memnew( Control );
+		sp->set_custom_minimum_size(Size2(30,0));
+		menu_hb->add_child(sp);
+	}
+
+
+	PanelContainer *vu_cont = memnew( PanelContainer );
+	vu_cont->add_style_override("panel",gui_base->get_stylebox("hover","Button"));
+	menu_hb->add_child(vu_cont);
+
+	audio_vu = memnew( TextureProgress );
+	CenterContainer *vu_cc = memnew( CenterContainer );
+	vu_cc->add_child(audio_vu);
+	vu_cont->add_child(vu_cc);
+	audio_vu->set_under_texture(gui_base->get_icon("VuEmpty","EditorIcons"));
+	audio_vu->set_progress_texture(gui_base->get_icon("VuFull","EditorIcons"));
+	audio_vu->set_max(24);
+	audio_vu->set_min(-80);
+	audio_vu->set_step(0.01);
+	audio_vu->set_val(0);
+
+	{
+		Control *sp = memnew( Control );
+		sp->set_custom_minimum_size(Size2(30,0));
+		menu_hb->add_child(sp);
+	}
+
+
+
 	top_region = memnew( PanelContainer );
 	top_region->add_style_override("panel",gui_base->get_stylebox("hover","Button"));
 	HBoxContainer *right_menu_hb = memnew( HBoxContainer );
@@ -5109,6 +5174,15 @@ EditorNode::EditorNode() {
 	sources_button->connect("pressed",this,"_menu_option",varray(SOURCES_REIMPORT));
 	sources_button->set_tooltip("Alerts when an external resource has changed.");
 
+	update_menu = memnew( MenuButton );
+	update_menu->set_tooltip("Spins when the editor window repaints!");
+	right_menu_hb->add_child(update_menu);
+	update_menu->set_icon(gui_base->get_icon("Progress1","EditorIcons"));
+	p=update_menu->get_popup();
+	p->add_check_item("Update Always",SETTINGS_UPDATE_ALWAYS);
+	p->add_check_item("Update Changes",SETTINGS_UPDATE_CHANGES);
+	p->set_item_checked(1,true);
+
 	//sources_button->connect();
 
 /*
@@ -5262,6 +5336,8 @@ EditorNode::EditorNode() {
 	log->connect("close_request",this,"_close_messages");
 	log->connect("show_request",this,"_show_messages");
 	//left_split->set_dragger_visible(false);
+
+
 	old_split_ofs=0;
 
 
@@ -5279,37 +5355,18 @@ EditorNode::EditorNode() {
 
 	animation_editor->hide();
 
-	PanelContainer *bottom_pc = memnew( PanelContainer );
-	main_vbox->add_child(bottom_pc);
+	/*PanelContainer *bottom_pc = memnew( PanelContainer );
+	srt->add_child(bottom_pc);
 	bottom_hb = memnew( HBoxContainer );
-	bottom_pc->add_child(bottom_hb);
+	bottom_pc->add_child(bottom_hb);*/
 
-	bottom_hb->add_child( log->get_button() );
+	center_vb->add_child( log->get_button() );
 	log->get_button()->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
-	progress_hb = memnew( BackgroundProgress );
-	bottom_hb->add_child(progress_hb);
+
 	//progress_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
-	audio_vu = memnew( TextureProgress );
-	CenterContainer *vu_cc = memnew( CenterContainer );
-	vu_cc->add_child(audio_vu);
-	bottom_hb->add_child(vu_cc);
-	audio_vu->set_under_texture(gui_base->get_icon("VuEmpty","EditorIcons"));
-	audio_vu->set_progress_texture(gui_base->get_icon("VuFull","EditorIcons"));
-	audio_vu->set_max(24);
-	audio_vu->set_min(-80);
-	audio_vu->set_step(0.01);
-	audio_vu->set_val(0);
 
-	update_menu = memnew( MenuButton );
-	update_menu->set_tooltip("Spins when the editor window repaints!");
-	bottom_hb->add_child(update_menu);
-	update_menu->set_icon(gui_base->get_icon("Progress1","EditorIcons"));
-	p=update_menu->get_popup();
-	p->add_check_item("Update Always",SETTINGS_UPDATE_ALWAYS);
-	p->add_check_item("Update Changes",SETTINGS_UPDATE_CHANGES);
-	p->set_item_checked(1,true);
 
 	/*
 	animation_menu = memnew( ToolButton );
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index 56e455c9c0..bd88e1a4b9 100644
--- a/tools/editor/editor_node.h
+++ b/tools/editor/editor_node.h
@@ -314,7 +314,9 @@ class EditorNode : public Node {
 	CenterContainer *tabs_center;
 	EditorQuickOpen *quick_open;
 	EditorQuickOpen *quick_run;
-	Tabs *main_editor_tabs;
+
+	HBoxContainer *main_editor_button_vb;
+	Vector<ToolButton*> main_editor_buttons;
 	Vector<EditorPlugin*> editor_table;
 
 	EditorReImportDialog *reimport_dialog;
@@ -508,6 +510,8 @@ class EditorNode : public Node {
 	Dictionary _get_main_scene_state();
 	void _set_main_scene_state(Dictionary p_state);
 
+	int _get_current_main_editor();
+
 	void _save_docks();
 	void _load_docks();
 
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 651b30c724..15de6e7266 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -447,7 +447,7 @@ void EditorSettings::_load_defaults() {
 	hints["global/default_project_path"]=PropertyInfo(Variant::STRING,"global/default_project_path",PROPERTY_HINT_GLOBAL_DIR);
 	set("global/default_project_export_path","");
 	hints["global/default_project_export_path"]=PropertyInfo(Variant::STRING,"global/default_project_export_path",PROPERTY_HINT_GLOBAL_DIR);
-
+	set("global/show_script_in_scene_tabs",false);
 	set("text_editor/background_color",Color::html("3b000000"));
 	set("text_editor/text_color",Color::html("aaaaaa"));
 	set("text_editor/text_selected_color",Color::html("000000"));

From b08312b30c5fa47bffc2d21d4cb57520b822bf45 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Wed, 18 Nov 2015 09:20:46 -0300
Subject: [PATCH 74/78] -Fixed default theme a little -Added option to group
 help pages, fixes #2805

---
 scene/resources/default_theme/default_theme.cpp | 12 ++++++------
 tools/editor/plugins/script_editor_plugin.cpp   |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index e50f184f9b..8c640b1b1b 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -213,8 +213,8 @@ void make_default_theme() {
 
 	// Button
 
-	Ref<StyleBox> sb_button_normal = sb_expand( make_stylebox( button_normal_png,4,4,4,4,6,2,6,2),2,2,2,2);
-	Ref<StyleBox> sb_button_pressed = sb_expand( make_stylebox( button_pressed_png,4,4,4,4,6,2,6,2),2,2,2,2);
+	Ref<StyleBox> sb_button_normal = sb_expand( make_stylebox( button_normal_png,4,4,4,4,6,3,6,3),2,2,2,2);
+	Ref<StyleBox> sb_button_pressed = sb_expand( make_stylebox( button_pressed_png,4,4,4,4,6,3,6,3),2,2,2,2);
 	Ref<StyleBox> sb_button_hover = sb_expand( make_stylebox( button_hover_png,4,4,4,4,6,2,6,2),2,2,2,2);
 	Ref<StyleBox> sb_button_disabled = sb_expand( make_stylebox( button_disabled_png,4,4,4,4,6,2,6,2),2,2,2,2);
 	Ref<StyleBox> sb_button_focus = sb_expand( make_stylebox( button_focus_png,4,4,4,4,6,2,6,2),2,2,2,2);
@@ -280,8 +280,8 @@ void make_default_theme() {
 
 	// OptionButton
 
-	Ref<StyleBox> sb_optbutton_normal = sb_expand( make_stylebox( option_button_normal_png,4,4,21,4,6,2,21,2),2,2,2,2);
-	Ref<StyleBox> sb_optbutton_pressed = sb_expand( make_stylebox( option_button_pressed_png,4,4,21,4,6,2,21,2),2,2,2,2);
+	Ref<StyleBox> sb_optbutton_normal = sb_expand( make_stylebox( option_button_normal_png,4,4,21,4,6,3,21,3),2,2,2,2);
+	Ref<StyleBox> sb_optbutton_pressed = sb_expand( make_stylebox( option_button_pressed_png,4,4,21,4,6,3,21,3),2,2,2,2);
 	Ref<StyleBox> sb_optbutton_hover = sb_expand( make_stylebox( option_button_hover_png,4,4,21,4,6,2,21,2),2,2,2,2);
 	Ref<StyleBox> sb_optbutton_disabled = sb_expand( make_stylebox( option_button_disabled_png,4,4,21,4,6,2,21,2),2,2,2,2);
 	Ref<StyleBox> sb_optbutton_focus = sb_expand( make_stylebox( button_focus_png,4,4,4,4,6,2,6,2),2,2,2,2);
@@ -698,8 +698,8 @@ void make_default_theme() {
 
 	// Tabs
 
-	t->set_stylebox("tab_fg","Tabs", sb_expand( make_stylebox( tab_current_png,4,4,4,1,16,4,16,4),2,2,2,2) );
-	t->set_stylebox("tab_bg","Tabs", sb_expand( make_stylebox( tab_behind_png,5,5,5,1,16,6,16,4),3,3,3,3) );
+	t->set_stylebox("tab_fg","Tabs", sb_expand( make_stylebox( tab_current_png,4,3,4,1,16,3,16,2),2,2,2,2) );
+	t->set_stylebox("tab_bg","Tabs", sb_expand( make_stylebox( tab_behind_png,5,4,5,1,16,5,16,2),3,3,3,3) );
 	t->set_stylebox("panel","Tabs",tc_sb );
 	t->set_stylebox("button_pressed","Tabs", make_stylebox( button_pressed_png,4,4,4,4) );
 	t->set_stylebox("button","Tabs", make_stylebox( button_normal_png,4,4,4,4) );
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 0de9adebc8..65ed420a51 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -1654,11 +1654,12 @@ struct _ScriptEditorItemData {
 	int index;
 	String tooltip;
 	bool used;
+	int category;
 
 
 	bool operator<(const _ScriptEditorItemData& id) const {
 
-		return name.nocasecmp_to(id.name)<0;
+		return category==id.category?name.nocasecmp_to(id.name)<0:category<id.category;
 	}
 
 };
@@ -1708,6 +1709,7 @@ void ScriptEditor::_update_script_names() {
 	}
 
 	script_list->clear();
+	bool split_script_help = EditorSettings::get_singleton()->get("text_editor/group_help_pages");
 
 	Vector<_ScriptEditorItemData> sedata;
 
@@ -1727,6 +1729,7 @@ void ScriptEditor::_update_script_names() {
 			sd.tooltip=tooltip;
 			sd.index=i;
 			sd.used=used.has(ste->get_edited_script());
+			sd.category=0;
 
 			sedata.push_back(sd);
 		}
@@ -1744,11 +1747,11 @@ void ScriptEditor::_update_script_names() {
 			sd.tooltip=tooltip;
 			sd.index=i;
 			sd.used=false;
+			sd.category=split_script_help?1:0;
 			sedata.push_back(sd);
 
 		}
 
-
 	}
 
 	sedata.sort();
@@ -2570,6 +2573,7 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) {
 	EDITOR_DEF("text_editor/script_temperature_history_size",15);
 	EDITOR_DEF("text_editor/script_temperature_hot_color",Color(1,0,0,0.3));
 	EDITOR_DEF("text_editor/script_temperature_cold_color",Color(0,0,1,0.3));
+	EDITOR_DEF("text_editor/group_help_pages",false);
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"external_editor/exec_path",PROPERTY_HINT_GLOBAL_FILE));
 	EDITOR_DEF("external_editor/exec_flags","");
 

From 0b05739a8ba7b0181f7f596a4813058ba3a0cb3b Mon Sep 17 00:00:00 2001
From: Ovnuniarchos <pujalte.jorge@gmail.com>
Date: Wed, 18 Nov 2015 19:20:50 +0100
Subject: [PATCH 75/78] *Polygon2D now updates on any modification in its point
 array. ShapeLine2D has now an editor.

---
 scene/resources/concave_polygon_shape_2d.cpp  |  1 +
 scene/resources/convex_polygon_shape_2d.cpp   |  3 +-
 scene/resources/shape_line_2d.cpp             |  1 +
 .../collision_shape_2d_editor_plugin.cpp      | 33 +++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/scene/resources/concave_polygon_shape_2d.cpp b/scene/resources/concave_polygon_shape_2d.cpp
index 923e2817ef..01b7531f14 100644
--- a/scene/resources/concave_polygon_shape_2d.cpp
+++ b/scene/resources/concave_polygon_shape_2d.cpp
@@ -34,6 +34,7 @@
 void ConcavePolygonShape2D::set_segments(const DVector<Vector2>& p_segments) {
 
 	Physics2DServer::get_singleton()->shape_set_data(get_rid(),p_segments);
+	emit_changed();
 }
 
 DVector<Vector2> ConcavePolygonShape2D::get_segments() const {
diff --git a/scene/resources/convex_polygon_shape_2d.cpp b/scene/resources/convex_polygon_shape_2d.cpp
index dac39fc846..a1137ba614 100644
--- a/scene/resources/convex_polygon_shape_2d.cpp
+++ b/scene/resources/convex_polygon_shape_2d.cpp
@@ -33,6 +33,7 @@
 void ConvexPolygonShape2D::_update_shape() {
 
 	Physics2DServer::get_singleton()->shape_set_data(get_rid(),points);
+	emit_changed();
 
 }
 
@@ -62,7 +63,7 @@ void ConvexPolygonShape2D::_bind_methods() {
 
 
 
-	ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"points"),_SCS("set_points"),_SCS("get_points") );
+	ADD_PROPERTY( PropertyInfo(Variant::VECTOR2_ARRAY,"points"),_SCS("set_points"),_SCS("get_points") );
 
 }
 
diff --git a/scene/resources/shape_line_2d.cpp b/scene/resources/shape_line_2d.cpp
index c660b604f3..97e9985754 100644
--- a/scene/resources/shape_line_2d.cpp
+++ b/scene/resources/shape_line_2d.cpp
@@ -35,6 +35,7 @@ void LineShape2D::_update_shape() {
 	arr.push_back(normal);
 	arr.push_back(d);
 	Physics2DServer::get_singleton()->shape_set_data(get_rid(),arr);
+	emit_changed();
 
 }
 
diff --git a/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp b/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
index 62cf1b4acb..f56b9a2fd9 100644
--- a/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
@@ -115,6 +115,18 @@ void CollisionShape2DEditor::set_handle(int idx, Point2& p_point) {
 		} break;
 
 		case LINE_SHAPE: {
+			if (idx<2) {
+				Ref<LineShape2D> line = node->get_shape();
+
+				if (idx==0){
+					line->set_d(p_point.length());
+				}else{
+					line->set_normal(p_point/30.0);
+				}
+
+				canvas_item_editor->get_viewport_control()->update();
+			}
+
 
 		} break;
 
@@ -200,6 +212,19 @@ void CollisionShape2DEditor::commit_handle(int idx, Variant& p_org) {
 		} break;
 
 		case LINE_SHAPE: {
+			Ref<LineShape2D> line = node->get_shape();
+
+			if (idx==0) {
+				undo_redo->add_do_method(line.ptr(),"set_d",line->get_d());
+				undo_redo->add_do_method(c,"update");
+				undo_redo->add_undo_method(line.ptr(),"set_d",p_org);
+				undo_redo->add_undo_method(c,"update");
+			} else {
+				undo_redo->add_do_method(line.ptr(),"set_normal",line->get_normal());
+				undo_redo->add_do_method(c,"update");
+				undo_redo->add_undo_method(line.ptr(),"set_normal",p_org);
+				undo_redo->add_undo_method(c,"update");
+			}
 
 		} break;
 
@@ -418,6 +443,14 @@ void CollisionShape2DEditor::_canvas_draw() {
 		} break;
 
 		case LINE_SHAPE: {
+			Ref<LineShape2D> shape = node->get_shape();
+			
+			handles.resize(2);
+			handles[0] = shape->get_normal() * shape->get_d();
+			handles[1] = shape->get_normal() * (shape->get_d() + 30.0);
+			
+			c->draw_texture(h,gt.xform(handles[0])-size);
+			c->draw_texture(h,gt.xform(handles[1])-size);
 
 		} break;
 

From 7f5cb7512d7883c1355185b1fd4ecbeff95cf690 Mon Sep 17 00:00:00 2001
From: eska <eska@eska.me>
Date: Wed, 18 Nov 2015 22:55:05 +0100
Subject: [PATCH 76/78] Split up AnimationPlayer tracks editor `Tracks` button

---
 tools/editor/animation_editor.cpp | 79 ++++++++++++++++++-------------
 tools/editor/animation_editor.h   |  8 ++--
 2 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index 5df49bd327..ace6fda696 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -627,6 +627,33 @@ public:
 };
 
 
+void AnimationKeyEditor::_menu_add_track(int p_type) {
+
+	ERR_FAIL_COND(!animation.is_valid());
+
+
+	switch(p_type) {
+
+		case ADD_TRACK_MENU_ADD_CALL_TRACK: {
+			if (root) {
+				call_select->popup_centered_ratio();
+				break;
+			}
+		} break;
+		case ADD_TRACK_MENU_ADD_VALUE_TRACK:
+		case ADD_TRACK_MENU_ADD_TRANSFORM_TRACK: {
+
+			undo_redo->create_action("Anim Add Track");
+			undo_redo->add_do_method(animation.ptr(),"add_track",p_type);
+			undo_redo->add_do_method(animation.ptr(),"track_set_path",animation->get_track_count(),".");
+			undo_redo->add_undo_method(animation.ptr(),"remove_track",animation->get_track_count());
+			undo_redo->commit_action();
+
+
+		} break;
+	}
+}
+
 void AnimationKeyEditor::_menu_track(int p_type) {
 
 	ERR_FAIL_COND(!animation.is_valid());
@@ -635,23 +662,6 @@ void AnimationKeyEditor::_menu_track(int p_type) {
 	last_menu_track_opt=p_type;
 	switch(p_type) {
 
-		case TRACK_MENU_ADD_CALL_TRACK: {
-			if (root) {
-				call_select->popup_centered_ratio();
-				break;
-			}
-		} break;
-		case TRACK_MENU_ADD_VALUE_TRACK:
-		case TRACK_MENU_ADD_TRANSFORM_TRACK: {
-
-			undo_redo->create_action("Anim Add Track");
-			undo_redo->add_do_method(animation.ptr(),"add_track",p_type);			
-			undo_redo->add_do_method(animation.ptr(),"track_set_path",animation->get_track_count(),".");
-			undo_redo->add_undo_method(animation.ptr(),"remove_track",animation->get_track_count());
-			undo_redo->commit_action();
-
-
-		} break;
 		case TRACK_MENU_SCALE:
 		case TRACK_MENU_SCALE_PIVOT: {
 
@@ -999,6 +1009,7 @@ void AnimationKeyEditor::_track_editor_draw() {
 	if (!animation.is_valid()) {
 		v_scroll->hide();
 		h_scroll->hide();
+		menu_add_track->set_disabled(true);
 		menu_track->set_disabled(true);
 		edit_button->set_disabled(true);
 		key_editor_tab->hide();
@@ -1008,6 +1019,7 @@ void AnimationKeyEditor::_track_editor_draw() {
 		return;
 	}
 
+	menu_add_track->set_disabled(false);
 	menu_track->set_disabled(false);
 	edit_button->set_disabled(false);
 	move_up_button->set_disabled(false);
@@ -2659,12 +2671,14 @@ void AnimationKeyEditor::_notification(int p_what) {
 
 		case NOTIFICATION_ENTER_TREE: {
 
-				zoomicon->set_texture( get_icon("Zoom","EditorIcons") );				
-				//menu_track->set_icon(get_icon("AddTrack","EditorIcons"));
-				menu_track->get_popup()->add_icon_item(get_icon("KeyValue","EditorIcons"),"Add Normal Track",TRACK_MENU_ADD_VALUE_TRACK);
-				menu_track->get_popup()->add_icon_item(get_icon("KeyXform","EditorIcons"),"Add Transform Track",TRACK_MENU_ADD_TRANSFORM_TRACK);
-				menu_track->get_popup()->add_icon_item(get_icon("KeyCall","EditorIcons"),"Add Call Func Track",TRACK_MENU_ADD_CALL_TRACK);
-				menu_track->get_popup()->add_separator();
+				zoomicon->set_texture( get_icon("Zoom","EditorIcons") );
+
+				menu_add_track->set_icon(get_icon("AddTrack","EditorIcons"));
+				menu_add_track->get_popup()->add_icon_item(get_icon("KeyValue","EditorIcons"),"Add Normal Track",ADD_TRACK_MENU_ADD_VALUE_TRACK);
+				menu_add_track->get_popup()->add_icon_item(get_icon("KeyXform","EditorIcons"),"Add Transform Track",ADD_TRACK_MENU_ADD_TRANSFORM_TRACK);
+				menu_add_track->get_popup()->add_icon_item(get_icon("KeyCall","EditorIcons"),"Add Call Func Track",ADD_TRACK_MENU_ADD_CALL_TRACK);
+
+				menu_track->set_icon(get_icon("Tools","EditorIcons"));
 				menu_track->get_popup()->add_item("Scale Selection",TRACK_MENU_SCALE);
 				menu_track->get_popup()->add_item("Scale From Cursor",TRACK_MENU_SCALE_PIVOT);
 				menu_track->get_popup()->add_separator();
@@ -3511,6 +3525,7 @@ void AnimationKeyEditor::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_track_editor_input_event"),&AnimationKeyEditor::_track_editor_input_event);
 	ObjectTypeDB::bind_method(_MD("_track_name_changed"),&AnimationKeyEditor::_track_name_changed);
 	ObjectTypeDB::bind_method(_MD("_track_menu_selected"),&AnimationKeyEditor::_track_menu_selected);
+	ObjectTypeDB::bind_method(_MD("_menu_add_track"),&AnimationKeyEditor::_menu_add_track);
 	ObjectTypeDB::bind_method(_MD("_menu_track"),&AnimationKeyEditor::_menu_track);
 	ObjectTypeDB::bind_method(_MD("_clear_selection_for_anim"),&AnimationKeyEditor::_clear_selection_for_anim);
 	ObjectTypeDB::bind_method(_MD("_select_at_anim"),&AnimationKeyEditor::_select_at_anim);
@@ -3563,15 +3578,6 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
 	//menu->set_pos(Point2());
 	//add_child(menu);
 
-	menu_track = memnew( MenuButton );
-	menu_track->set_text("Tracks");
-	hb->add_child(menu_track);
-	menu_track->get_popup()->connect("item_pressed",this,"_menu_track");
-
-
-
-	hb->add_child( memnew( VSeparator ) );
-
 	zoomicon = memnew( TextureFrame );
 	hb->add_child(zoomicon);
 	zoomicon->set_tooltip("Animation zoom.");
@@ -3629,6 +3635,10 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
 
 	hb->add_child( memnew( VSeparator ) );
 
+	menu_add_track = memnew( MenuButton );
+	hb->add_child(menu_add_track);
+	menu_add_track->get_popup()->connect("item_pressed",this,"_menu_add_track");
+	menu_add_track->set_tooltip("Add new tracks.");
 
 	move_up_button = memnew( ToolButton );
 	hb->add_child(move_up_button);
@@ -3653,6 +3663,11 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
 
 	hb->add_child(memnew( VSeparator ));
 
+	menu_track = memnew( MenuButton );
+	hb->add_child(menu_track);
+	menu_track->get_popup()->connect("item_pressed",this,"_menu_track");
+	menu_track->set_tooltip("Track tools");
+
 	edit_button = memnew( ToolButton );
 	edit_button->set_toggle_mode(true);
 	edit_button->set_focus_mode(FOCUS_NONE);
diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h
index 4a1cc21154..629377d78e 100644
--- a/tools/editor/animation_editor.h
+++ b/tools/editor/animation_editor.h
@@ -70,9 +70,9 @@ class AnimationKeyEditor : public VBoxContainer  {
 
 	enum {
 
-		TRACK_MENU_ADD_VALUE_TRACK,
-		TRACK_MENU_ADD_TRANSFORM_TRACK,
-		TRACK_MENU_ADD_CALL_TRACK,
+		ADD_TRACK_MENU_ADD_VALUE_TRACK,
+		ADD_TRACK_MENU_ADD_TRANSFORM_TRACK,
+		ADD_TRACK_MENU_ADD_CALL_TRACK,
 		TRACK_MENU_SCALE,
 		TRACK_MENU_SCALE_PIVOT,
 		TRACK_MENU_MOVE_UP,
@@ -192,6 +192,7 @@ class AnimationKeyEditor : public VBoxContainer  {
 
 	SpinBox *step;
 
+	MenuButton *menu_add_track;
 	MenuButton *menu_track;
 
 	HScrollBar *h_scroll;
@@ -286,6 +287,7 @@ class AnimationKeyEditor : public VBoxContainer  {
 
 	void _scroll_changed(double);
 
+	void _menu_add_track(int p_type);
 	void _menu_track(int p_type);
 
 	void _clear_selection_for_anim(const Ref<Animation>& p_anim);

From f2704eb162ce5e2de6916cf8c2d8daeba81d03de Mon Sep 17 00:00:00 2001
From: masoud bh <masoud.bh@chmail.ir>
Date: Thu, 19 Nov 2015 01:40:29 +0330
Subject: [PATCH 77/78] Android add FA(persian) locale strings

---
 platform/android/java/res/values-fa/strings.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 platform/android/java/res/values-fa/strings.xml

diff --git a/platform/android/java/res/values-fa/strings.xml b/platform/android/java/res/values-fa/strings.xml
new file mode 100644
index 0000000000..450f9fe212
--- /dev/null
+++ b/platform/android/java/res/values-fa/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="godot_project_name_string">godot-project-name-fa</string>
+    <string name="testuf8">سلام</string>
+    <string name="text_paused_cellular">آیا می خواهید بر روی اتصال داده همراه دانلود را شروع کنید؟ بر اساس نوع سطح داده شما این ممکن است برای شما هزینه مالی داشته باشد.</string>
+    <string name="text_paused_cellular_2">اگر نمی خواهید بر روی اتصال داده همراه دانلود را شروع کنید ، دانلود به صورت خودکار در زمان دسترسی به وای-فای شروع می شود.</string>
+    <string name="text_button_resume_cellular">ادامه دانلود</string>
+    <string name="text_button_wifi_settings">تنظیمات وای-فای</string>
+    <string name="text_verifying_download">درحال تایید دانلود</string>
+    <string name="text_validation_complete">تایید فایل XAPK تکمیل شد.  برای خروج تایید کنید.</string>
+    <string name="text_validation_failed">اعتبارسنجی فایل XAPK ناموق.</string>
+    <string name="text_button_pause">توقف دانلود</string>
+    <string name="text_button_resume">ادامه دانلود</string>
+    <string name="text_button_cancel">انصراف</string>
+    <string name="text_button_cancel_verify">انصراف از تایید شدن</string>
+</resources>

From c1c2fef23ea099a23614fdab78358975d45fb50f Mon Sep 17 00:00:00 2001
From: Tybobobo <tybobobo@protonmail.ch>
Date: Mon, 26 Oct 2015 00:37:38 +0100
Subject: [PATCH 78/78] Added tooltip for a few buttons in sample library
 editor

---
 tools/editor/plugins/sample_library_editor_plugin.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/editor/plugins/sample_library_editor_plugin.cpp b/tools/editor/plugins/sample_library_editor_plugin.cpp
index cf9a6c41a4..b497458a2a 100644
--- a/tools/editor/plugins/sample_library_editor_plugin.cpp
+++ b/tools/editor/plugins/sample_library_editor_plugin.cpp
@@ -49,9 +49,13 @@ void SampleLibraryEditor::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 		play->set_icon( get_icon("Play","EditorIcons") );
+		play->set_tooltip("Play Sample");
 		stop->set_icon( get_icon("Stop","EditorIcons") );
+		stop->set_tooltip("Stop Sample");
 		load->set_icon( get_icon("Folder","EditorIcons") );
+		load->set_tooltip("Open Sample File(s)");
 		_delete->set_icon( get_icon("Del","EditorIcons") );
+		_delete->set_tooltip("Remove Sample");
 	}
 
 	if (p_what==NOTIFICATION_READY) {