瀏覽代碼

Make some demos work again, reimport

Bojidar Marinov 7 年之前
父節點
當前提交
03ba4fc1df

+ 40 - 22
gui/drag_and_drop/drag_and_drop.tscn

@@ -2,22 +2,22 @@
 
 [ext_resource path="res://drag_drop_script.gd" type="Script" id=1]
 
-[node name="Control" type="Control"]
+[node name="Control" type="Control" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 __meta__ = {
 "__editor_plugin_screen__": "2D"
 }
 
-[node name="ColorPickerButton0" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton0" type="ColorPickerButton" parent="." index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -28,8 +28,9 @@ margin_top = 64.0
 margin_right = 160.0
 margin_bottom = 128.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -37,11 +38,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 0.671032, 0.605183, 0, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="ColorPickerButton1" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton1" type="ColorPickerButton" parent="." index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -52,8 +54,9 @@ margin_top = 64.0
 margin_right = 320.0
 margin_bottom = 128.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -61,11 +64,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 0, 0.797347, 0.741037, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="ColorPickerButton2" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton2" type="ColorPickerButton" parent="." index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -76,8 +80,9 @@ margin_top = 64.0
 margin_right = 480.0
 margin_bottom = 128.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -85,11 +90,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 0.443924, 0, 0.632923, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="ColorPickerButton3" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton3" type="ColorPickerButton" parent="." index="3"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -100,8 +106,9 @@ margin_top = 160.0
 margin_right = 160.0
 margin_bottom = 224.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -109,11 +116,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 1, 1, 1, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="ColorPickerButton4" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton4" type="ColorPickerButton" parent="." index="4"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -124,8 +132,9 @@ margin_top = 160.0
 margin_right = 320.0
 margin_bottom = 224.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -133,11 +142,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 1, 0.933842, 0, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="ColorPickerButton5" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton5" type="ColorPickerButton" parent="." index="5"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -148,8 +158,9 @@ margin_top = 160.0
 margin_right = 480.0
 margin_bottom = 224.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -157,11 +168,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 0.287293, 0.886362, 0.122933, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="ColorPickerButton6" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton6" type="ColorPickerButton" parent="." index="6"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -172,8 +184,9 @@ margin_top = 256.0
 margin_right = 160.0
 margin_bottom = 320.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -181,11 +194,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 0.908461, 0, 0.88789, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="ColorPickerButton7" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton7" type="ColorPickerButton" parent="." index="7"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -196,8 +210,9 @@ margin_top = 256.0
 margin_right = 320.0
 margin_bottom = 320.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -205,11 +220,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 0, 0.283703, 0, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="ColorPickerButton8" type="ColorPickerButton" parent="."]
+[node name="ColorPickerButton8" type="ColorPickerButton" parent="." index="8"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -220,8 +236,9 @@ margin_top = 256.0
 margin_right = 480.0
 margin_bottom = 320.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -229,11 +246,12 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 color = Color( 0, 0, 0.178211, 1 )
 edit_alpha = true
 script = ExtResource( 1 )
 
-[node name="Label" type="Label" parent="."]
+[node name="Label" type="Label" parent="." index="9"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -244,8 +262,8 @@ margin_top = 11.0
 margin_right = 470.0
 margin_bottom = 24.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Drag colors from button to button, or change button colors and drag them again."

+ 46 - 36
gui/input_mapping/controls.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://controls.gd" type="Script" id=1]
 
-[node name="controls_ui" type="Control"]
+[node name="controls_ui" type="Control" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -11,8 +11,8 @@ anchor_bottom = 0.0
 margin_right = 40.0
 margin_bottom = 40.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )
@@ -20,7 +20,7 @@ __meta__ = {
 "__editor_plugin_screen__": "2D"
 }
 
-[node name="contextual_help" type="Label" parent="."]
+[node name="contextual_help" type="Label" parent="." index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -31,8 +31,8 @@ margin_top = 50.0
 margin_right = 465.0
 margin_bottom = 89.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Click on a key binding to reassign it, or press the Cancel action."
@@ -40,7 +40,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="bindings" type="Control" parent="."]
+[node name="bindings" type="Control" parent="." index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -51,12 +51,12 @@ margin_top = 50.0
 margin_right = 90.0
 margin_bottom = 90.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 
-[node name="move_up" type="Control" parent="bindings"]
+[node name="move_up" type="Control" parent="bindings" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -67,12 +67,12 @@ margin_top = 50.0
 margin_right = 90.0
 margin_bottom = 90.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 
-[node name="Label" type="Label" parent="bindings/move_up"]
+[node name="Label" type="Label" parent="bindings/move_up" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -83,8 +83,8 @@ margin_top = 8.0
 margin_right = 45.0
 margin_bottom = 21.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Up"
@@ -92,7 +92,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="Button" type="Button" parent="bindings/move_up"]
+[node name="Button" type="Button" parent="bindings/move_up" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -103,8 +103,9 @@ margin_top = -1.0
 margin_right = 144.0
 margin_bottom = 29.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -112,8 +113,9 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 
-[node name="move_down" type="Control" parent="bindings"]
+[node name="move_down" type="Control" parent="bindings" index="1"]
 
 editor/display_folded = true
 anchor_left = 0.0
@@ -125,12 +127,12 @@ margin_top = 100.0
 margin_right = 90.0
 margin_bottom = 140.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 
-[node name="Label" type="Label" parent="bindings/move_down"]
+[node name="Label" type="Label" parent="bindings/move_down" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -141,8 +143,8 @@ margin_top = 8.0
 margin_right = 45.0
 margin_bottom = 21.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Down"
@@ -150,7 +152,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="Button" type="Button" parent="bindings/move_down"]
+[node name="Button" type="Button" parent="bindings/move_down" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -161,8 +163,9 @@ margin_top = -1.0
 margin_right = 144.0
 margin_bottom = 29.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -170,8 +173,9 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 
-[node name="move_left" type="Control" parent="bindings"]
+[node name="move_left" type="Control" parent="bindings" index="2"]
 
 editor/display_folded = true
 anchor_left = 0.0
@@ -183,12 +187,12 @@ margin_top = 150.0
 margin_right = 90.0
 margin_bottom = 190.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 
-[node name="Label" type="Label" parent="bindings/move_left"]
+[node name="Label" type="Label" parent="bindings/move_left" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -199,8 +203,8 @@ margin_top = 8.0
 margin_right = 45.0
 margin_bottom = 21.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Left"
@@ -208,7 +212,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="Button" type="Button" parent="bindings/move_left"]
+[node name="Button" type="Button" parent="bindings/move_left" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -219,8 +223,9 @@ margin_top = -1.0
 margin_right = 144.0
 margin_bottom = 29.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -228,8 +233,9 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 
-[node name="move_right" type="Control" parent="bindings"]
+[node name="move_right" type="Control" parent="bindings" index="3"]
 
 editor/display_folded = true
 anchor_left = 0.0
@@ -241,12 +247,12 @@ margin_top = 200.0
 margin_right = 90.0
 margin_bottom = 240.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 
-[node name="Label" type="Label" parent="bindings/move_right"]
+[node name="Label" type="Label" parent="bindings/move_right" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -257,8 +263,8 @@ margin_top = 8.0
 margin_right = 45.0
 margin_bottom = 21.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Right"
@@ -266,7 +272,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="Button" type="Button" parent="bindings/move_right"]
+[node name="Button" type="Button" parent="bindings/move_right" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -277,8 +283,9 @@ margin_top = -1.0
 margin_right = 144.0
 margin_bottom = 29.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -286,8 +293,9 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 
-[node name="jump" type="Control" parent="bindings"]
+[node name="jump" type="Control" parent="bindings" index="4"]
 
 editor/display_folded = true
 anchor_left = 0.0
@@ -299,12 +307,12 @@ margin_top = 250.0
 margin_right = 90.0
 margin_bottom = 290.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 
-[node name="Label" type="Label" parent="bindings/jump"]
+[node name="Label" type="Label" parent="bindings/jump" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -315,8 +323,8 @@ margin_top = 8.0
 margin_right = 45.0
 margin_bottom = 21.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Jump"
@@ -324,7 +332,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="Button" type="Button" parent="bindings/jump"]
+[node name="Button" type="Button" parent="bindings/jump" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -335,8 +343,9 @@ margin_top = -1.0
 margin_right = 144.0
 margin_bottom = 29.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -344,5 +353,6 @@ enabled_focus_mode = 2
 shortcut = null
 group = null
 flat = false
+align = 1
 
 

+ 2 - 0
gui/rich_text_bbcode/rich_text_bbcode.tscn

@@ -46,6 +46,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 0, 0 )
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )
@@ -66,6 +67,7 @@ margin_bottom = -62.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = true
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 custom_fonts/bold_italics_font = SubResource( 1 )

+ 1 - 1
gui/translation/hello_en.wav.import

@@ -10,7 +10,7 @@ source_file="res://hello_en.wav"
 source_md5="8a03a08650119bbd66417681a4f5aa5a"
 
 dest_files=[ "res://.import/hello_en.wav-27ed59f2d75c1ba813ab0abd069b6758.sample" ]
-dest_md5="efd203cb33d77deff8a912c7748cd2a6"
+dest_md5="55460bfdb1505a6c01d9f0ae69d71910"
 
 [params]
 

+ 1 - 1
gui/translation/hello_es.wav.import

@@ -10,7 +10,7 @@ source_file="res://hello_es.wav"
 source_md5="4a0a73a1532d0c46f69e5336c550a431"
 
 dest_files=[ "res://.import/hello_es.wav-64fe245556f8642a1881ae257bd123f2.sample" ]
-dest_md5="c732de9ea1407b3336b07438569a9f88"
+dest_md5="601fc37baf5cf3356c7282e583185bcc"
 
 [params]
 

+ 1 - 1
gui/translation/hello_jp.wav.import

@@ -10,7 +10,7 @@ source_file="res://hello_jp.wav"
 source_md5="60ed6a48deebb7a10da83adea9507693"
 
 dest_files=[ "res://.import/hello_jp.wav-c31fbd7870b4b969789cb01f208809ac.sample" ]
-dest_md5="256e57800b66c2ad4fe9454d6f06a883"
+dest_md5="3652492771540e443708cc455818d261"
 
 [params]
 

+ 27 - 19
gui/translation/main.tscn

@@ -6,15 +6,15 @@
 [ext_resource path="res://flag_uk.png" type="Texture" id=4]
 [ext_resource path="res://hello_en.wav" type="AudioStream" id=5]
 
-[node name="Panel" type="Panel"]
+[node name="Panel" type="Panel" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )
@@ -22,7 +22,7 @@ __meta__ = {
 "__editor_plugin_screen__": "2D"
 }
 
-[node name="english" type="Button" parent="."]
+[node name="english" type="Button" parent="." index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -33,8 +33,9 @@ margin_top = 64.0
 margin_right = 192.0
 margin_bottom = 88.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -43,8 +44,9 @@ shortcut = null
 group = null
 text = "Use English"
 flat = false
+align = 1
 
-[node name="spanish" type="Button" parent="."]
+[node name="spanish" type="Button" parent="." index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -55,8 +57,9 @@ margin_top = 112.0
 margin_right = 192.0
 margin_bottom = 136.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -65,8 +68,9 @@ shortcut = null
 group = null
 text = "Use Spanish"
 flat = false
+align = 1
 
-[node name="japanese" type="Button" parent="."]
+[node name="japanese" type="Button" parent="." index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -77,8 +81,9 @@ margin_top = 160.0
 margin_right = 192.0
 margin_bottom = 184.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -87,8 +92,9 @@ shortcut = null
 group = null
 text = "Use Japanese"
 flat = false
+align = 1
 
-[node name="description" type="Label" parent="."]
+[node name="description" type="Label" parent="." index="3"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -99,8 +105,8 @@ margin_top = 42.0
 margin_right = 808.0
 margin_bottom = 312.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 custom_fonts/font = ExtResource( 2 )
@@ -118,7 +124,7 @@ lines_skipped = 0
 max_lines_visible = -1
 _sections_unfolded = [ "custom_fonts" ]
 
-[node name="HSeparator" type="HSeparator" parent="."]
+[node name="HSeparator" type="HSeparator" parent="." index="4"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -129,12 +135,12 @@ margin_top = 330.0
 margin_right = 1001.0
 margin_bottom = 370.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 
-[node name="label" type="Label" parent="."]
+[node name="label" type="Label" parent="." index="5"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -145,8 +151,8 @@ margin_top = 381.0
 margin_right = 324.0
 margin_bottom = 400.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 0
 custom_fonts/font = ExtResource( 2 )
@@ -156,7 +162,7 @@ lines_skipped = 0
 max_lines_visible = -1
 _sections_unfolded = [ "custom_fonts" ]
 
-[node name="play" type="Button" parent="."]
+[node name="play" type="Button" parent="." index="6"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -167,8 +173,9 @@ margin_top = 442.0
 margin_right = 475.0
 margin_bottom = 467.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 custom_fonts/font = ExtResource( 2 )
@@ -179,9 +186,10 @@ group = null
 text = "KEY_PUSH"
 icon = ExtResource( 3 )
 flat = false
+align = 1
 _sections_unfolded = [ "custom_fonts" ]
 
-[node name="TextureRect" type="TextureRect" parent="."]
+[node name="TextureRect" type="TextureRect" parent="." index="7"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -192,14 +200,14 @@ margin_top = 382.0
 margin_right = 213.0
 margin_bottom = 467.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 texture = ExtResource( 4 )
 stretch_mode = 0
 
-[node name="audio" type="AudioStreamPlayer" parent="."]
+[node name="audio" type="AudioStreamPlayer" parent="." index="8"]
 
 stream = ExtResource( 5 )
 volume_db = 0.0

二進制
gui/translation/text.en.translation


二進制
gui/translation/text.es.translation


二進制
gui/translation/text.ja.translation


+ 8 - 6
misc/autoload/scene_a.tscn

@@ -2,20 +2,20 @@
 
 [ext_resource path="res://scene_a.gd" type="Script" id=1]
 
-[node name="scene_a" type="Panel"]
+[node name="scene_a" type="Panel" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )
 
-[node name="label" type="Label" parent="."]
+[node name="label" type="Label" parent="." index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -26,8 +26,8 @@ margin_top = 48.0
 margin_right = 104.0
 margin_bottom = 62.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 0
 text = "This is scene A."
@@ -35,7 +35,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="goto_scene" type="Button" parent="."]
+[node name="goto_scene" type="Button" parent="." index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -46,8 +46,9 @@ margin_top = 128.0
 margin_right = 192.0
 margin_bottom = 160.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -56,6 +57,7 @@ shortcut = null
 group = null
 text = "Go to Scene B"
 flat = false
+align = 1
 
 [connection signal="pressed" from="goto_scene" to="." method="_on_goto_scene_pressed"]
 

+ 2 - 0
misc/joypads/joypads.gd

@@ -35,7 +35,9 @@ func _physics_process(delta):
 				get_node("diagram/axes/" + str(axis) + "-").hide()
 			elif (axis_value > 0):
 				get_node("diagram/axes/" + str(axis) + "+").show()
+				get_node("diagram/axes/" + str(axis) + "-").hide()
 			else:
+				get_node("diagram/axes/" + str(axis) + "+").hide()
 				get_node("diagram/axes/" + str(axis) + "-").show()
 
 	# Loop through the buttons and highlight the ones that are pressed

File diff suppressed because it is too large
+ 108 - 108
misc/joypads/joypads.tscn


+ 26 - 28
misc/joypads/jsdiagram.tscn

@@ -9,11 +9,11 @@ position = Vector2( 368.635, 155.289 )
 scale = Vector2( 0.432859, 0.446287 )
 texture = ExtResource( 1 )
 
-[node name="buttons" type="Node2D" parent="."]
+[node name="buttons" type="Node2D" parent="." index="0"]
 
 editor/display_folded = true
 
-[node name="0" type="Sprite" parent="buttons"]
+[node name="0" type="Sprite" parent="buttons" index="0"]
 
 position = Vector2( 147.73, 120.925 )
 scale = Vector2( 0.9, 0.9 )
@@ -21,7 +21,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 45 )
 
-[node name="1" type="Sprite" parent="buttons"]
+[node name="1" type="Sprite" parent="buttons" index="1"]
 
 position = Vector2( 185.769, 82.4874 )
 scale = Vector2( 0.9, 0.9 )
@@ -29,7 +29,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 45 )
 
-[node name="2" type="Sprite" parent="buttons"]
+[node name="2" type="Sprite" parent="buttons" index="2"]
 
 position = Vector2( 112.377, 82.4874 )
 scale = Vector2( 0.9, 0.9 )
@@ -37,7 +37,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 45 )
 
-[node name="3" type="Sprite" parent="buttons"]
+[node name="3" type="Sprite" parent="buttons" index="3"]
 
 position = Vector2( 149.073, 47.3293 )
 scale = Vector2( 0.9, 0.9 )
@@ -45,7 +45,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 45 )
 
-[node name="4" type="Sprite" parent="buttons"]
+[node name="4" type="Sprite" parent="buttons" index="4"]
 
 position = Vector2( -161.038, -158.037 )
 scale = Vector2( 5.3348, 3.35512 )
@@ -53,7 +53,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 10, 10, 10, 10 )
 
-[node name="5" type="Sprite" parent="buttons"]
+[node name="5" type="Sprite" parent="buttons" index="5"]
 
 position = Vector2( 159.362, -156.977 )
 scale = Vector2( 5.3348, 3.35512 )
@@ -61,7 +61,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 10, 10, 10, 10 )
 
-[node name="6" type="Sprite" parent="buttons"]
+[node name="6" type="Sprite" parent="buttons" index="6"]
 
 position = Vector2( -159.349, -221.878 )
 scale = Vector2( 1.0458, 2.16952 )
@@ -70,7 +70,7 @@ flip_h = true
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 22 )
 
-[node name="7" type="Sprite" parent="buttons"]
+[node name="7" type="Sprite" parent="buttons" index="7"]
 
 position = Vector2( 156.677, -220.11 )
 scale = Vector2( 1.0458, 2.16952 )
@@ -78,7 +78,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 22 )
 
-[node name="8" type="Sprite" parent="buttons"]
+[node name="8" type="Sprite" parent="buttons" index="8"]
 
 position = Vector2( -67.5308, 164.422 )
 scale = Vector2( 0.9, 0.9 )
@@ -86,7 +86,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 45 )
 
-[node name="9" type="Sprite" parent="buttons"]
+[node name="9" type="Sprite" parent="buttons" index="9"]
 
 position = Vector2( 75.8825, 167.363 )
 scale = Vector2( 0.9, 0.9 )
@@ -94,7 +94,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 45 )
 
-[node name="10" type="Sprite" parent="buttons"]
+[node name="10" type="Sprite" parent="buttons" index="10"]
 
 position = Vector2( -46.6707, 52.702 )
 scale = Vector2( 0.810497, 0.57205 )
@@ -102,7 +102,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 45 )
 
-[node name="11" type="Sprite" parent="buttons"]
+[node name="11" type="Sprite" parent="buttons" index="11"]
 
 position = Vector2( 56.2581, 54.4382 )
 scale = Vector2( 0.810497, 0.57205 )
@@ -110,7 +110,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 0, 0, 45, 45 )
 
-[node name="12" type="Sprite" parent="buttons"]
+[node name="12" type="Sprite" parent="buttons" index="12"]
 
 position = Vector2( -139.402, 46.8295 )
 scale = Vector2( 0.9, 0.9 )
@@ -118,7 +118,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 50, 0, 54, 14 )
 
-[node name="13" type="Sprite" parent="buttons"]
+[node name="13" type="Sprite" parent="buttons" index="13"]
 
 position = Vector2( -139.838, 115.789 )
 scale = Vector2( 0.9, 0.9 )
@@ -127,7 +127,7 @@ flip_v = true
 region_enabled = true
 region_rect = Rect2( 50, 0, 54, 14 )
 
-[node name="14" type="Sprite" parent="buttons"]
+[node name="14" type="Sprite" parent="buttons" index="14"]
 
 position = Vector2( -172.262, 81.8793 )
 scale = Vector2( 0.9, 0.9 )
@@ -135,7 +135,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 50, 0, 14, 54 )
 
-[node name="15" type="Sprite" parent="buttons"]
+[node name="15" type="Sprite" parent="buttons" index="15"]
 
 position = Vector2( -105.085, 81.0326 )
 scale = Vector2( 0.9, 0.9 )
@@ -144,11 +144,9 @@ flip_h = true
 region_enabled = true
 region_rect = Rect2( 50, 0, 14, 54 )
 
-[node name="axes" type="Node2D" parent="."]
+[node name="axes" type="Node2D" parent="." index="1"]
 
-editor/display_folded = true
-
-[node name="0-" type="Sprite" parent="axes"]
+[node name="0-" type="Sprite" parent="axes" index="0"]
 
 position = Vector2( -94.4295, 164.932 )
 scale = Vector2( 0.9, 0.9 )
@@ -156,7 +154,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 50, 0, 14, 54 )
 
-[node name="0+" type="Sprite" parent="axes"]
+[node name="0+" type="Sprite" parent="axes" index="1"]
 
 position = Vector2( -40.3475, 164.509 )
 scale = Vector2( 0.9, 0.9 )
@@ -165,7 +163,7 @@ flip_h = true
 region_enabled = true
 region_rect = Rect2( 50, 0, 14, 54 )
 
-[node name="1-" type="Sprite" parent="axes"]
+[node name="1-" type="Sprite" parent="axes" index="2"]
 
 position = Vector2( -67.6802, 137.926 )
 scale = Vector2( 0.9, 0.9 )
@@ -173,7 +171,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 50, 0, 54, 14 )
 
-[node name="1+" type="Sprite" parent="axes"]
+[node name="1+" type="Sprite" parent="axes" index="3"]
 
 position = Vector2( -67.4618, 192.915 )
 scale = Vector2( 0.9, 0.9 )
@@ -182,7 +180,7 @@ flip_v = true
 region_enabled = true
 region_rect = Rect2( 50, 0, 54, 14 )
 
-[node name="2-" type="Sprite" parent="axes"]
+[node name="2-" type="Sprite" parent="axes" index="4"]
 
 position = Vector2( 48.8152, 167.145 )
 scale = Vector2( 0.9, 0.9 )
@@ -190,7 +188,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 50, 0, 14, 54 )
 
