Remove merge conflict messages and temporary fixes (#56)

* Fix merge conflict mistakes and bugfixes/workarounds

* Revert tabs/spaces indentation

addons/easy_charts/2d_charts/ScatterChart2D/scatter_chart2D.gd

@@ -25,7 +25,7 @@ func _get_children():
     PointTween = $PointTween
     Functions = $Functions
     GridTween = $GridTween
-    DataTooltip = $CanvasLayer/DataTooltip
+    DataTooltip = $CanvasLayer/PointData
     Outlines = $Outlines
     Grid = $Grid
 

addons/easy_charts/2d_charts/ScatterChart2D/scatter_chart2D.tscn

@@ -1,15 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-<<<<<<<< HEAD:addons/easy_charts/2DChart/ScatterChart2D/scatter_chart2D.tscn
-[ext_resource path="res://addons/easy_charts/2DChart/ScatterChart2D/scatter_chart2D.gd" type="Script" id=1]
-[ext_resource path="res://addons/easy_charts/Utilities/Point/point_data.tscn" type="PackedScene" id=2]
-
-
-========
 [ext_resource path="res://addons/easy_charts/2d_charts/ScatterChart2D/scatter_chart2D.gd" type="Script" id=1]
 [ext_resource path="res://addons/easy_charts/utilities/containers/data_tooltip/data_tooltip.tscn" type="PackedScene" id=2]
->>>>>>>> dev:addons/easy_charts/2d_charts/ScatterChart2D/scatter_chart2D.tscn
-
 
 [node name="ScatterChart2D" type="Node2D"]
 script = ExtResource( 1 )
@@ -59,7 +51,6 @@ margin_right = -152.972
 margin_bottom = -36.9003
 
 [node name="PointData" parent="CanvasLayer/PointData" index="0"]
-visible = false
 margin_left = 71.2491
 margin_top = -146.673
 margin_right = 71.1131

addons/easy_charts/3d_charts/ScatterChart3D/scatter_chart3D.tscn

@@ -1,14 +1,7 @@
 [gd_scene load_steps=7 format=2]
 
-<<<<<<<< HEAD:addons/easy_charts/3DChart/ScatterChart3D/scatter_chart3D.tscn
-[ext_resource path="res://addons/easy_charts/3DChart/ScatterChart3D/scatter_chart3D.gd" type="Script" id=1]
-[ext_resource path="res://addons/easy_charts/Utilities/Point/point_data.tscn" type="PackedScene" id=2]
-
-
-========
 [ext_resource path="res://addons/easy_charts/3d_charts/ScatterChart3D/scatter_chart3D.gd" type="Script" id=1]
 [ext_resource path="res://addons/easy_charts/utilities/containers/data_tooltip/data_tooltip.tscn" type="PackedScene" id=2]
->>>>>>>> dev:addons/easy_charts/3d_charts/ScatterChart3D/scatter_chart3D.tscn
 
 
 [sub_resource type="SpatialMaterial" id=1]

addons/easy_charts/control_charts/PieChart/pie_chart.gd

@@ -158,6 +158,12 @@ func calculate_pass():
 	for y_data in y_datas: tot+=y_data[0]
 	x_pass = 360/tot
 
+
+func create_legend():
+	#temporary override due to error
+	pass
+
+
 func calculate_coordinates():
 	area_angles.clear()
 	slices.clear()

addons/easy_charts/control_charts/PieChart/pie_chart.tscn

@@ -1,14 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-<<<<<<<< HEAD:addons/easy_charts/ControlChart/PieChart/pie_chart.tscn
-[ext_resource path="res://addons/easy_charts/ControlChart/PieChart/pie_chart.gd" type="Script" id=1]
-[ext_resource path="res://addons/easy_charts/Utilities/Point/point_data.tscn" type="PackedScene" id=2]
-
-========
 [ext_resource path="res://addons/easy_charts/control_charts/PieChart/pie_chart.gd" type="Script" id=1]
 [ext_resource path="res://addons/easy_charts/utilities/containers/data_tooltip/data_tooltip.tscn" type="PackedScene" id=2]
->>>>>>>> dev:addons/easy_charts/control_charts/PieChart/pie_chart.tscn
-
 
 [node name="PieChart" type="Control"]
 anchor_right = 1.0

addons/easy_charts/control_charts/ScatterChart/scatter_chart.tscn

@@ -1,14 +1,8 @@
 [gd_scene load_steps=3 format=2]
 
-<<<<<<<< HEAD:addons/easy_charts/ControlChart/ScatterChart/scatter_chart.tscn
-[ext_resource path="res://addons/easy_charts/Utilities/Point/point_data.tscn" type="PackedScene" id=1]
-[ext_resource path="res://addons/easy_charts/ControlChart/ScatterChart/scatter_chart.gd" type="Script" id=2]
 
-[sub_resource type="Theme" id=1]
-========
 [ext_resource path="res://addons/easy_charts/control_charts/ScatterChart/scatter_chart.gd" type="Script" id=1]
 [ext_resource path="res://addons/easy_charts/utilities/containers/data_tooltip/data_tooltip.tscn" type="PackedScene" id=2]
->>>>>>>> dev:addons/easy_charts/control_charts/ScatterChart/scatter_chart.tscn
 
 [node name="ScatterChart" type="Control"]
 anchor_right = 1.0
@@ -26,30 +20,6 @@ for a set of data. If the points are coded (color/shape/size), one additional va
 The data are displayed as a collection of points, each having the value of one variable determining the position on 
 the horizontal axis and the value of the other variable determining the position on the vertical axis."
 }
-<<<<<<<< HEAD:addons/easy_charts/ControlChart/ScatterChart/scatter_chart.tscn
-Chart_Properties/are_values_columns = false
-Chart_Properties/labels_index = 0
-Chart_Properties/show_x_values_as_labels = false
-Chart_Display/autoscale_x = true
-Chart_Display/x_decim = 1.0
-Chart_Display/autoscale_y = true
-Chart_Display/y_decim = 1.0
-Chart_Style/points_shape = [  ]
-Chart_Style/function_colors = PoolColorArray(  )
-Chart_Style/box_color = Color( 0.117647, 0.117647, 0.117647, 1 )
-Chart_Style/grid_lines_width = 1
-Chart_Style/v_lines_color = Color( 0.792157, 0.792157, 0.792157, 1 )
-Chart_Style/h_lines_color = Color( 0.792157, 0.792157, 0.792157, 1 )
-Chart_Style/font = null
-Chart_Style/bold_font = null
-Chart_Style/font_color = Color( 0.117647, 0.117647, 0.117647, 1 )
-Chart_Style/use_template = true
-Chart_Style/template = 0
-Chart_Modifiers/treshold = Vector2( 0, 0 )
-Chart_Modifiers/only_disp_values = Vector2( 0, 0 )
-Chart_Modifiers/invert_chart = false
-========
->>>>>>>> dev:addons/easy_charts/control_charts/ScatterChart/scatter_chart.tscn
 
 [node name="Background" type="ColorRect" parent="."]
 visible = false
@@ -88,19 +58,8 @@ __meta__ = {
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
-<<<<<<<< HEAD:addons/easy_charts/ControlChart/ScatterChart/scatter_chart.tscn
-[node name="PointData" parent="PointData" index="0"]
-margin_left = -510.384
-margin_top = -148.79
-margin_right = -510.52
-margin_bottom = -147.99
-theme = SubResource( 1 )
-
-[editable path="PointData"]
-========
 [node name="DataTooltip" parent="CanvasLayer" instance=ExtResource( 2 )]
 margin_left = 264.788
 margin_top = 446.78
 margin_right = 264.65
 margin_bottom = 447.58
->>>>>>>> dev:addons/easy_charts/control_charts/ScatterChart/scatter_chart.tscn