-[node name="2+" type="Sprite" parent="axes"]
+[node name="2+" type="Sprite" parent="axes" index="5"]
 
 position = Vector2( 102.899, 167.857 )
 scale = Vector2( 0.9, 0.9 )
@@ -199,7 +197,7 @@ flip_h = true
 region_enabled = true
 region_rect = Rect2( 50, 0, 14, 54 )
 
-[node name="3-" type="Sprite" parent="axes"]
+[node name="3-" type="Sprite" parent="axes" index="6"]
 
 position = Vector2( 76.6557, 140.986 )
 scale = Vector2( 0.9, 0.9 )
@@ -207,7 +205,7 @@ texture = ExtResource( 2 )
 region_enabled = true
 region_rect = Rect2( 50, 0, 54, 14 )
 
-[node name="3+" type="Sprite" parent="axes"]
+[node name="3+" type="Sprite" parent="axes" index="7"]
 
 position = Vector2( 76.0009, 195.339 )
 scale = Vector2( 0.9, 0.9 )

+ 29 - 22
misc/pause/spinpause.tscn

@@ -19,6 +19,7 @@ tracks/0/path = NodePath("cube:rotation_degrees")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
+tracks/0/enabled = true
 tracks/0/keys = {
 "times": PoolRealArray( 0, 10 ),
 "transitions": PoolRealArray( 1, 1 ),
@@ -26,11 +27,11 @@ tracks/0/keys = {
 "values": [ Vector3( 0, 0, 0 ), Vector3( 0, -360, 0 ) ]
 }
 
-[node name="pause_scene" type="Spatial"]
+[node name="pause_scene" type="Spatial" index="0"]
 
 script = ExtResource( 1 )
 
-[node name="cube" type="MeshInstance" parent="."]
+[node name="cube" type="MeshInstance" parent="." index="0"]
 
 layers = 1
 material_override = null
@@ -45,33 +46,34 @@ mesh = SubResource( 1 )
 skeleton = NodePath("..")
 material/0 = null
 
-[node name="camera" type="Camera" parent="."]
+[node name="camera" type="Camera" parent="." index="1"]
 
 transform = Transform( 0.571594, 0.275303, -0.772974, 0, 0.942035, 0.335515, 0.820537, -0.191779, 0.538461, -5.59754, 2.75935, 4.01344 )
-projection = 0
-fov = 60.0
-near = 0.1
-far = 100.0
 keep_aspect = 1
-current = false
 cull_mask = 1048575
 environment = null
 h_offset = 0.0
 v_offset = 0.0
-doppler/tracking = 0
+doppler_tracking = 0
+projection = 0
+current = false
+fov = 60.0
+size = 1.0
+near = 0.1
+far = 100.0
 
-[node name="anim" type="AnimationPlayer" parent="."]
+[node name="anim" type="AnimationPlayer" parent="." index="2"]
 
+root_node = NodePath("..")
+autoplay = "spin"
 playback_process_mode = 1
 playback_default_blend_time = 0.0
-root_node = NodePath("..")
+playback_speed = 1.0
 anims/spin = SubResource( 2 )
-playback/active = true
-playback/speed = 1.0
 blend_times = [  ]
 autoplay = "spin"
 
-[node name="spot" type="SpotLight" parent="."]
+[node name="spot" type="SpotLight" parent="." index="3"]
 
 transform = Transform( 0.792992, 0.251051, -0.555101, 0, 0.911149, 0.412078, 0.609232, -0.326775, 0.722534, -3.05357, 1.80053, 3.64099 )
 layers = 1
@@ -80,6 +82,7 @@ light_energy = 1.0
 light_indirect_energy = 1.0
 light_negative = false
 light_specular = 0.5
+light_bake_mode = 1
 light_cull_mask = -1
 shadow_enabled = false
 shadow_color = Color( 0, 0, 0, 1 )
@@ -93,7 +96,7 @@ spot_angle = 45.0
 spot_angle_attenuation = 1.0
 _sections_unfolded = [ "Spot" ]
 
-[node name="pause" type="Button" parent="."]
+[node name="pause" type="Button" parent="." index="4"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -104,8 +107,9 @@ margin_top = 24.0
 margin_right = 120.0
 margin_bottom = 56.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -114,8 +118,9 @@ shortcut = null
 group = null
 text = "PAUSE!"
 flat = false
+align = 1
 
-[node name="pause_popup" type="PopupPanel" parent="."]
+[node name="pause_popup" type="PopupPanel" parent="." index="5"]
 
 pause_mode = 2
 visible = false
@@ -129,14 +134,14 @@ margin_top = 72.0
 margin_right = 638.0
 margin_bottom = 433.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 popup_exclusive = false
 _sections_unfolded = [ "Pause" ]
 
-[node name="text" type="Label" parent="pause_popup"]
+[node name="text" type="Label" parent="pause_popup" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -147,8 +152,8 @@ margin_top = 49.0
 margin_right = 389.0
 margin_bottom = 154.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "The game has been paused! Nodes are not processing anymore, but this popup can still process!"
@@ -157,7 +162,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="unpause" type="Button" parent="pause_popup"]
+[node name="unpause" type="Button" parent="pause_popup" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -168,8 +173,9 @@ margin_top = 288.0
 margin_right = 281.0
 margin_bottom = 320.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -178,6 +184,7 @@ shortcut = null
 group = null
 text = "UN-PAUSE!"
 flat = false
+align = 1
 
 [connection signal="pressed" from="pause" to="." method="_on_pause_pressed"]
 

+ 5 - 4
misc/regex/regex.gd

@@ -12,10 +12,11 @@ func update_text():
 		child.queue_free()
 	if regex.is_valid():
 		var matches = regex.search($Text.get_text())
-		for result in matches.get_strings():
-			var label = Label.new()
-			label.text = result
-			$List.add_child(label)
+		if matches != null:
+			for result in matches.get_strings():
+				var label = Label.new()
+				label.text = result
+				$List.add_child(label)
 
 func _ready():
 	$Text.set_text("They asked me \"What's going on \\\"in the manor\\\"?\"")

+ 18 - 9
misc/regex/regex.tscn

@@ -2,22 +2,22 @@
 
 [ext_resource path="res://regex.gd" type="Script" id=1]
 
-[node name="VBoxContainer" type="VBoxContainer"]
+[node name="VBoxContainer" type="VBoxContainer" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 alignment = 0
 script = ExtResource( 1 )
 _sections_unfolded = [ "Size Flags" ]
 
-[node name="Expression" type="LineEdit" parent="."]
+[node name="Expression" type="LineEdit" parent="." index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -26,19 +26,21 @@ anchor_bottom = 0.0
 margin_right = 1024.0
 margin_bottom = 24.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 1
 size_flags_horizontal = 1
 size_flags_vertical = 1
 text = "\"((?:\\\\.|[^\"])*)\""
-expand_to_len = false
 focus_mode = 2
+context_menu_enabled = true
 placeholder_alpha = 0.6
 caret_blink = false
 caret_blink_speed = 0.65
+caret_position = 0
 _sections_unfolded = [ "Size Flags" ]
 
-[node name="Text" type="TextEdit" parent="."]
+[node name="Text" type="TextEdit" parent="." index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -49,23 +51,30 @@ margin_right = 1024.0
 margin_bottom = 328.0
 rect_min_size = Vector2( 0, 300 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
+text = ""
+readonly = false
 highlight_current_line = false
 syntax_highlighting = false
 show_line_numbers = false
 highlight_all_occurrences = false
 override_selected_font_color = false
+context_menu_enabled = true
 smooth_scrolling = false
 v_scroll_speed = 80.0
+hiding_enabled = 0
+wrap_lines = false
 caret_block_mode = false
 caret_blink = false
 caret_blink_speed = 0.65
+caret_moving_by_right_click = true
 _sections_unfolded = [ "Rect", "Size Flags" ]
 
-[node name="List" type="VBoxContainer" parent="."]
+[node name="List" type="VBoxContainer" parent="." index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -75,8 +84,8 @@ margin_top = 332.0
 margin_right = 1024.0
 margin_bottom = 332.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 alignment = 0

+ 33 - 0
misc/sensors/cube_6.png.import

@@ -0,0 +1,33 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/cube_6.png-0b954e2c88c21596044fe6448711988e.s3tc.stex"
+path.etc2="res://.import/cube_6.png-0b954e2c88c21596044fe6448711988e.etc2.stex"
+
+[deps]
+
+source_file="res://cube_6.png"
+source_md5="9d2131f81a62c204dc382856b9be043c"
+
+dest_files=[ "res://.import/cube_6.png-0b954e2c88c21596044fe6448711988e.s3tc.stex", "res://.import/cube_6.png-0b954e2c88c21596044fe6448711988e.etc2.stex" ]
+dest_md5="5187ca5e757e289bfdded0a98ce964ba"
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

+ 32 - 0
misc/sensors/icon.png.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+
+[deps]
+
+source_file="res://icon.png"
+source_md5="ae7e641067601e2184afcade49abd283"
+
+dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+dest_md5="84511021bbc8c9d37c7f0f4d181de883"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

+ 37 - 33
misc/sensors/main.tscn

@@ -10,9 +10,6 @@ background_sky_custom_fov = 0.0
 background_color = Color( 0, 0, 0, 1 )
 background_energy = 1.0
 background_canvas_max_layer = 0
-background_camera_feed_id = 1
-background_camera_feed_h_flip = false
-background_camera_feed_v_flip = true
 ambient_light_color = Color( 0.648438, 0.64578, 0.64578, 1 )
 ambient_light_energy = 1.0
 ambient_light_sky_contribution = 1.0
@@ -103,6 +100,7 @@ flags_no_depth_test = false
 flags_use_point_size = false
 flags_world_triplanar = false
 flags_fixed_size = false
+flags_albedo_tex_force_srgb = false
 vertex_color_use_as_albedo = false
 vertex_color_is_srgb = false
 params_diffuse_mode = 1
@@ -162,6 +160,7 @@ flags_no_depth_test = false
 flags_use_point_size = false
 flags_world_triplanar = false
 flags_fixed_size = false
+flags_albedo_tex_force_srgb = false
 vertex_color_use_as_albedo = false
 vertex_color_is_srgb = false
 params_diffuse_mode = 1
@@ -213,6 +212,7 @@ flags_no_depth_test = false
 flags_use_point_size = false
 flags_world_triplanar = false
 flags_fixed_size = false
+flags_albedo_tex_force_srgb = false
 vertex_color_use_as_albedo = false
 vertex_color_is_srgb = false
 params_diffuse_mode = 1
@@ -271,6 +271,7 @@ flags_no_depth_test = false
 flags_use_point_size = false
 flags_world_triplanar = false
 flags_fixed_size = false
+flags_albedo_tex_force_srgb = false
 vertex_color_use_as_albedo = false
 vertex_color_is_srgb = false
 params_diffuse_mode = 1
@@ -313,11 +314,11 @@ proximity_fade_enable = false
 distance_fade_enable = false
 _sections_unfolded = [ "Albedo" ]
 
-[node name="Main" type="Node"]
+[node name="Main" type="Node" index="0"]
 
 script = ExtResource( 1 )
 
-[node name="Control" type="Control" parent="."]
+[node name="Control" type="Control" parent="." index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -326,13 +327,13 @@ anchor_bottom = 0.0
 margin_right = 1025.0
 margin_bottom = 602.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 _sections_unfolded = [ "Anchor", "Grow Direction", "Hint", "Margin", "Rect", "Size Flags" ]
 
-[node name="Accelerometer" type="Label" parent="Control"]
+[node name="Accelerometer" type="Label" parent="Control" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -342,8 +343,8 @@ margin_right = 340.0
 margin_bottom = 14.0
 rect_scale = Vector2( 2, 2 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
 text = "Accelerometer"
@@ -352,7 +353,7 @@ lines_skipped = 0
 max_lines_visible = -1
 _sections_unfolded = [ "Anchor", "Margin", "Rect", "Size Flags" ]
 
-[node name="Magnetometer" type="Label" parent="Control"]
+[node name="Magnetometer" type="Label" parent="Control" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -363,8 +364,8 @@ margin_right = 340.0
 margin_bottom = 44.0
 rect_scale = Vector2( 2, 2 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
 text = "Magnetometer"
@@ -373,7 +374,7 @@ lines_skipped = 0
 max_lines_visible = -1
 _sections_unfolded = [ "Anchor", "Margin", "Rect", "Size Flags" ]
 
-[node name="Gyroscope" type="Label" parent="Control"]
+[node name="Gyroscope" type="Label" parent="Control" index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -384,8 +385,8 @@ margin_right = 340.0
 margin_bottom = 74.0
 rect_scale = Vector2( 2, 2 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
 text = "Gyroscope"
@@ -394,29 +395,30 @@ lines_skipped = 0
 max_lines_visible = -1
 _sections_unfolded = [ "Anchor", "Margin", "Rect", "Size Flags" ]
 
-[node name="Camera" type="Camera" parent="."]
+[node name="Camera" type="Camera" parent="." index="1"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.285209, 0, 11.9833 )
-projection = 0
-fov = 65.0
-near = 0.1
-far = 100.0
 keep_aspect = 1
-current = false
 cull_mask = 1048575
 environment = SubResource( 1 )
 h_offset = 0.0
 v_offset = 0.0
-doppler/tracking = 0
+doppler_tracking = 0
+projection = 0
+current = false
+fov = 65.0
+size = 1.0
+near = 0.1
+far = 100.0
 
-[node name="Arrows" type="Spatial" parent="."]
+[node name="Arrows" type="Spatial" parent="." index="2"]
 
-[node name="AccelerometerArrow" type="Spatial" parent="Arrows"]
+[node name="AccelerometerArrow" type="Spatial" parent="Arrows" index="0"]
 
 transform = Transform( 1, 0, 0, 0, -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Bottom" type="MeshInstance" parent="Arrows/AccelerometerArrow"]
+[node name="Bottom" type="MeshInstance" parent="Arrows/AccelerometerArrow" index="0"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 )
 layers = 1
@@ -433,7 +435,7 @@ skeleton = NodePath("..")
 material/0 = SubResource( 3 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Top" type="MeshInstance" parent="Arrows/AccelerometerArrow"]
+[node name="Top" type="MeshInstance" parent="Arrows/AccelerometerArrow" index="1"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0 )
 layers = 1
@@ -450,12 +452,12 @@ skeleton = NodePath("..")
 material/0 = SubResource( 3 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="MagnetoArrow" type="Spatial" parent="Arrows"]
+[node name="MagnetoArrow" type="Spatial" parent="Arrows" index="1"]
 
 transform = Transform( -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 0, 0, 0 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Bottom" type="MeshInstance" parent="Arrows/MagnetoArrow"]
+[node name="Bottom" type="MeshInstance" parent="Arrows/MagnetoArrow" index="0"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 )
 layers = 1
@@ -472,7 +474,7 @@ skeleton = NodePath("..")
 material/0 = SubResource( 5 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Top" type="MeshInstance" parent="Arrows/MagnetoArrow"]
+[node name="Top" type="MeshInstance" parent="Arrows/MagnetoArrow" index="1"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0 )
 layers = 1
@@ -489,12 +491,12 @@ skeleton = NodePath("..")
 material/0 = SubResource( 5 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="NorthArrow" type="Spatial" parent="Arrows"]
+[node name="NorthArrow" type="Spatial" parent="Arrows" index="2"]
 
 transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Bottom" type="MeshInstance" parent="Arrows/NorthArrow"]
+[node name="Bottom" type="MeshInstance" parent="Arrows/NorthArrow" index="0"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 )
 layers = 1
@@ -511,7 +513,7 @@ skeleton = NodePath("..")
 material/0 = SubResource( 6 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Top" type="MeshInstance" parent="Arrows/NorthArrow"]
+[node name="Top" type="MeshInstance" parent="Arrows/NorthArrow" index="1"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0 )
 layers = 1
@@ -528,9 +530,9 @@ skeleton = NodePath("..")
 material/0 = SubResource( 6 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Boxes" type="Spatial" parent="."]
+[node name="Boxes" type="Spatial" parent="." index="3"]
 
-[node name="MagAndGrav" type="MeshInstance" parent="Boxes"]
+[node name="MagAndGrav" type="MeshInstance" parent="Boxes" index="0"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7, -4, 0 )
 layers = 1
@@ -547,7 +549,7 @@ skeleton = NodePath("..")
 material/0 = SubResource( 8 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="GyroAndGrav" type="MeshInstance" parent="Boxes"]
+[node name="GyroAndGrav" type="MeshInstance" parent="Boxes" index="1"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7, -4, 0 )
 layers = 1
@@ -564,14 +566,16 @@ skeleton = NodePath("..")
 material/0 = SubResource( 8 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="DirectionalLight" type="DirectionalLight" parent="."]
+[node name="DirectionalLight" type="DirectionalLight" parent="." index="4"]
 
 transform = Transform( 0.884838, -0.329433, 0.329449, 0, 0.707124, 0.707089, -0.4659, -0.625659, 0.62569, 0, 4.69444, 0 )
 layers = 1
 light_color = Color( 1, 1, 1, 1 )
 light_energy = 1.0
+light_indirect_energy = 1.0
 light_negative = false
 light_specular = 0.5
+light_bake_mode = 1
 light_cull_mask = -1
 shadow_enabled = false
 shadow_color = Color( 0, 0, 0, 1 )

+ 6 - 4
misc/threads/thread.tscn

@@ -2,11 +2,11 @@
 
 [ext_resource path="res://thread.gd" type="Script" id=1]
 
-[node name="node" type="Node2D"]
+[node name="node" type="Node2D" index="0"]
 
 script = ExtResource( 1 )
 
-[node name="load" type="Button" parent="."]
+[node name="load" type="Button" parent="." index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -17,8 +17,9 @@ margin_top = 32.0
 margin_right = 320.0
 margin_bottom = 64.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = false
@@ -27,8 +28,9 @@ shortcut = null
 group = null
 text = "Load in Thread"
 flat = false
+align = 1
 
-[node name="sprite" type="Sprite" parent="."]
+[node name="sprite" type="Sprite" parent="." index="1"]
 
 position = Vector2( 248, 256 )
 _sections_unfolded = [ "Transform" ]

+ 9 - 12
misc/tween/main.gd

@@ -14,16 +14,13 @@ var state = {
 
 func _ready():
 	for index in range(trans.size()):
-		var name = trans[index]
-		get_node("trans/" + name).connect("pressed", self, "on_trans_changed", [name, index])
+		get_node("trans/" + trans[index]).connect("pressed", self, "on_trans_changed", [trans[index], index])
 
 	for index in range(eases.size()):
-		var name = eases[index]
-		get_node("eases/" + name).connect("pressed", self, "on_eases_changed", [name, index])
+		get_node("eases/" + eases[index]).connect("pressed", self, "on_eases_changed", [eases[index], index])
 
 	for index in range(modes.size()):
-		var name = modes[index]
-		get_node("modes/" + name).connect("pressed", self, "on_modes_changed", [name])
+		get_node("modes/" + modes[index]).connect("pressed", self, "on_modes_changed", [modes[index]])
 
 	get_node("colors/color_from/picker").set_pick_color(Color(1, 0, 0, 1))
 	get_node("colors/color_from/picker").connect("color_changed", self, "on_color_changed")
@@ -39,9 +36,9 @@ func _ready():
 	reset_tween()
 
 
-func on_trans_changed(name, index):
+func on_trans_changed(trans_name, index):
 	for index in range(trans.size()):
-		var pressed = trans[index] == name
+		var pressed = trans[index] == trans_name
 		var btn = get_node("trans/" + trans[index])
 
 		btn.set_pressed(pressed)
@@ -51,9 +48,9 @@ func on_trans_changed(name, index):
 	reset_tween()
 
 
-func on_eases_changed(name, index):
+func on_eases_changed(ease_name, index):
 	for index in range(eases.size()):
-		var pressed = eases[index] == name
+		var pressed = eases[index] == ease_name
 		var btn = get_node("eases/" + eases[index])
 
 		btn.set_pressed(pressed)
@@ -63,9 +60,9 @@ func on_eases_changed(name, index):
 	reset_tween()
 
 
-func on_modes_changed(name):
+func on_modes_changed(mode_name):
 	var tween = get_node("tween")
-	if name == "pause":
+	if mode_name == "pause":
 		if get_node("modes/pause").is_pressed():
 			tween.stop_all()
 			get_node("timeline").set_mouse_filter(Control.MOUSE_FILTER_PASS)

+ 144 - 81
misc/tween/main.tscn

@@ -3,7 +3,7 @@
 [ext_resource path="res://main.gd" type="Script" id=1]
 [ext_resource path="res://godot.png" type="Texture" id=2]
 
-[node name="main" type="Control"]
+[node name="main" type="Control" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -12,13 +12,13 @@ anchor_bottom = 0.0
 margin_right = 800.0
 margin_bottom = 600.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )
 
-[node name="trans" type="VBoxContainer" parent="."]
+[node name="trans" type="VBoxContainer" parent="." index="0"]
 
 editor/display_folded = true
 anchor_left = 0.0
@@ -30,13 +30,13 @@ margin_top = 288.0
 margin_right = 129.0
 margin_bottom = 614.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
 
-[node name="linear" type="Button" parent="trans"]
+[node name="linear" type="Button" parent="trans" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -45,8 +45,9 @@ anchor_bottom = 0.0
 margin_right = 48.0
 margin_bottom = 20.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -55,8 +56,9 @@ shortcut = null
 group = null
 text = "linear"
 flat = false
+align = 1
 
-[node name="sine" type="Button" parent="trans"]
+[node name="sine" type="Button" parent="trans" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -66,8 +68,9 @@ margin_top = 30.0
 margin_right = 39.0
 margin_bottom = 50.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -76,8 +79,9 @@ shortcut = null
 group = null
 text = "sine"
 flat = false
+align = 1
 
-[node name="quint" type="Button" parent="trans"]
+[node name="quint" type="Button" parent="trans" index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -87,8 +91,9 @@ margin_top = 60.0
 margin_right = 45.0
 margin_bottom = 80.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -97,8 +102,9 @@ shortcut = null
 group = null
 text = "quint"
 flat = false
+align = 1
 
-[node name="quart" type="Button" parent="trans"]
+[node name="quart" type="Button" parent="trans" index="3"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -108,8 +114,9 @@ margin_top = 90.0
 margin_right = 45.0
 margin_bottom = 110.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -118,8 +125,9 @@ shortcut = null
 group = null
 text = "quart"
 flat = false
+align = 1
 
-[node name="quad" type="Button" parent="trans"]
+[node name="quad" type="Button" parent="trans" index="4"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -129,8 +137,9 @@ margin_top = 120.0
 margin_right = 43.0
 margin_bottom = 140.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -139,8 +148,9 @@ shortcut = null
 group = null
 text = "quad"
 flat = false
+align = 1
 
-[node name="expo" type="Button" parent="trans"]
+[node name="expo" type="Button" parent="trans" index="5"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -150,8 +160,9 @@ margin_top = 150.0
 margin_right = 43.0
 margin_bottom = 170.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -160,8 +171,9 @@ shortcut = null
 group = null
 text = "expo"
 flat = false
+align = 1
 
-[node name="elastic" type="Button" parent="trans"]
+[node name="elastic" type="Button" parent="trans" index="6"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -171,8 +183,9 @@ margin_top = 180.0
 margin_right = 54.0
 margin_bottom = 200.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -181,8 +194,9 @@ shortcut = null
 group = null
 text = "elastic"
 flat = false
+align = 1
 
-[node name="cubic" type="Button" parent="trans"]
+[node name="cubic" type="Button" parent="trans" index="7"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -192,8 +206,9 @@ margin_top = 210.0
 margin_right = 46.0
 margin_bottom = 230.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -202,8 +217,9 @@ shortcut = null
 group = null
 text = "cubic"
 flat = false
+align = 1
 
-[node name="circ" type="Button" parent="trans"]
+[node name="circ" type="Button" parent="trans" index="8"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -213,8 +229,9 @@ margin_top = 240.0
 margin_right = 35.0
 margin_bottom = 260.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -223,8 +240,9 @@ shortcut = null
 group = null
 text = "circ"
 flat = false
+align = 1
 
-[node name="bounce" type="Button" parent="trans"]
+[node name="bounce" type="Button" parent="trans" index="9"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -234,8 +252,9 @@ margin_top = 270.0
 margin_right = 59.0
 margin_bottom = 290.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -244,8 +263,9 @@ shortcut = null
 group = null
 text = "bounce"
 flat = false
+align = 1
 
-[node name="back" type="Button" parent="trans"]
+[node name="back" type="Button" parent="trans" index="10"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -255,8 +275,9 @@ margin_top = 300.0
 margin_right = 41.0
 margin_bottom = 320.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -265,8 +286,9 @@ shortcut = null
 group = null
 text = "back"
 flat = false
+align = 1
 
-[node name="eases" type="VBoxContainer" parent="."]
+[node name="eases" type="VBoxContainer" parent="." index="1"]
 
 editor/display_folded = true
 anchor_left = 0.0
@@ -278,13 +300,13 @@ margin_top = 288.0
 margin_right = 215.0
 margin_bottom = 404.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
 
-[node name="in" type="Button" parent="eases"]
+[node name="in" type="Button" parent="eases" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -293,8 +315,9 @@ anchor_bottom = 0.0
 margin_right = 24.0
 margin_bottom = 20.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -303,8 +326,9 @@ shortcut = null
 group = null
 text = "in"
 flat = false
+align = 1
 
-[node name="out" type="Button" parent="eases"]
+[node name="out" type="Button" parent="eases" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -314,8 +338,9 @@ margin_top = 30.0
 margin_right = 33.0
 margin_bottom = 50.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -324,8 +349,9 @@ shortcut = null
 group = null
 text = "out"
 flat = false
+align = 1
 
-[node name="in_out" type="Button" parent="eases"]
+[node name="in_out" type="Button" parent="eases" index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -335,8 +361,9 @@ margin_top = 60.0
 margin_right = 51.0
 margin_bottom = 80.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -345,8 +372,9 @@ shortcut = null
 group = null
 text = "in_out"
 flat = false
+align = 1
 
-[node name="out_in" type="Button" parent="eases"]
+[node name="out_in" type="Button" parent="eases" index="3"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -356,8 +384,9 @@ margin_top = 90.0
 margin_right = 51.0
 margin_bottom = 110.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -366,8 +395,9 @@ shortcut = null
 group = null
 text = "out_in"
 flat = false
+align = 1
 
-[node name="modes" type="VBoxContainer" parent="."]
+[node name="modes" type="VBoxContainer" parent="." index="2"]
 
 editor/display_folded = true
 anchor_left = 0.0
@@ -379,13 +409,13 @@ margin_top = 288.0
 margin_right = 317.0
 margin_bottom = 524.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
 
-[node name="move" type="Button" parent="modes"]
+[node name="move" type="Button" parent="modes" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -394,8 +424,9 @@ anchor_bottom = 0.0
 margin_right = 48.0
 margin_bottom = 20.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -404,8 +435,9 @@ shortcut = null
 group = null
 text = "move"
 flat = false
+align = 1
 
-[node name="color" type="Button" parent="modes"]
+[node name="color" type="Button" parent="modes" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -415,8 +447,9 @@ margin_top = 30.0
 margin_right = 44.0
 margin_bottom = 50.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -425,8 +458,9 @@ shortcut = null
 group = null
 text = "color"
 flat = false
+align = 1
 
-[node name="scale" type="Button" parent="modes"]
+[node name="scale" type="Button" parent="modes" index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -436,8 +470,9 @@ margin_top = 60.0
 margin_right = 45.0
 margin_bottom = 80.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -446,8 +481,9 @@ shortcut = null
 group = null
 text = "scale"
 flat = false
+align = 1
 
-[node name="rotate" type="Button" parent="modes"]
+[node name="rotate" type="Button" parent="modes" index="3"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -457,8 +493,9 @@ margin_top = 90.0
 margin_right = 50.0
 margin_bottom = 110.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -467,8 +504,9 @@ shortcut = null
 group = null
 text = "rotate"
 flat = false
+align = 1
 
-[node name="callback" type="Button" parent="modes"]
+[node name="callback" type="Button" parent="modes" index="4"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -478,8 +516,9 @@ margin_top = 120.0
 margin_right = 63.0
 margin_bottom = 140.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -488,8 +527,9 @@ shortcut = null
 group = null
 text = "callback"
 flat = false
+align = 1
 
-[node name="follow" type="Button" parent="modes"]
+[node name="follow" type="Button" parent="modes" index="5"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -499,8 +539,9 @@ margin_top = 150.0
 margin_right = 50.0
 margin_bottom = 170.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -509,8 +550,9 @@ shortcut = null
 group = null
 text = "follow"
 flat = false
+align = 1
 
-[node name="repeat" type="Button" parent="modes"]
+[node name="repeat" type="Button" parent="modes" index="6"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -520,8 +562,9 @@ margin_top = 180.0
 margin_right = 53.0
 margin_bottom = 200.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -530,8 +573,9 @@ shortcut = null
 group = null
 text = "repeat"
 flat = false
+align = 1
 
-[node name="pause" type="Button" parent="modes"]
+[node name="pause" type="Button" parent="modes" index="7"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -541,8 +585,9 @@ margin_top = 210.0
 margin_right = 50.0
 margin_bottom = 230.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -551,8 +596,9 @@ shortcut = null
 group = null
 text = "pause"
 flat = false
+align = 1
 
-[node name="colors" type="HBoxContainer" parent="."]
+[node name="colors" type="HBoxContainer" parent="." index="3"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -563,30 +609,30 @@ margin_top = 288.0
 margin_right = 858.0
 margin_bottom = 626.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 custom_constants/separation = 40
 alignment = 0
 
-[node name="color_from" type="VBoxContainer" parent="colors"]
+[node name="color_from" type="VBoxContainer" parent="colors" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_right = 298.0
-margin_bottom = 460.0
+margin_bottom = 476.0
 rect_min_size = Vector2( 0, 320 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
 
-[node name="label" type="Label" parent="colors/color_from"]
+[node name="label" type="Label" parent="colors/color_from" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -595,8 +641,8 @@ anchor_bottom = 0.0
 margin_right = 74.0
 margin_bottom = 14.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Color From:"
@@ -604,7 +650,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="picker" type="ColorPicker" parent="colors/color_from"]
+[node name="picker" type="ColorPicker" parent="colors/color_from" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -612,16 +658,19 @@ anchor_right = 0.0
 anchor_bottom = 0.0
 margin_top = 18.0
 margin_right = 298.0
-margin_bottom = 460.0
+margin_bottom = 476.0
 rect_min_size = Vector2( 0, 320 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
+color = Color( 1, 1, 1, 1 )
+edit_alpha = true
+raw_mode = false
 
-[node name="color_to" type="VBoxContainer" parent="colors"]
+[node name="color_to" type="VBoxContainer" parent="colors" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -629,16 +678,16 @@ anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 338.0
 margin_right = 636.0
-margin_bottom = 460.0
+margin_bottom = 476.0
 rect_min_size = Vector2( 0, 320 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
 
-[node name="label" type="Label" parent="colors/color_to"]
+[node name="label" type="Label" parent="colors/color_to" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -647,8 +696,8 @@ anchor_bottom = 0.0
 margin_right = 56.0
 margin_bottom = 14.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Color To:"
@@ -656,7 +705,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="picker" type="ColorPicker" parent="colors/color_to"]
+[node name="picker" type="ColorPicker" parent="colors/color_to" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -664,23 +713,28 @@ anchor_right = 0.0
 anchor_bottom = 0.0
 margin_top = 18.0
 margin_right = 298.0
-margin_bottom = 460.0
+margin_bottom = 476.0
 rect_min_size = Vector2( 0, 320 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 alignment = 0
+color = Color( 1, 1, 1, 1 )
+edit_alpha = true
+raw_mode = false
 
-[node name="tween" type="Tween" parent="."]
+[node name="tween" type="Tween" parent="." index="4"]
 
+repeat = true
 playback_process_mode = 1
+playback_speed = 1.0
 playback/active = true
 playback/repeat = true
 playback/speed = 1.0
 
-[node name="area" type="Panel" parent="tween"]
+[node name="area" type="Panel" parent="tween" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -691,12 +745,12 @@ margin_top = 32.0
 margin_right = 896.0
 margin_bottom = 232.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 
-[node name="label" type="RichTextLabel" parent="tween/area"]
+[node name="label" type="RichTextLabel" parent="tween/area" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -707,30 +761,38 @@ margin_top = 24.0
 margin_right = 552.0
 margin_bottom = 160.0
 rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = true
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 bbcode_enabled = false
 bbcode_text = ""
 visible_characters = -1
 percent_visible = 1.0
+meta_underlined = true
+tab_size = 4
+text = ""
+scroll_active = true
+scroll_following = false
+selection_enabled = false
 override_selected_font_color = false
 
-[node name="sprite" type="Sprite" parent="tween/area"]
+[node name="sprite" type="Sprite" parent="tween/area" index="1"]
 
 texture = ExtResource( 2 )
 
-[node name="follow" type="Sprite" parent="tween/area"]
+[node name="follow" type="Sprite" parent="tween/area" index="2"]
 
 position = Vector2( 0, 184 )
 texture = ExtResource( 2 )
 
-[node name="follow_2" type="Sprite" parent="tween/area"]
+[node name="follow_2" type="Sprite" parent="tween/area" index="3"]
 
 position = Vector2( 736, 0 )
 texture = ExtResource( 2 )
 
-[node name="timeline" type="HSlider" parent="."]
+[node name="timeline" type="HSlider" parent="." index="5"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -741,8 +803,9 @@ margin_top = 240.0
 margin_right = 880.0
 margin_bottom = 256.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 min_value = 0.0

+ 35 - 29
viewport/2d_in_3d/2D_in_3D.tscn

@@ -31,6 +31,7 @@ flags_no_depth_test = false
 flags_use_point_size = false
 flags_world_triplanar = false
 flags_fixed_size = false
+flags_albedo_tex_force_srgb = false
 vertex_color_use_as_albedo = false
 vertex_color_is_srgb = false
 params_diffuse_mode = 0
@@ -199,6 +200,7 @@ flags_no_depth_test = false
 flags_use_point_size = false
 flags_world_triplanar = false
 flags_fixed_size = false
+flags_albedo_tex_force_srgb = false
 vertex_color_use_as_albedo = false
 vertex_color_is_srgb = false
 params_diffuse_mode = 0
@@ -282,6 +284,7 @@ flags_no_depth_test = false
 flags_use_point_size = false
 flags_world_triplanar = false
 flags_fixed_size = false
+flags_albedo_tex_force_srgb = false
 vertex_color_use_as_albedo = false
 vertex_color_is_srgb = false
 params_diffuse_mode = 0
@@ -322,26 +325,27 @@ uv2_triplanar_sharpness = 1.0
 proximity_fade_enable = false
 distance_fade_enable = false
 
-[node name="2D_in_3D" type="Spatial"]
+[node name="2D_in_3D" type="Spatial" index="0"]
 
 script = ExtResource( 1 )
 
-[node name="Camera" type="Camera" parent="."]
+[node name="Camera" type="Camera" parent="." index="0"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26906, -1.2526 )
-projection = 0
-fov = 65.0
-near = 0.1
-far = 100.0
 keep_aspect = 1
-current = false
 cull_mask = 1048575
 environment = null
 h_offset = 0.0
 v_offset = 0.0
-doppler/tracking = 0
+doppler_tracking = 0
+projection = 0
+current = false
+fov = 65.0
+size = 1.0
+near = 0.1
+far = 100.0
 
-[node name="Floor" type="MeshInstance" parent="."]
+[node name="Floor" type="MeshInstance" parent="." index="1"]
 
 transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, -1, -4 )
 layers = 1
@@ -358,17 +362,17 @@ skeleton = NodePath("..")
 material/0 = SubResource( 3 )
 _sections_unfolded = [ "Geometry", "Transform", "material" ]
 
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+[node name="WorldEnvironment" type="WorldEnvironment" parent="." index="2"]
 
 environment = SubResource( 6 )
 
-[node name="Pillar" type="Spatial" parent="."]
+[node name="Pillar" type="Spatial" parent="." index="3"]
 
 editor/display_folded = true
 transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, -3, -0.255171, -5 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Pillar_bottom" type="MeshInstance" parent="Pillar"]
+[node name="Pillar_bottom" type="MeshInstance" parent="Pillar" index="0"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.242229, 0 )
 layers = 1
@@ -386,7 +390,7 @@ material/0 = SubResource( 8 )
 script = SubResource( 9 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Pillar_top" type="MeshInstance" parent="Pillar"]
+[node name="Pillar_top" type="MeshInstance" parent="Pillar" index="1"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.48747, 0 )
 layers = 1
@@ -404,7 +408,7 @@ material/0 = SubResource( 8 )
 script = SubResource( 9 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Pillar_middle" type="MeshInstance" parent="Pillar"]
+[node name="Pillar_middle" type="MeshInstance" parent="Pillar" index="2"]
 
 transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.65279, 0 )
 layers = 1
@@ -422,13 +426,13 @@ material/0 = SubResource( 8 )
 script = SubResource( 10 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Pillar2" type="Spatial" parent="."]
+[node name="Pillar2" type="Spatial" parent="." index="4"]
 
 editor/display_folded = true
 transform = Transform( 0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 3, -0.255171, -5 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Pillar_bottom" type="MeshInstance" parent="Pillar2"]
+[node name="Pillar_bottom" type="MeshInstance" parent="Pillar2" index="0"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.242229, 0 )
 layers = 1
@@ -446,7 +450,7 @@ material/0 = SubResource( 8 )
 script = SubResource( 9 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Pillar_top" type="MeshInstance" parent="Pillar2"]
+[node name="Pillar_top" type="MeshInstance" parent="Pillar2" index="1"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.48747, 0 )
 layers = 1
@@ -464,7 +468,7 @@ material/0 = SubResource( 8 )
 script = SubResource( 9 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Pillar_middle" type="MeshInstance" parent="Pillar2"]
+[node name="Pillar_middle" type="MeshInstance" parent="Pillar2" index="2"]
 
 transform = Transform( 0.7, 0, 0, 0, 2, 0, 0, 0, 0.7, 0, 2.65279, 0 )
 layers = 1
@@ -482,7 +486,7 @@ material/0 = SubResource( 8 )
 script = SubResource( 10 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="Pillar_back" type="MeshInstance" parent="."]
+[node name="Pillar_back" type="MeshInstance" parent="." index="5"]
 
 transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 1.22418, -5.48399 )
 layers = 1
@@ -499,14 +503,16 @@ skeleton = NodePath("..")
 material/0 = SubResource( 8 )
 _sections_unfolded = [ "Transform", "material" ]
 
-[node name="DirectionalLight" type="DirectionalLight" parent="."]
+[node name="DirectionalLight" type="DirectionalLight" parent="." index="6"]
 
 transform = Transform( 0.623013, -0.733525, 0.271654, 0.321394, 0.55667, 0.766044, -0.713134, -0.389948, 0.582563, 9.02684, 0, 1.28613 )
 layers = 1
 light_color = Color( 1, 1, 1, 1 )
 light_energy = 1.0
+light_indirect_energy = 1.0
 light_negative = false
 light_specular = 0.5
+light_bake_mode = 1
 light_cull_mask = -1
 shadow_enabled = true
 shadow_color = Color( 0, 0, 0, 1 )
@@ -525,7 +531,7 @@ directional_shadow_depth_range = 0
 directional_shadow_max_distance = 200.0
 _sections_unfolded = [ "Directional Shadow" ]
 
-[node name="Viewport_quad" type="MeshInstance" parent="."]
+[node name="Viewport_quad" type="MeshInstance" parent="." index="7"]
 
 transform = Transform( -2, 8.74228e-08, 0, 7.64274e-15, 4.37114e-08, 1.333, 1.74846e-07, 1, -5.82673e-08, 0, 1.20996, -5.25875 )
 layers = 1
@@ -542,7 +548,7 @@ skeleton = NodePath("..")
 material/0 = null
 _sections_unfolded = [ "Geometry", "Transform", "material" ]
 
-[node name="Viewport" type="Viewport" parent="."]
+[node name="Viewport" type="Viewport" parent="." index="8"]
 
 arvr = false
 size = Vector2( 600, 400 )
@@ -569,12 +575,12 @@ shadow_atlas_quad_2 = 3
 shadow_atlas_quad_3 = 4
 _sections_unfolded = [ "Render Target" ]
 
-[node name="2D_World" type="Node2D" parent="Viewport"]
+[node name="2D_World" type="Node2D" parent="Viewport" index="0"]
 
 editor/display_folded = true
 script = ExtResource( 2 )
 
-[node name="BG" type="Panel" parent="Viewport/2D_World"]
+[node name="BG" type="Panel" parent="Viewport/2D_World" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -583,30 +589,30 @@ anchor_bottom = 0.0
 margin_right = 600.0
 margin_bottom = 400.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 
-[node name="ball" type="Sprite" parent="Viewport/2D_World"]
+[node name="ball" type="Sprite" parent="Viewport/2D_World" index="1"]
 
 position = Vector2( 300, 200 )
 texture = ExtResource( 3 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="left" type="Sprite" parent="Viewport/2D_World"]
+[node name="left" type="Sprite" parent="Viewport/2D_World" index="2"]
 
 position = Vector2( 20, 200 )
 texture = ExtResource( 4 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="right" type="Sprite" parent="Viewport/2D_World"]
+[node name="right" type="Sprite" parent="Viewport/2D_World" index="3"]
 
 position = Vector2( 580, 200 )
 texture = ExtResource( 5 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="separator" type="Sprite" parent="Viewport/2D_World"]
+[node name="separator" type="Sprite" parent="Viewport/2D_World" index="4"]
 
 position = Vector2( 298, 200 )
 texture = ExtResource( 6 )

+ 29 - 5
viewport/3d_in_2d/3D_in_2D.tscn

@@ -4,11 +4,11 @@
 [ext_resource path="res://robot_demo.png" type="Texture" id=2]
 [ext_resource path="res://player.scn" type="PackedScene" id=3]
 
-[node name="3D_in_2D" type="Node2D"]
+[node name="3D_in_2D" type="Node2D" index="0"]
 
 script = ExtResource( 1 )
 
-[node name="Sprite" type="Sprite" parent="."]
+[node name="Sprite" type="Sprite" parent="." index="0"]
 
 position = Vector2( 339.942, 311.204 )
 scale = Vector2( 3, 3 )
@@ -18,13 +18,13 @@ hframes = 16
 frame = 4
 _sections_unfolded = [ "Animation", "Transform" ]
 
-[node name="Viewport_Sprite" type="Sprite" parent="."]
+[node name="Viewport_Sprite" type="Sprite" parent="." index="1"]
 
 position = Vector2( 600, 320 )
 rotation = 3.14159
 _sections_unfolded = [ "Transform" ]
 
-[node name="Viewport" type="Viewport" parent="."]
+[node name="Viewport" type="Viewport" parent="." index="2"]
 
 arvr = false
 size = Vector2( 300, 300 )
@@ -51,6 +51,30 @@ shadow_atlas_quad_2 = 3
 shadow_atlas_quad_3 = 4
 _sections_unfolded = [ "Rendering" ]
 
-[node name="player" parent="Viewport" instance=ExtResource( 3 )]
+[node name="player" parent="Viewport" index="0" instance=ExtResource( 3 )]
 
+axis_lock_linear_x = false
+axis_lock_linear_y = false
+axis_lock_linear_z = false
+axis_lock_angular_x = false
+axis_lock_angular_y = false
+axis_lock_angular_z = false
 
+[node name="Camera" parent="Viewport/player" index="1"]
+
+doppler_tracking = 0
+current = true
+size = 1.0
+
+[node name="OmniLight" parent="Viewport/player" index="2"]
+
+light_indirect_energy = 1.0
+light_bake_mode = 1
+
+[node name="OmniLight2" parent="Viewport/player" index="3"]
+
+light_indirect_energy = 1.0
+light_bake_mode = 1
+
+
+[editable path="Viewport/player"]

二進制
viewport/3d_in_2d/player.scn


+ 46 - 36
viewport/gui_in_3d/Gui_in_3D.tscn

@@ -11,6 +11,7 @@ subdivide_depth = 0
 [sub_resource type="ViewportTexture" id=2]
 
 resource_local_to_scene = true
+flags = 5
 viewport_path = NodePath("Viewport")
 
 [sub_resource type="SpatialMaterial" id=3]
@@ -48,6 +49,7 @@ emission_enabled = true
 emission = Color( 0, 0, 0, 1 )
 emission_energy = 1.0
 emission_operator = 0
+emission_on_uv2 = false
 normal_enabled = false
 rim_enabled = false
 clearcoat_enabled = false
@@ -92,6 +94,7 @@ tracks/0/path = NodePath("Camera:transform")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
+tracks/0/enabled = true
 tracks/0/keys = {
 "times": PoolRealArray( 0, 2, 4, 6 ),
 "transitions": PoolRealArray( 1, 1, 1, 1 ),
@@ -196,11 +199,11 @@ func e():
 	return 0
 "
 
-[node name="Gui_in_3D" type="Spatial"]
+[node name="Gui_in_3D" type="Spatial" index="0"]
 
 script = ExtResource( 1 )
 
-[node name="Viewport" type="Viewport" parent="."]
+[node name="Viewport" type="Viewport" parent="." index="0"]
 
 editor/display_folded = true
 arvr = false
@@ -228,7 +231,7 @@ shadow_atlas_quad_2 = 3
 shadow_atlas_quad_3 = 4
 _sections_unfolded = [ "Render Target", "Rendering" ]
 
-[node name="GUI" type="Control" parent="Viewport"]
+[node name="GUI" type="Control" parent="Viewport" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -237,13 +240,13 @@ anchor_bottom = 0.0
 margin_right = 40.0
 margin_bottom = 40.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 _sections_unfolded = [ "Mouse" ]
 
-[node name="Label" type="Label" parent="Viewport/GUI"]
+[node name="Label" type="Label" parent="Viewport/GUI" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -254,8 +257,8 @@ margin_top = 27.0
 margin_right = 121.0
 margin_bottom = 41.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 2
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
 text = "Hello world!"
@@ -263,7 +266,7 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="Button" type="Button" parent="Viewport/GUI"]
+[node name="Button" type="Button" parent="Viewport/GUI" index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -274,8 +277,9 @@ margin_top = 46.0
 margin_right = 155.0
 margin_bottom = 73.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 toggle_mode = false
@@ -284,8 +288,9 @@ shortcut = null
 group = null
 text = "A button!"
 flat = false
+align = 1
 
-[node name="HSlider" type="HSlider" parent="Viewport/GUI"]
+[node name="HSlider" type="HSlider" parent="Viewport/GUI" index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -296,8 +301,9 @@ margin_top = 118.0
 margin_right = 157.0
 margin_bottom = 134.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 0
 min_value = 0.0
@@ -312,7 +318,7 @@ tick_count = 0
 ticks_on_borders = false
 focus_mode = 2
 
-[node name="TextEdit" type="LineEdit" parent="Viewport/GUI"]
+[node name="TextEdit" type="LineEdit" parent="Viewport/GUI" index="3"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -323,17 +329,19 @@ margin_top = 87.0
 margin_right = 156.0
 margin_bottom = 111.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 1
 size_flags_horizontal = 1
 size_flags_vertical = 1
 focus_mode = 2
+context_menu_enabled = true
 placeholder_alpha = 0.6
 caret_blink = false
 caret_blink_speed = 0.65
-context_menu_enabled = true
+caret_position = 0
 
-[node name="Area" type="Area" parent="."]
+[node name="Area" type="Area" parent="." index="1"]
 
 input_ray_pickable = true
 input_capture_on_drag = true
@@ -357,7 +365,7 @@ reverb_bus_amount = 0.0
 reverb_bus_uniformity = 0.0
 _sections_unfolded = [ "Transform" ]
 
-[node name="Quad" type="MeshInstance" parent="Area"]
+[node name="Quad" type="MeshInstance" parent="Area" index="0"]
 
 transform = Transform( -1, 8.74228e-08, -4.37114e-08, -4.37114e-08, 1.91069e-15, 1, 8.74228e-08, 1, 1.91069e-15, 0, 0, 0 )
 layers = 1
@@ -374,28 +382,29 @@ skeleton = NodePath("..")
 material/0 = SubResource( 3 )
 _sections_unfolded = [ "Geometry", "Transform", "material" ]
 
-[node name="CollisionShape" type="CollisionShape" parent="Area"]
+[node name="CollisionShape" type="CollisionShape" parent="Area" index="1"]
 
 shape = SubResource( 5 )
 disabled = false
 
-[node name="Camera" type="Camera" parent="."]
+[node name="Camera" type="Camera" parent="." index="2"]
 
 transform = Transform( 0.994592, 0, 0.103856, 0, 1, 0, -0.103856, 0, 0.994592, 0.465682, 0, 1.78523 )
-projection = 0
-fov = 65.0
-near = 0.1
-far = 100.0
 keep_aspect = 1
-current = false
 cull_mask = 1048575
 environment = null
 h_offset = 0.0
 v_offset = 0.0
-doppler/tracking = 0
+doppler_tracking = 0
+projection = 0
+current = false
+fov = 65.0
+size = 1.0
+near = 0.1
+far = 100.0
 _sections_unfolded = [ "Transform" ]
 
-[node name="OmniLight" type="OmniLight" parent="."]
+[node name="OmniLight" type="OmniLight" parent="." index="3"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.38866, 1.2413, 2.72141 )
 layers = 1
@@ -404,6 +413,7 @@ light_energy = 1.0
 light_indirect_energy = 1.0
 light_negative = false
 light_specular = 0.5
+light_bake_mode = 1
 light_cull_mask = -1
 shadow_enabled = true
 shadow_color = Color( 0, 0, 0, 1 )
@@ -417,22 +427,22 @@ omni_shadow_mode = 1
 omni_shadow_detail = 1
 _sections_unfolded = [ "Light", "Omni", "Shadow" ]
 
-[node name="Camera_Move" type="AnimationPlayer" parent="."]
+[node name="Camera_Move" type="AnimationPlayer" parent="." index="4"]
 
+root_node = NodePath("..")
+autoplay = "Move_camera"
 playback_process_mode = 1
 playback_default_blend_time = 0.0
-root_node = NodePath("..")
+playback_speed = 1.0
 anims/Move_camera = SubResource( 6 )
-playback/active = true
-playback/speed = 1.0
 blend_times = [  ]
 autoplay = "Move_camera"
 
-[node name="3D_background" type="Spatial" parent="."]
+[node name="3D_background" type="Spatial" parent="." index="5"]
 
 editor/display_folded = true
 
-[node name="Wall" type="MeshInstance" parent="3D_background"]
+[node name="Wall" type="MeshInstance" parent="3D_background" index="0"]
 
 transform = Transform( 4, 0, 0, 0, -1.74846e-07, -4, 0, 4, -1.74846e-07, -2.60819, 0.589247, -2.08943 )
 layers = 1
@@ -450,7 +460,7 @@ material/0 = null
 script = SubResource( 8 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Wall2" type="MeshInstance" parent="3D_background"]
+[node name="Wall2" type="MeshInstance" parent="3D_background" index="1"]
 
 transform = Transform( 4, 0, 0, 0, -1.74846e-07, -4, 0, 4, -1.74846e-07, 5.08055, 0.589247, -2.08943 )
 layers = 1
@@ -468,7 +478,7 @@ material/0 = null
 script = SubResource( 8 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Wall3" type="MeshInstance" parent="3D_background"]
+[node name="Wall3" type="MeshInstance" parent="3D_background" index="2"]
 
 transform = Transform( -1.74846e-07, -4, 0, -1.74846e-07, 7.64274e-15, -4, 4, -1.74846e-07, -1.74846e-07, 9.04446, 0.589247, 1.62058 )
 layers = 1
@@ -486,7 +496,7 @@ material/0 = null
 script = SubResource( 9 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Floor" type="MeshInstance" parent="3D_background"]
+[node name="Floor" type="MeshInstance" parent="3D_background" index="3"]
 
 transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, -2.60819, -2.68765, 1.46502 )
 layers = 1
@@ -504,7 +514,7 @@ material/0 = null
 script = SubResource( 10 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Floor2" type="MeshInstance" parent="3D_background"]
+[node name="Floor2" type="MeshInstance" parent="3D_background" index="4"]
 
 transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 5.08055, -2.68765, 1.46502 )
 layers = 1
@@ -522,7 +532,7 @@ material/0 = null
 script = SubResource( 10 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Cube" type="MeshInstance" parent="3D_background"]
+[node name="Cube" type="MeshInstance" parent="3D_background" index="5"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.25901, -0.598608, 0.374871 )
 layers = 1
@@ -540,7 +550,7 @@ material/0 = SubResource( 12 )
 script = SubResource( 13 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Cube2" type="MeshInstance" parent="3D_background"]
+[node name="Cube2" type="MeshInstance" parent="3D_background" index="6"]
 
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.88761, 2.01326, 0.374871 )
 layers = 1

+ 10 - 8
viewport/screen_capture/capture_screen.tscn

@@ -3,7 +3,7 @@
 [ext_resource path="res://screen_capture.gd" type="Script" id=1]
 [ext_resource path="res://mountains.png" type="Texture" id=2]
 
-[node name="Control" type="Control"]
+[node name="Control" type="Control" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -12,13 +12,13 @@ anchor_bottom = 0.0
 margin_right = 40.0
 margin_bottom = 40.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 script = ExtResource( 1 )
 
-[node name="BG" type="TextureRect" parent="."]
+[node name="BG" type="TextureRect" parent="." index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -29,8 +29,8 @@ margin_bottom = 560.0
 grow_horizontal = 0
 grow_vertical = 0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 texture = ExtResource( 2 )
@@ -38,7 +38,7 @@ expand = true
 stretch_mode = 0
 _sections_unfolded = [ "Anchor" ]
 
-[node name="capture" type="TextureRect" parent="."]
+[node name="capture" type="TextureRect" parent="." index="1"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -50,14 +50,14 @@ grow_horizontal = 0
 grow_vertical = 0
 rect_scale = Vector2( 0.5, 0.5 )
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 expand = true
 stretch_mode = 4
 
-[node name="Button" type="Button" parent="."]
+[node name="Button" type="Button" parent="." index="2"]
 
 anchor_left = 0.0
 anchor_top = 0.0
@@ -68,8 +68,9 @@ margin_top = 53.0
 margin_right = 188.0
 margin_bottom = 113.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
+focus_mode = 2
 mouse_filter = 0
+mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 toggle_mode = false
@@ -78,6 +79,7 @@ shortcut = null
 group = null
 text = "Capture screen"
 flat = false
+align = 1
 _sections_unfolded = [ "Rect" ]
 
 

+ 3 - 3
visual_script/circle_pop/Circle.tscn

@@ -14,12 +14,12 @@ light_mode = 0
 custom_solver_bias = 0.0
 radius = 128.0
 
-[node name="Sprite" type="Sprite"]
+[node name="Sprite" type="Sprite" index="0"]
 
 material = SubResource( 1 )
 texture = ExtResource( 1 )
 
-[node name="Area2D" type="Area2D" parent="."]
+[node name="Area2D" type="Area2D" parent="." index="0"]
 
 input_pickable = true
 gravity_vec = Vector2( 0, 1 )
@@ -30,7 +30,7 @@ audio_bus_override = false
 audio_bus_name = "Master"
 script = ExtResource( 2 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" index="0"]
 
 shape = SubResource( 2 )
 

+ 1 - 1
visual_script/circle_pop/Main.tscn

@@ -6,7 +6,7 @@
 
 script = ExtResource( 1 )
 
-[node name="Timer" type="Timer" parent="."]
+[node name="Timer" type="Timer" parent="." index="0"]
 
 process_mode = 1
 wait_time = 1.0

+ 32 - 0
visual_script/circle_pop/icon.png.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+
+[deps]
+
+source_file="res://icon.png"
+source_md5="4f69473a554caeabeda4827caba7e43c"
+
+dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+dest_md5="bd63fab8564802fca5c52c1931c44459"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

+ 32 - 0
visual_script/circle_pop/white-circle.png.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/white-circle.png-fd9ec96f5f813bd0d459d50130c980de.stex"
+
+[deps]
+
+source_file="res://white-circle.png"
+source_md5="ef183336a5583f6c28c1b82e2321b5b0"
+
+dest_files=[ "res://.import/white-circle.png-fd9ec96f5f813bd0d459d50130c980de.stex" ]
+dest_md5="66fdf50754a6d3e964afe97f9ba8934c"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

+ 1 - 1
visual_script/multitouch_view/Main.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://Main.vs" type="Script" id=1]
 
-[node name="Main" type="Node2D"]
+[node name="Main" type="Node2D" index="0"]
 
 script = ExtResource( 1 )
 

+ 32 - 0
visual_script/multitouch_view/icon.png.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+
+[deps]
+
+source_file="res://icon.png"
+source_md5="32c80f6cc647438a45ed6cc479584894"
+
+dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+dest_md5="8c14780b1c0b5a8780dc1b2643f5bbc2"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Some files were not shown because too many files changed in this diff