diff --git a/2d/hdr/beach_cave.tscn b/2d/hdr/beach_cave.tscn index 58d34a73..997483c8 100644 --- a/2d/hdr/beach_cave.tscn +++ b/2d/hdr/beach_cave.tscn @@ -7,7 +7,7 @@ [sub_resource type="Environment" id=1] background_mode = 3 -background_sky_scale = 1.0 +background_sky_custom_fov = 0.0 background_color = Color( 0, 0, 0, 1 ) background_energy = 1.0 background_canvas_max_layer = 0 @@ -49,7 +49,9 @@ ssao_intensity2 = 1.0 ssao_bias = 0.01 ssao_light_affect = 0.0 ssao_color = Color( 0, 0, 0, 1 ) -ssao_blur = true +ssao_quality = 0 +ssao_blur = 1 +ssao_edge_sharpness = 4.0 dof_blur_far_enabled = false dof_blur_far_distance = 10.0 dof_blur_far_transition = 5.0 @@ -72,7 +74,7 @@ glow_intensity = 0.8 glow_strength = 0.88 glow_bloom = 0.0 glow_blend_mode = 0 -glow_hdr_treshold = 1.0 +glow_hdr_threshold = 1.0 glow_hdr_scale = 2.0 glow_bicubic_upscale = true adjustment_enabled = false @@ -104,8 +106,13 @@ environment = SubResource( 1 ) [node name="Label" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 40.0 margin_bottom = 13.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 diff --git a/2d/hdr/icon.png.import b/2d/hdr/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/hdr/icon.png.import +++ b/2d/hdr/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hdr/ocean_beach.png.import b/2d/hdr/ocean_beach.png.import index 7a58b12f..ccf06184 100644 --- a/2d/hdr/ocean_beach.png.import +++ b/2d/hdr/ocean_beach.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hdr/ocean_cave.png.import b/2d/hdr/ocean_cave.png.import index 2a41b197..7b40c317 100644 --- a/2d/hdr/ocean_cave.png.import +++ b/2d/hdr/ocean_cave.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hdr/project.godot b/2d/hdr/project.godot index dada55af..0c76e2fc 100644 --- a/2d/hdr/project.godot +++ b/2d/hdr/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/hexagonal_map/WWT-01.png.import b/2d/hexagonal_map/WWT-01.png.import index 7b78b38f..aaf4b189 100644 --- a/2d/hexagonal_map/WWT-01.png.import +++ b/2d/hexagonal_map/WWT-01.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-02.png.import b/2d/hexagonal_map/WWT-02.png.import index f9c94d9c..d5d0a615 100644 --- a/2d/hexagonal_map/WWT-02.png.import +++ b/2d/hexagonal_map/WWT-02.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-03.png.import b/2d/hexagonal_map/WWT-03.png.import index e9a88a24..d5c4cbac 100644 --- a/2d/hexagonal_map/WWT-03.png.import +++ b/2d/hexagonal_map/WWT-03.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-04.png.import b/2d/hexagonal_map/WWT-04.png.import index 54ca92db..9158bdbe 100644 --- a/2d/hexagonal_map/WWT-04.png.import +++ b/2d/hexagonal_map/WWT-04.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-05.png.import b/2d/hexagonal_map/WWT-05.png.import index b1aa86cc..b148f8aa 100644 --- a/2d/hexagonal_map/WWT-05.png.import +++ b/2d/hexagonal_map/WWT-05.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-06.png.import b/2d/hexagonal_map/WWT-06.png.import index f94c42a7..66de1143 100644 --- a/2d/hexagonal_map/WWT-06.png.import +++ b/2d/hexagonal_map/WWT-06.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-07.png.import b/2d/hexagonal_map/WWT-07.png.import index 7a80d0b4..997f8da0 100644 --- a/2d/hexagonal_map/WWT-07.png.import +++ b/2d/hexagonal_map/WWT-07.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-08.png.import b/2d/hexagonal_map/WWT-08.png.import index faa908ec..3a2605cf 100644 --- a/2d/hexagonal_map/WWT-08.png.import +++ b/2d/hexagonal_map/WWT-08.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-09.png.import b/2d/hexagonal_map/WWT-09.png.import index d48c8162..b08621ab 100644 --- a/2d/hexagonal_map/WWT-09.png.import +++ b/2d/hexagonal_map/WWT-09.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-10.png.import b/2d/hexagonal_map/WWT-10.png.import index 75944914..0d2d318a 100644 --- a/2d/hexagonal_map/WWT-10.png.import +++ b/2d/hexagonal_map/WWT-10.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-11.png.import b/2d/hexagonal_map/WWT-11.png.import index 8e38347c..1b55f389 100644 --- a/2d/hexagonal_map/WWT-11.png.import +++ b/2d/hexagonal_map/WWT-11.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-12.png.import b/2d/hexagonal_map/WWT-12.png.import index 62142595..ebc2c9d5 100644 --- a/2d/hexagonal_map/WWT-12.png.import +++ b/2d/hexagonal_map/WWT-12.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-13.png.import b/2d/hexagonal_map/WWT-13.png.import index 0c21171e..981f79c6 100644 --- a/2d/hexagonal_map/WWT-13.png.import +++ b/2d/hexagonal_map/WWT-13.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-14.png.import b/2d/hexagonal_map/WWT-14.png.import index 6a1da9b1..d9b0b8eb 100644 --- a/2d/hexagonal_map/WWT-14.png.import +++ b/2d/hexagonal_map/WWT-14.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-15.png.import b/2d/hexagonal_map/WWT-15.png.import index 47570427..a416bd1e 100644 --- a/2d/hexagonal_map/WWT-15.png.import +++ b/2d/hexagonal_map/WWT-15.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-16.png.import b/2d/hexagonal_map/WWT-16.png.import index e1354b7e..2b13f2ed 100644 --- a/2d/hexagonal_map/WWT-16.png.import +++ b/2d/hexagonal_map/WWT-16.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-17.png.import b/2d/hexagonal_map/WWT-17.png.import index e2f45036..211bafd1 100644 --- a/2d/hexagonal_map/WWT-17.png.import +++ b/2d/hexagonal_map/WWT-17.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-18.png.import b/2d/hexagonal_map/WWT-18.png.import index c793d5ff..fa8f3320 100644 --- a/2d/hexagonal_map/WWT-18.png.import +++ b/2d/hexagonal_map/WWT-18.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-19.png.import b/2d/hexagonal_map/WWT-19.png.import index b11ba1a2..06b7c5bb 100644 --- a/2d/hexagonal_map/WWT-19.png.import +++ b/2d/hexagonal_map/WWT-19.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-20.png.import b/2d/hexagonal_map/WWT-20.png.import index 2c46c23b..e5fda7ae 100644 --- a/2d/hexagonal_map/WWT-20.png.import +++ b/2d/hexagonal_map/WWT-20.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-21.png.import b/2d/hexagonal_map/WWT-21.png.import index d75cf2d7..4e1f7b31 100644 --- a/2d/hexagonal_map/WWT-21.png.import +++ b/2d/hexagonal_map/WWT-21.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-22.png.import b/2d/hexagonal_map/WWT-22.png.import index 2b12eba8..48aef566 100644 --- a/2d/hexagonal_map/WWT-22.png.import +++ b/2d/hexagonal_map/WWT-22.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-23.png.import b/2d/hexagonal_map/WWT-23.png.import index 3b39ea20..22ba38aa 100644 --- a/2d/hexagonal_map/WWT-23.png.import +++ b/2d/hexagonal_map/WWT-23.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-24.png.import b/2d/hexagonal_map/WWT-24.png.import index 4f6d4f7f..207654ef 100644 --- a/2d/hexagonal_map/WWT-24.png.import +++ b/2d/hexagonal_map/WWT-24.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-25.png.import b/2d/hexagonal_map/WWT-25.png.import index 2c895e00..d8f89e96 100644 --- a/2d/hexagonal_map/WWT-25.png.import +++ b/2d/hexagonal_map/WWT-25.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/WWT-26.png.import b/2d/hexagonal_map/WWT-26.png.import index 39d89fa9..947d0723 100644 --- a/2d/hexagonal_map/WWT-26.png.import +++ b/2d/hexagonal_map/WWT-26.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/icon.png.import b/2d/hexagonal_map/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/hexagonal_map/icon.png.import +++ b/2d/hexagonal_map/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/map.tscn b/2d/hexagonal_map/map.tscn index d56ed48c..996331bc 100644 --- a/2d/hexagonal_map/map.tscn +++ b/2d/hexagonal_map/map.tscn @@ -26,6 +26,5 @@ tile_data = PoolIntArray( -393210, 1073741831, -327676, 1073741831, -327675, 107 [node name="troll" parent="." instance=ExtResource( 2 )] position = Vector2( 602.819, -39.2876 ) -collision/safe_margin = 0.08 diff --git a/2d/hexagonal_map/project.godot b/2d/hexagonal_map/project.godot index 32460851..81ce9854 100644 --- a/2d/hexagonal_map/project.godot +++ b/2d/hexagonal_map/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/hexagonal_map/tileset_edit.tscn b/2d/hexagonal_map/tileset_edit.tscn index 052cf0c2..92d24281 100644 --- a/2d/hexagonal_map/tileset_edit.tscn +++ b/2d/hexagonal_map/tileset_edit.tscn @@ -31,7 +31,6 @@ [node name="Tile 1" type="Sprite" parent="."] -position = Vector2( 0, 0 ) texture = ExtResource( 1 ) centered = false diff --git a/2d/hexagonal_map/troll.png.import b/2d/hexagonal_map/troll.png.import index 7a9062ae..366c2d02 100644 --- a/2d/hexagonal_map/troll.png.import +++ b/2d/hexagonal_map/troll.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/hexagonal_map/troll.tscn b/2d/hexagonal_map/troll.tscn index c5d440d1..bcc8326e 100644 --- a/2d/hexagonal_map/troll.tscn +++ b/2d/hexagonal_map/troll.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://troll.gd" type="Script" id=1] [ext_resource path="res://troll.png" type="Texture" id=2] @@ -11,12 +11,9 @@ radius = 16.0 [node name="troll" type="KinematicBody2D"] input_pickable = false -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 3.24216, 19.453 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 -collision/margin = 0.001 +collision/safe_margin = 0.08 script = ExtResource( 1 ) [node name="Sprite" type="Sprite" parent="."] @@ -27,8 +24,6 @@ texture = ExtResource( 2 ) position = Vector2( 3.24216, 19.453 ) shape = SubResource( 1 ) -trigger = false -_update_shape_index = -1 [node name="Camera2D" type="Camera2D" parent="."] @@ -40,11 +35,17 @@ limit_left = -10000000 limit_top = -10000000 limit_right = 10000000 limit_bottom = 10000000 -drag_margin/h_enabled = true -drag_margin/v_enabled = true +limit_smoothed = false +drag_margin_h_enabled = true +drag_margin_v_enabled = true smoothing_enabled = false smoothing_speed = 5.0 drag_margin_left = 0.2 drag_margin_top = 0.2 drag_margin_right = 0.2 drag_margin_bottom = 0.2 +editor_draw_screen = true +editor_draw_limits = false +editor_draw_drag_margin = false + + diff --git a/2d/isometric/dungeon.tscn b/2d/isometric/dungeon.tscn index d2fef9f5..afbcc16f 100644 --- a/2d/isometric/dungeon.tscn +++ b/2d/isometric/dungeon.tscn @@ -44,5 +44,6 @@ tile_data = PoolIntArray( -917493, 2, -917492, 2, -917491, 2, -917490, 2, -91748 [node name="troll" parent="walls" instance=ExtResource( 2 )] position = Vector2( 299.38, 326.037 ) +collision/safe_margin = 0.08 diff --git a/2d/isometric/icon.png.import b/2d/isometric/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/isometric/icon.png.import +++ b/2d/isometric/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/isometric/isotiles.png.import b/2d/isometric/isotiles.png.import index 15fc99a3..56db009e 100644 --- a/2d/isometric/isotiles.png.import +++ b/2d/isometric/isotiles.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/isometric/project.godot b/2d/isometric/project.godot index fdf7d20e..a491254b 100644 --- a/2d/isometric/project.godot +++ b/2d/isometric/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -10,9 +10,9 @@ config_version=3 [application] -icon="res://icon.png" -main_scene="res://dungeon.tscn" -name="Isometric Game" +config/name="Isometric Game" +run/main_scene="res://dungeon.tscn" +config/icon="res://icon.png" [gdnative] diff --git a/2d/isometric/tileset_edit.tscn b/2d/isometric/tileset_edit.tscn index 17b914c9..9a405581 100644 --- a/2d/isometric/tileset_edit.tscn +++ b/2d/isometric/tileset_edit.tscn @@ -1,36 +1,14 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=2 format=2] [ext_resource path="res://isotiles.png" type="Texture" id=1] -[sub_resource type="ConvexPolygonShape2D" id=1] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -68, 2, -4, -30, 60, 2, -4, 34 ) - -[sub_resource type="ConvexPolygonShape2D" id=2] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -20, -6, -4, -22, 12, -22, 4, 10, -4, 10 ) - -[sub_resource type="ConvexPolygonShape2D" id=3] - -custom_solver_bias = 0.0 -points = PoolVector2Array( 28, -6, 4, 10, 12, -22 ) - -[sub_resource type="ConvexPolygonShape2D" id=4] - -custom_solver_bias = 0.0 -points = PoolVector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50.095, -8.62516 ) - [node name="Node2D" type="Node2D"] - [node name="base" type="Sprite" parent="."] position = Vector2( 87.5658, 0.113792 ) texture = ExtResource( 1 ) offset = Vector2( -4, 6 ) -region = true region_rect = Rect2( 28, 92, 132, 84 ) [node name="base2" type="Sprite" parent="."] @@ -38,7 +16,6 @@ region_rect = Rect2( 28, 92, 132, 84 ) position = Vector2( 196, 44 ) texture = ExtResource( 1 ) offset = Vector2( -4, 6 ) -region = true region_rect = Rect2( 220, 92, 132, 84 ) [node name="wall" type="Sprite" parent="."] @@ -46,15 +23,11 @@ region_rect = Rect2( 220, 92, 132, 84 ) position = Vector2( 356, 70 ) texture = ExtResource( 1 ) offset = Vector2( -4, -32 ) -region = true region_rect = Rect2( 28, 220, 132, 136 ) [node name="StaticBody2D" type="StaticBody2D" parent="wall"] input_pickable = false -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -66,26 +39,17 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -68, 2, -4, 34, 60, 2, -4, -30 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="column" type="Sprite" parent="."] position = Vector2( 292, 198 ) texture = ExtResource( 1 ) offset = Vector2( -2, -32 ) -region = true region_rect = Rect2( 220, 220, 132, 136 ) [node name="StaticBody" type="StaticBody2D" parent="column"] input_pickable = false -shapes/0/shape = SubResource( 2 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false -shapes/1/shape = SubResource( 3 ) -shapes/1/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/1/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -97,23 +61,17 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -20, -6, -4, 10, 4, 10, 28, -6, 12, -22, -4, -22 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="door1" type="Sprite" parent="."] position = Vector2( 85.905, 0.62516 ) texture = ExtResource( 1 ) offset = Vector2( 16, -22 ) -region = true region_rect = Rect2( 24, 408, 132, 136 ) [node name="StaticBody2D" type="StaticBody2D" parent="door1"] input_pickable = false -shapes/0/shape = SubResource( 4 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -125,5 +83,5 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -5.90501, 31.3748, 66.095, -0.62516, 50.095, -8.62516, -21.905, 23.3748 ) -shape_range = Vector2( -1, -1 ) -trigger = false + + diff --git a/2d/isometric/troll.png.import b/2d/isometric/troll.png.import index 7a9062ae..366c2d02 100644 --- a/2d/isometric/troll.png.import +++ b/2d/isometric/troll.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/isometric/troll.tscn b/2d/isometric/troll.tscn index c94cf8c6..d4124752 100644 --- a/2d/isometric/troll.tscn +++ b/2d/isometric/troll.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://troll.gd" type="Script" id=1] [ext_resource path="res://troll.png" type="Texture" id=2] @@ -11,12 +11,9 @@ radius = 16.0 [node name="troll" type="KinematicBody2D"] input_pickable = false -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, -0.342697, -0.980721 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 -collision/margin = 0.001 +collision/safe_margin = 0.08 script = ExtResource( 1 ) [node name="Sprite" type="Sprite" parent="."] @@ -28,8 +25,6 @@ texture = ExtResource( 2 ) position = Vector2( -0.342697, -0.980721 ) shape = SubResource( 1 ) -trigger = false -_update_shape_index = -1 [node name="Camera2D" type="Camera2D" parent="."] @@ -41,11 +36,17 @@ limit_left = -10000000 limit_top = -10000000 limit_right = 10000000 limit_bottom = 10000000 -drag_margin/h_enabled = true -drag_margin/v_enabled = true +limit_smoothed = false +drag_margin_h_enabled = true +drag_margin_v_enabled = true smoothing_enabled = false smoothing_speed = 5.0 drag_margin_left = 0.2 drag_margin_top = 0.2 drag_margin_right = 0.2 drag_margin_bottom = 0.2 +editor_draw_screen = true +editor_draw_limits = false +editor_draw_drag_margin = false + + diff --git a/2d/kinematic_character/circle.png.import b/2d/kinematic_character/circle.png.import index c712124f..406b5267 100644 --- a/2d/kinematic_character/circle.png.import +++ b/2d/kinematic_character/circle.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_character/colworld.tscn b/2d/kinematic_character/colworld.tscn index cf6bc67c..c6ec6d9f 100644 --- a/2d/kinematic_character/colworld.tscn +++ b/2d/kinematic_character/colworld.tscn @@ -21,8 +21,11 @@ extents = Vector2( 8, 8 ) 0/region = Rect2( 0, 0, 0, 0 ) 0/occluder_offset = Vector2( 0, 0 ) 0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 8, 8 ) -0/shapes = [ SubResource( 1 ) ] +0/shapes = [ { +"one_way": false, +"shape": SubResource( 1 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 8, 8 ) +} ] [sub_resource type="RectangleShape2D" id=3] @@ -148,7 +151,6 @@ tile_data = PoolIntArray( 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8, 0, [node name="player" parent="." instance=ExtResource( 3 )] position = Vector2( 233.06, 223.436 ) -collision/safe_margin = 0.08 [node name="moving_platform1" type="KinematicBody2D" parent="."] @@ -227,10 +229,15 @@ texture = ExtResource( 4 ) [node name="youwin" type="Label" parent="."] visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 196.0 margin_top = 41.0 margin_right = 344.0 margin_bottom = 67.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 diff --git a/2d/kinematic_character/icon.png.import b/2d/kinematic_character/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/kinematic_character/icon.png.import +++ b/2d/kinematic_character/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_character/long_obstacle.png.import b/2d/kinematic_character/long_obstacle.png.import index 29cc6526..6989071c 100644 --- a/2d/kinematic_character/long_obstacle.png.import +++ b/2d/kinematic_character/long_obstacle.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_character/obstacle.png.import b/2d/kinematic_character/obstacle.png.import index 5e41ddeb..f9362bd0 100644 --- a/2d/kinematic_character/obstacle.png.import +++ b/2d/kinematic_character/obstacle.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_character/player.png.import b/2d/kinematic_character/player.png.import index c205ca37..6843e2df 100644 --- a/2d/kinematic_character/player.png.import +++ b/2d/kinematic_character/player.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_character/player.tscn b/2d/kinematic_character/player.tscn index 7412ca8c..e74838bb 100644 --- a/2d/kinematic_character/player.tscn +++ b/2d/kinematic_character/player.tscn @@ -11,12 +11,9 @@ extents = Vector2( 7, 7 ) [node name="player" type="KinematicBody2D"] input_pickable = false -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, -0.315559, 0.157784 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 -collision/margin = 0.01 +collision/safe_margin = 0.08 script = ExtResource( 1 ) [node name="sprite" type="Sprite" parent="."] @@ -27,5 +24,5 @@ texture = ExtResource( 2 ) position = Vector2( -0.315559, 0.157784 ) shape = SubResource( 1 ) -trigger = false -_update_shape_index = -1 + + diff --git a/2d/kinematic_character/princess.png.import b/2d/kinematic_character/princess.png.import index 703cf5d6..4362eb72 100644 --- a/2d/kinematic_character/princess.png.import +++ b/2d/kinematic_character/princess.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_character/project.godot b/2d/kinematic_character/project.godot index d2cff752..e53f1b80 100644 --- a/2d/kinematic_character/project.godot +++ b/2d/kinematic_character/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/kinematic_collision/colworld.tscn b/2d/kinematic_collision/colworld.tscn index 7803dcbe..564d0f7f 100644 --- a/2d/kinematic_collision/colworld.tscn +++ b/2d/kinematic_collision/colworld.tscn @@ -17,8 +17,11 @@ extents = Vector2( 8, 8 ) 0/region = Rect2( 0, 0, 0, 0 ) 0/occluder_offset = Vector2( 0, 0 ) 0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 8, 8 ) -0/shapes = [ SubResource( 1 ) ] +0/shapes = [ { +"one_way": false, +"shape": SubResource( 1 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 8, 8 ) +} ] [node name="colworld" type="Node2D"] diff --git a/2d/kinematic_collision/icon.png.import b/2d/kinematic_collision/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/kinematic_collision/icon.png.import +++ b/2d/kinematic_collision/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_collision/obstacle.png.import b/2d/kinematic_collision/obstacle.png.import index 5e41ddeb..f9362bd0 100644 --- a/2d/kinematic_collision/obstacle.png.import +++ b/2d/kinematic_collision/obstacle.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_collision/player.png.import b/2d/kinematic_collision/player.png.import index c205ca37..6843e2df 100644 --- a/2d/kinematic_collision/player.png.import +++ b/2d/kinematic_collision/player.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/kinematic_collision/player.tscn b/2d/kinematic_collision/player.tscn index 95587a80..405d166d 100644 --- a/2d/kinematic_collision/player.tscn +++ b/2d/kinematic_collision/player.tscn @@ -11,12 +11,9 @@ extents = Vector2( 8, 8 ) [node name="player" type="KinematicBody2D"] input_pickable = false -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 -collision/margin = 0.01 +collision/safe_margin = 0.08 script = ExtResource( 1 ) [node name="sprite" type="Sprite" parent="."] @@ -26,5 +23,5 @@ texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) -trigger = false -_update_shape_index = -1 + + diff --git a/2d/kinematic_collision/project.godot b/2d/kinematic_collision/project.godot index 76f8edff..04857e2b 100644 --- a/2d/kinematic_collision/project.godot +++ b/2d/kinematic_collision/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/light2d_as_mask/burano.png.import b/2d/light2d_as_mask/burano.png.import index b3362198..94a4db89 100644 --- a/2d/light2d_as_mask/burano.png.import +++ b/2d/light2d_as_mask/burano.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/light2d_as_mask/icon.png.import b/2d/light2d_as_mask/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/light2d_as_mask/icon.png.import +++ b/2d/light2d_as_mask/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/light2d_as_mask/lightmask.tscn b/2d/light2d_as_mask/lightmask.tscn index 03b341e9..8c6b22b9 100644 --- a/2d/light2d_as_mask/lightmask.tscn +++ b/2d/light2d_as_mask/lightmask.tscn @@ -5,6 +5,7 @@ [sub_resource type="CanvasItemMaterial" id=1] +render_priority = 0 blend_mode = 0 light_mode = 2 @@ -49,8 +50,11 @@ tracks/2/keys = { [node name="lightmask_demo" type="Control"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -59,8 +63,13 @@ size_flags_vertical = 2 [node name="burano" type="TextureRect" parent="."] material = SubResource( 1 ) +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 800.0 margin_bottom = 600.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 size_flags_horizontal = 2 @@ -75,7 +84,7 @@ enabled = true editor_only = false texture = ExtResource( 2 ) offset = Vector2( 0, 0 ) -scale = 1.0 +texture_scale = 1.0 color = Color( 1, 1, 1, 1 ) energy = 1.0 mode = 2 @@ -100,7 +109,7 @@ enabled = true editor_only = false texture = ExtResource( 2 ) offset = Vector2( 0, 0 ) -scale = 1.0 +texture_scale = 1.0 color = Color( 1, 1, 1, 1 ) energy = 1.0 mode = 2 @@ -125,7 +134,7 @@ enabled = true editor_only = false texture = ExtResource( 2 ) offset = Vector2( 0, 0 ) -scale = 1.0 +texture_scale = 1.0 color = Color( 1, 1, 1, 1 ) energy = 1.0 mode = 2 diff --git a/2d/light2d_as_mask/project.godot b/2d/light2d_as_mask/project.godot index 6b910a10..9dc87fa1 100644 --- a/2d/light2d_as_mask/project.godot +++ b/2d/light2d_as_mask/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/light2d_as_mask/splat.png.import b/2d/light2d_as_mask/splat.png.import index 23139cc6..eb99aab0 100644 --- a/2d/light2d_as_mask/splat.png.import +++ b/2d/light2d_as_mask/splat.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/lights_and_shadows/bg.png.import b/2d/lights_and_shadows/bg.png.import index 8ec127a3..1a985da6 100644 --- a/2d/lights_and_shadows/bg.png.import +++ b/2d/lights_and_shadows/bg.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/lights_and_shadows/caster.png.import b/2d/lights_and_shadows/caster.png.import index f7328cea..25f90f67 100644 --- a/2d/lights_and_shadows/caster.png.import +++ b/2d/lights_and_shadows/caster.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/lights_and_shadows/icon.png.import b/2d/lights_and_shadows/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/lights_and_shadows/icon.png.import +++ b/2d/lights_and_shadows/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/lights_and_shadows/light.png.import b/2d/lights_and_shadows/light.png.import index 554b8e96..65bcf461 100644 --- a/2d/lights_and_shadows/light.png.import +++ b/2d/lights_and_shadows/light.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/lights_and_shadows/light_shadows.tscn b/2d/lights_and_shadows/light_shadows.tscn index 8b2f862f..91c80865 100644 --- a/2d/lights_and_shadows/light_shadows.tscn +++ b/2d/lights_and_shadows/light_shadows.tscn @@ -13,6 +13,7 @@ polygon = PoolVector2Array( -15.913, -15.9738, 15.9079, -16.0785, 15.6986, 15.84 [sub_resource type="CanvasItemMaterial" id=2] +render_priority = 0 blend_mode = 1 light_mode = 0 @@ -52,11 +53,13 @@ tracks/0/keys = { [sub_resource type="CanvasItemMaterial" id=5] +render_priority = 0 blend_mode = 1 light_mode = 0 [sub_resource type="CanvasItemMaterial" id=6] +render_priority = 0 blend_mode = 1 light_mode = 0 @@ -248,7 +251,7 @@ enabled = true editor_only = false texture = ExtResource( 3 ) offset = Vector2( 0, 0 ) -scale = 1.0 +texture_scale = 1.0 color = Color( 1, 0.446392, 0.0576646, 1 ) energy = 1.0 mode = 0 @@ -290,7 +293,7 @@ enabled = true editor_only = false texture = ExtResource( 3 ) offset = Vector2( 0, 0 ) -scale = 1.0 +texture_scale = 1.0 color = Color( 0.49247, 0.878537, 0.409146, 1 ) energy = 1.0 mode = 0 @@ -332,7 +335,7 @@ enabled = true editor_only = false texture = ExtResource( 3 ) offset = Vector2( 0, 0 ) -scale = 1.0 +texture_scale = 1.0 color = Color( 0.396752, 0.446392, 0.929792, 1 ) energy = 1.0 mode = 0 diff --git a/2d/lights_and_shadows/project.godot b/2d/lights_and_shadows/project.godot index 6864ea50..9c82c318 100644 --- a/2d/lights_and_shadows/project.godot +++ b/2d/lights_and_shadows/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/lights_and_shadows/spot.png.import b/2d/lights_and_shadows/spot.png.import index a00e2ac9..9443b093 100644 --- a/2d/lights_and_shadows/spot.png.import +++ b/2d/lights_and_shadows/spot.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/navigation/agent.png.import b/2d/navigation/agent.png.import index 68dc3c68..bbaeee5f 100644 --- a/2d/navigation/agent.png.import +++ b/2d/navigation/agent.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/navigation/icon.png.import b/2d/navigation/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/navigation/icon.png.import +++ b/2d/navigation/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/navigation/path.png.import b/2d/navigation/path.png.import index 1e050221..41fda4f2 100644 --- a/2d/navigation/path.png.import +++ b/2d/navigation/path.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/navigation/project.godot b/2d/navigation/project.godot index e7175145..1929fd3e 100644 --- a/2d/navigation/project.godot +++ b/2d/navigation/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/particles/fire_particle.png.import b/2d/particles/fire_particle.png.import index 0eed984e..e60e9584 100644 --- a/2d/particles/fire_particle.png.import +++ b/2d/particles/fire_particle.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/particles/icon.png.import b/2d/particles/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/particles/icon.png.import +++ b/2d/particles/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/particles/mask.png.import b/2d/particles/mask.png.import index 4fd8dd1b..e7ea97a3 100644 --- a/2d/particles/mask.png.import +++ b/2d/particles/mask.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/particles/particles.tscn b/2d/particles/particles.tscn index e26e4bf4..a7e6a8e0 100644 --- a/2d/particles/particles.tscn +++ b/2d/particles/particles.tscn @@ -4,6 +4,7 @@ [sub_resource type="CanvasItemMaterial" id=1] +render_priority = 0 blend_mode = 1 light_mode = 0 @@ -22,7 +23,7 @@ width = 2048 min_value = 0.0 max_value = 1.0 bake_resolution = 100 -_data = [ Vector2( 0, 1 ), 0.0, 0.0, Vector2( 0.998617, 0.328125 ), 0.0, 0.0 ] +_data = [ ] [sub_resource type="CurveTexture" id=5] @@ -31,6 +32,7 @@ curve = SubResource( 4 ) [sub_resource type="ParticlesMaterial" id=6] +render_priority = 0 trail_divisor = 1 emission_shape = 1 emission_sphere_radius = 20.0 diff --git a/2d/particles/project.godot b/2d/particles/project.godot index 4a3a1bb6..1477b161 100644 --- a/2d/particles/project.godot +++ b/2d/particles/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/particles/smoke_particle.png.import b/2d/particles/smoke_particle.png.import index d47f3d9b..0b2271e4 100644 --- a/2d/particles/smoke_particle.png.import +++ b/2d/particles/smoke_particle.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/particles/spark_particle2.png.import b/2d/particles/spark_particle2.png.import index 13379fd0..0f342082 100644 --- a/2d/particles/spark_particle2.png.import +++ b/2d/particles/spark_particle2.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/bullet.png.import b/2d/physics_platformer/bullet.png.import index f7e5bdcf..735934fa 100644 --- a/2d/physics_platformer/bullet.png.import +++ b/2d/physics_platformer/bullet.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/coin.png.import b/2d/physics_platformer/coin.png.import index e65aaed2..b0206786 100644 --- a/2d/physics_platformer/coin.png.import +++ b/2d/physics_platformer/coin.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/coin.tscn b/2d/physics_platformer/coin.tscn index 7955e95d..e39c4093 100644 --- a/2d/physics_platformer/coin.tscn +++ b/2d/physics_platformer/coin.tscn @@ -93,23 +93,25 @@ radius = 10.0 [sub_resource type="CanvasItemMaterial" id=4] +render_priority = 0 blend_mode = 1 light_mode = 0 [sub_resource type="Curve" id=5] +min_value = 0.0 +max_value = 1.0 bake_resolution = 100 -_data = [ Vector2( 0, 0.865234 ), 0.0, 0.0, Vector2( 1, 0 ), 0.0, 0.0 ] +_data = [ ] [sub_resource type="CurveTexture" id=6] -min = 0.0 -max = 1.0 width = 2048 curve = SubResource( 5 ) [sub_resource type="ParticlesMaterial" id=7] +render_priority = 0 trail_divisor = 1 emission_shape = 1 emission_sphere_radius = 20.0 @@ -201,10 +203,10 @@ preprocess = 0.0 speed_scale = 1.0 explosiveness = 0.7 randomness = 0.0 -visibility_rect = Rect2( -100, -100, 200, 200 ) -local_coords = true fixed_fps = 0 fract_delta = true +visibility_rect = Rect2( -100, -100, 200, 200 ) +local_coords = true draw_order = 0 process_material = SubResource( 7 ) texture = ExtResource( 4 ) diff --git a/2d/physics_platformer/enemy.png.import b/2d/physics_platformer/enemy.png.import index b03b3af9..6c2d0da2 100644 --- a/2d/physics_platformer/enemy.png.import +++ b/2d/physics_platformer/enemy.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/enemy.tscn b/2d/physics_platformer/enemy.tscn index 9aadb661..d67365f1 100644 --- a/2d/physics_platformer/enemy.tscn +++ b/2d/physics_platformer/enemy.tscn @@ -102,18 +102,19 @@ tracks/0/keys = { custom_solver_bias = 0.0 radius = 14.0 -[sub_resource type="Gradient" id=6] +[sub_resource type="Gradient" id=5] offsets = PoolRealArray( 0, 0.564972, 1 ) colors = PoolColorArray( 1, 1, 1, 1, 1, 1, 1, 0.915254, 1, 1, 1, 0 ) -[sub_resource type="GradientTexture" id=7] +[sub_resource type="GradientTexture" id=6] -gradient = SubResource( 6 ) +gradient = SubResource( 5 ) width = 2048 -[sub_resource type="ParticlesMaterial" id=8] +[sub_resource type="ParticlesMaterial" id=7] +render_priority = 0 trail_divisor = 1 emission_shape = 1 emission_sphere_radius = 20.0 @@ -141,7 +142,7 @@ angle = 0.0 angle_random = 0.0 scale = 2.4 scale_random = 0.0 -color_ramp = SubResource( 7 ) +color_ramp = SubResource( 6 ) hue_variation = 0.0 hue_variation_random = 0.0 anim_speed = 0.0 @@ -224,7 +225,7 @@ position = Vector2( -33.2868, -9.34363 ) enabled = true exclude_parent = true cast_to = Vector2( 0, 45 ) -collision_layer = 1 +collision_mask = 1 type_mask = 15 [node name="raycast_right" type="RayCast2D" parent="."] @@ -233,7 +234,7 @@ position = Vector2( 29.1987, -9.34363 ) enabled = true exclude_parent = true cast_to = Vector2( 0, 45 ) -collision_layer = 1 +collision_mask = 1 type_mask = 15 [node name="Particles2D" type="Particles2D" parent="."] @@ -247,12 +248,12 @@ preprocess = 0.0 speed_scale = 1.0 explosiveness = 0.86 randomness = 0.0 -visibility_rect = Rect2( -100, -100, 200, 200 ) -local_coords = true fixed_fps = 0 fract_delta = true +visibility_rect = Rect2( -100, -100, 200, 200 ) +local_coords = true draw_order = 4 -process_material = SubResource( 8 ) +process_material = SubResource( 7 ) texture = ExtResource( 3 ) normal_map = null h_frames = 1 diff --git a/2d/physics_platformer/icon.png.import b/2d/physics_platformer/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/physics_platformer/icon.png.import +++ b/2d/physics_platformer/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/moving_platform.png.import b/2d/physics_platformer/moving_platform.png.import index f8a15bce..6b6f90da 100644 --- a/2d/physics_platformer/moving_platform.png.import +++ b/2d/physics_platformer/moving_platform.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/moving_platform.tscn b/2d/physics_platformer/moving_platform.tscn index b68dea80..59516ac0 100644 --- a/2d/physics_platformer/moving_platform.tscn +++ b/2d/physics_platformer/moving_platform.tscn @@ -1,13 +1,8 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://moving_platform.gd" type="Script" id=1] [ext_resource path="res://moving_platform.png" type="Texture" id=2] -[sub_resource type="ConvexPolygonShape2D" id=1] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -88, 24, -88, -24, 88, -24, 88, 24 ) - [node name="moving_platform" type="Node2D"] script = ExtResource( 1 ) @@ -17,9 +12,6 @@ cycle = 1.0 [node name="platform" type="RigidBody2D" parent="."] input_pickable = false -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 mode = 3 @@ -34,9 +26,9 @@ contact_monitor = false sleeping = false can_sleep = true linear_velocity = Vector2( 0, 0 ) +linear_damp = -1.0 angular_velocity = 0.0 -damp_override/linear = -1.0 -damp_override/angular = -1.0 +angular_damp = -1.0 [node name="Sprite" type="Sprite" parent="platform"] @@ -46,5 +38,5 @@ texture = ExtResource( 2 ) build_mode = 0 polygon = PoolVector2Array( -88, -24, 88, -24, 88, 24, -88, 24 ) -shape_range = Vector2( -1, -1 ) -trigger = false + + diff --git a/2d/physics_platformer/music.ogg.import b/2d/physics_platformer/music.ogg.import index 3695c7e2..90b1f79d 100644 --- a/2d/physics_platformer/music.ogg.import +++ b/2d/physics_platformer/music.ogg.import @@ -7,3 +7,4 @@ path="res://.import/music.ogg-3bd46d3a4b41702b152014078d12a390.oggstr" [params] loop=true +loop_offset=0 diff --git a/2d/physics_platformer/one_way_platform.png.import b/2d/physics_platformer/one_way_platform.png.import index d845b9bf..2b3a5bd4 100644 --- a/2d/physics_platformer/one_way_platform.png.import +++ b/2d/physics_platformer/one_way_platform.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/osb_fire.png.import b/2d/physics_platformer/osb_fire.png.import index 13fb7aa7..ea9f6f7b 100644 --- a/2d/physics_platformer/osb_fire.png.import +++ b/2d/physics_platformer/osb_fire.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/osb_jump.png.import b/2d/physics_platformer/osb_jump.png.import index 7209cb23..4d55ac28 100644 --- a/2d/physics_platformer/osb_jump.png.import +++ b/2d/physics_platformer/osb_jump.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/osb_left.png.import b/2d/physics_platformer/osb_left.png.import index d1c14226..681f3297 100644 --- a/2d/physics_platformer/osb_left.png.import +++ b/2d/physics_platformer/osb_left.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/osb_right.png.import b/2d/physics_platformer/osb_right.png.import index 1f0c9ae8..0041f3c3 100644 --- a/2d/physics_platformer/osb_right.png.import +++ b/2d/physics_platformer/osb_right.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/parallax_bg.tscn b/2d/physics_platformer/parallax_bg.tscn index cb41d2ac..d5983334 100644 --- a/2d/physics_platformer/parallax_bg.tscn +++ b/2d/physics_platformer/parallax_bg.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://scroll_bg_sky.png" type="Texture" id=1] [ext_resource path="res://scroll_bg_cloud_1.png" type="Texture" id=2] @@ -23,6 +23,7 @@ scroll_ignore_camera_zoom = false [node name="sky" type="ParallaxLayer" parent="."] motion_scale = Vector2( 1, 1 ) +motion_offset = Vector2( 0, 0 ) motion_mirroring = Vector2( 800, 0 ) [node name="Sprite" type="Sprite" parent="sky"] @@ -34,6 +35,7 @@ centered = false [node name="clouds" type="ParallaxLayer" parent="."] motion_scale = Vector2( 0.1, 1 ) +motion_offset = Vector2( 0, 0 ) motion_mirroring = Vector2( 800, 0 ) [node name="Sprite" type="Sprite" parent="clouds"] @@ -75,6 +77,7 @@ centered = false [node name="mount_ 2" type="ParallaxLayer" parent="."] motion_scale = Vector2( 0.2, 1 ) +motion_offset = Vector2( 0, 0 ) motion_mirroring = Vector2( 800, 0 ) [node name="Sprite" type="Sprite" parent="mount_ 2"] @@ -82,12 +85,12 @@ motion_mirroring = Vector2( 800, 0 ) position = Vector2( 0, 225 ) texture = ExtResource( 5 ) centered = false -region = true region_rect = Rect2( 0, 0, 800, 256 ) [node name="mount_1" type="ParallaxLayer" parent="."] motion_scale = Vector2( 0.4, 1 ) +motion_offset = Vector2( 0, 0 ) motion_mirroring = Vector2( 800, 0 ) [node name="Sprite" type="Sprite" parent="mount_1"] @@ -95,5 +98,6 @@ motion_mirroring = Vector2( 800, 0 ) position = Vector2( 0, 225 ) texture = ExtResource( 6 ) centered = false -region = true region_rect = Rect2( 0, 0, 800, 256 ) + + diff --git a/2d/physics_platformer/plank.png.import b/2d/physics_platformer/plank.png.import index c3ed97ea..ce16fe18 100644 --- a/2d/physics_platformer/plank.png.import +++ b/2d/physics_platformer/plank.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/plankpin.png.import b/2d/physics_platformer/plankpin.png.import index f3c63425..36fe5f1d 100644 --- a/2d/physics_platformer/plankpin.png.import +++ b/2d/physics_platformer/plankpin.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/player.tscn b/2d/physics_platformer/player.tscn index 76ae9a17..35e5b168 100644 --- a/2d/physics_platformer/player.tscn +++ b/2d/physics_platformer/player.tscn @@ -22,6 +22,7 @@ width = 2048 [sub_resource type="ParticlesMaterial" id=3] +render_priority = 0 trail_divisor = 1 emission_shape = 0 flag_align_y = false @@ -273,10 +274,10 @@ preprocess = 0.0 speed_scale = 1.0 explosiveness = 1.0 randomness = 0.0 -visibility_rect = Rect2( -100, -100, 200, 200 ) -local_coords = false fixed_fps = 0 fract_delta = true +visibility_rect = Rect2( -100, -100, 200, 200 ) +local_coords = false draw_order = 97 process_material = SubResource( 3 ) texture = ExtResource( 3 ) @@ -323,6 +324,9 @@ drag_margin_left = 0.2 drag_margin_top = 0.2 drag_margin_right = 0.2 drag_margin_bottom = 0.2 +editor_draw_screen = true +editor_draw_limits = false +editor_draw_drag_margin = false [node name="bullet_shoot" type="Position2D" parent="."] diff --git a/2d/physics_platformer/project.godot b/2d/physics_platformer/project.godot index f86ee3b5..9ae00ead 100644 --- a/2d/physics_platformer/project.godot +++ b/2d/physics_platformer/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -13,8 +13,6 @@ config_version=3 config/name="Dynamic Character Control-Based Platformer" run/main_scene="res://stage.tscn" config/icon="res://icon.png" -target_fps="60" -name_es="Plataformero" [display] diff --git a/2d/physics_platformer/robot_demo.png.import b/2d/physics_platformer/robot_demo.png.import index 7ede098d..49cff49b 100644 --- a/2d/physics_platformer/robot_demo.png.import +++ b/2d/physics_platformer/robot_demo.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/scroll_bg_cloud_1.png.import b/2d/physics_platformer/scroll_bg_cloud_1.png.import index 19980f5a..7daacfcf 100644 --- a/2d/physics_platformer/scroll_bg_cloud_1.png.import +++ b/2d/physics_platformer/scroll_bg_cloud_1.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/scroll_bg_cloud_2.png.import b/2d/physics_platformer/scroll_bg_cloud_2.png.import index 704d0753..ac4f916d 100644 --- a/2d/physics_platformer/scroll_bg_cloud_2.png.import +++ b/2d/physics_platformer/scroll_bg_cloud_2.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/scroll_bg_cloud_3.png.import b/2d/physics_platformer/scroll_bg_cloud_3.png.import index c8ce61e7..02b61aeb 100644 --- a/2d/physics_platformer/scroll_bg_cloud_3.png.import +++ b/2d/physics_platformer/scroll_bg_cloud_3.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/scroll_bg_fg_1.png.import b/2d/physics_platformer/scroll_bg_fg_1.png.import index 7c9a93dd..00d037b8 100644 --- a/2d/physics_platformer/scroll_bg_fg_1.png.import +++ b/2d/physics_platformer/scroll_bg_fg_1.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/scroll_bg_fg_2.png.import b/2d/physics_platformer/scroll_bg_fg_2.png.import index ab8a7592..229e651f 100644 --- a/2d/physics_platformer/scroll_bg_fg_2.png.import +++ b/2d/physics_platformer/scroll_bg_fg_2.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/scroll_bg_sky.png.import b/2d/physics_platformer/scroll_bg_sky.png.import index 1b5544ee..4b16d6cd 100644 --- a/2d/physics_platformer/scroll_bg_sky.png.import +++ b/2d/physics_platformer/scroll_bg_sky.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/seesaw.tscn b/2d/physics_platformer/seesaw.tscn index c28963b8..de643e03 100644 --- a/2d/physics_platformer/seesaw.tscn +++ b/2d/physics_platformer/seesaw.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://plank.png" type="Texture" id=1] [ext_resource path="res://plankpin.png" type="Texture" id=2] @@ -10,13 +10,9 @@ extents = Vector2( 128, 8 ) [node name="seesaw" type="Node2D"] - [node name="plank" type="RigidBody2D" parent="."] input_pickable = false -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 mode = 0 @@ -31,9 +27,9 @@ contact_monitor = false sleeping = false can_sleep = true linear_velocity = Vector2( 0, 0 ) +linear_damp = -1.0 angular_velocity = 0.0 -damp_override/linear = -1.0 -damp_override/angular = -1.0 +angular_damp = -1.0 [node name="sprite" type="Sprite" parent="plank"] @@ -42,8 +38,6 @@ texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="plank"] shape = SubResource( 1 ) -trigger = false -_update_shape_index = -1 [node name="pin" type="PinJoint2D" parent="."] @@ -57,3 +51,5 @@ softness = 0.0 position = Vector2( -0.290825, 20.2425 ) texture = ExtResource( 2 ) + + diff --git a/2d/physics_platformer/stage.tscn b/2d/physics_platformer/stage.tscn index 7bcf652d..a02c9b98 100644 --- a/2d/physics_platformer/stage.tscn +++ b/2d/physics_platformer/stage.tscn @@ -37,254 +37,170 @@ __meta__ = { [node name="coin" parent="coins" instance=ExtResource( 2 )] position = Vector2( 672, 1179 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 2" parent="coins" instance=ExtResource( 2 )] position = Vector2( 704, 1179 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 3" parent="coins" instance=ExtResource( 2 )] position = Vector2( 736, 1179 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 4" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1120, 992 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 5" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1152, 992 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 6" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1184, 992 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 7" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1216, 992 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 8" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1248, 992 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 9" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1568, 864 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 10" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1632, 864 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 11" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1824, 768 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 12" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1888, 768 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 13" parent="coins" instance=ExtResource( 2 )] position = Vector2( 2080, 672 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 14" parent="coins" instance=ExtResource( 2 )] position = Vector2( 2144, 672 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 15" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1792, 1248 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 16" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1856, 1248 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 17" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1920, 1248 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 18" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1920, 1184 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 19" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1856, 1184 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 20" parent="coins" instance=ExtResource( 2 )] position = Vector2( 1792, 1184 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 21" parent="coins" instance=ExtResource( 2 )] position = Vector2( 98.8868, 488.515 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 22" parent="coins" instance=ExtResource( 2 )] position = Vector2( 89.5989, 481.217 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 23" parent="coins" instance=ExtResource( 2 )] position = Vector2( 108.175, 481.217 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 24" parent="coins" instance=ExtResource( 2 )] position = Vector2( 116.136, 469.939 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 25" parent="coins" instance=ExtResource( 2 )] position = Vector2( 117.463, 457.997 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 26" parent="coins" instance=ExtResource( 2 )] position = Vector2( 106.184, 449.373 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 27" parent="coins" instance=ExtResource( 2 )] position = Vector2( 98.2234, 458.661 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 28" parent="coins" instance=ExtResource( 2 )] position = Vector2( 88.272, 448.71 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 29" parent="coins" instance=ExtResource( 2 )] position = Vector2( 79.6476, 457.334 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 30" parent="coins" instance=ExtResource( 2 )] position = Vector2( 82.9647, 468.612 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31" parent="coins" instance=ExtResource( 2 )] position = Vector2( 3357.42, 465.288 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 2" parent="coins" instance=ExtResource( 2 )] position = Vector2( 3421.42, 465.288 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 3" parent="coins" instance=ExtResource( 2 )] position = Vector2( 3485.42, 465.288 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 4" parent="coins" instance=ExtResource( 2 )] position = Vector2( 3485.42, 401.288 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 5" parent="coins" instance=ExtResource( 2 )] position = Vector2( 3421.42, 401.288 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 6" parent="coins" instance=ExtResource( 2 )] position = Vector2( 3357.42, 401.288 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 32" parent="coins" instance=ExtResource( 2 )] position = Vector2( 4172.75, 605.058 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 7" parent="coins" instance=ExtResource( 2 )] position = Vector2( 4236.75, 605.058 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 7 2" parent="coins" instance=ExtResource( 2 )] position = Vector2( 4300.75, 605.058 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 7 3" parent="coins" instance=ExtResource( 2 )] position = Vector2( 4300.75, 541.058 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 7 4" parent="coins" instance=ExtResource( 2 )] position = Vector2( 4236.75, 541.058 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="coin 31 7 5" parent="coins" instance=ExtResource( 2 )] position = Vector2( 4172.75, 541.058 ) -audio_bus_override = false -audio_bus_name = "Master" [node name="props" type="Node" parent="."] @@ -368,10 +284,15 @@ position = Vector2( 2406.63, 815.115 ) [node name="Label" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 12.0 margin_top = -202.0 margin_right = 358.0 margin_bottom = -10.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 diff --git a/2d/physics_platformer/stage2.tscn b/2d/physics_platformer/stage2.tscn index 641dc3eb..7e81f1b5 100644 --- a/2d/physics_platformer/stage2.tscn +++ b/2d/physics_platformer/stage2.tscn @@ -35,10 +35,15 @@ position = Vector2( 251.684, 1045.6 ) [node name="Label" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 12.0 margin_top = -202.0 margin_right = 358.0 margin_bottom = -10.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 diff --git a/2d/physics_platformer/tiles_demo.png.import b/2d/physics_platformer/tiles_demo.png.import index c4f02f44..9724bdd2 100644 --- a/2d/physics_platformer/tiles_demo.png.import +++ b/2d/physics_platformer/tiles_demo.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/physics_platformer/tileset_edit.tscn b/2d/physics_platformer/tileset_edit.tscn index e7632d1f..853fa97b 100644 --- a/2d/physics_platformer/tileset_edit.tscn +++ b/2d/physics_platformer/tileset_edit.tscn @@ -1,82 +1,17 @@ -[gd_scene load_steps=54 format=2] +[gd_scene load_steps=2 format=2] [ext_resource path="res://tiles_demo.png" type="Texture" id=1] -[sub_resource type="ConvexPolygonShape2D" id=1] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, -24, 32, -24, 32, 32, -32, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=2] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, 32, -32, -24, 24, -24, 24, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=3] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 24, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=4] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -64, 32, -64, -32, -8, -32, -8, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=5] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 32, -24, 32, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=6] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=7] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, 32, -32, -24, 32, -24, 32, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=8] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, -32, 32, -32, 32, 32, -32, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=9] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, -56, 32, 8, 32, 64, -32, 64 ) - -[sub_resource type="ConvexPolygonShape2D" id=10] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, 32, -32, -32, 24, -32, 24, 32 ) - -[sub_resource type="ConvexPolygonShape2D" id=11] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, -24, 32, -24, 32, 24, -32, 24 ) - -[sub_resource type="ConvexPolygonShape2D" id=12] - -custom_solver_bias = 0.0 -points = PoolVector2Array( -32, -24, 24, -24, 24, 24, -32, 24 ) - [node name="Node" type="Node"] - [node name="floor" type="Sprite" parent="."] texture = ExtResource( 1 ) -region = true region_rect = Rect2( 0, 0, 64, 64 ) [node name="collision" type="StaticBody2D" parent="floor"] input_pickable = false -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -88,22 +23,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( 32, -24, 32, 32, -32, 32, -32, -24 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="edge" type="Sprite" parent="."] position = Vector2( 64, 0 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 64, 0, 64, 64 ) [node name="collision" type="StaticBody2D" parent="edge"] input_pickable = false -shapes/0/shape = SubResource( 2 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -115,22 +44,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -32, -24, 24, -24, 24, 32, -32, 32 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="wall" type="Sprite" parent="."] position = Vector2( 64, 64 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 64, 64, 64, 64 ) [node name="collision" type="StaticBody2D" parent="wall"] input_pickable = false -shapes/0/shape = SubResource( 3 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -142,22 +65,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -32, -32, 24, -32, 24, 32, -32, 32 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="wall_deco" type="Sprite" parent="."] position = Vector2( 96, 128 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 320, 128, 128, 64 ) [node name="collision" type="StaticBody2D" parent="wall_deco"] input_pickable = false -shapes/0/shape = SubResource( 4 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -169,22 +86,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -64, -32, -8, -32, -8, 32, -64, 32 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="corner" type="Sprite" parent="."] position = Vector2( 64, 192 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 64, 128, 64, 64 ) [node name="collision" type="StaticBody2D" parent="corner"] input_pickable = false -shapes/0/shape = SubResource( 5 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -196,22 +107,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -32, -32, 24, -32, 32, -24, 32, 32, -32, 32 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="flowers" type="Sprite" parent="."] position = Vector2( 128, 192 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 192, 192, 64, 64 ) [node name="collision" type="StaticBody2D" parent="flowers"] input_pickable = false -shapes/0/shape = SubResource( 6 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -223,22 +128,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -32, 32, 32, 32, 32, -24, -32, -24 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="tree_base" type="Sprite" parent="."] position = Vector2( 192, 192 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 256, 192, 64, 64 ) [node name="collision" type="StaticBody2D" parent="tree_base"] input_pickable = false -shapes/0/shape = SubResource( 7 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -250,50 +149,40 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -32, 32, 32, 32, 32, -24, -32, -24 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="tree_mid" type="Sprite" parent="."] position = Vector2( 192, 128 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 256, 128, 64, 64 ) [node name="tree_mid 2" type="Sprite" parent="."] position = Vector2( 192, 64 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 256, 64, 64, 64 ) [node name="tree_top" type="Sprite" parent="."] position = Vector2( 192, 0 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 256, 0, 64, 64 ) [node name="solid" type="Sprite" parent="."] position = Vector2( 0, 64 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 0, 64, 64, 64 ) [node name="ceiling" type="Sprite" parent="."] position = Vector2( 0, 128 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 384, 64, 64, 64 ) [node name="collision" type="StaticBody2D" parent="ceiling"] input_pickable = false -shapes/0/shape = SubResource( 8 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -305,22 +194,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( 32, -32, 32, 32, -32, 32, -32, -32 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="ramp" type="Sprite" parent="."] position = Vector2( 256, 224 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 128, 128, 64, 128 ) [node name="collision" type="StaticBody2D" parent="ramp"] input_pickable = false -shapes/0/shape = SubResource( 9 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -332,22 +215,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -32, -56, 32, 8, 32, 64, -32, 64 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="ceiling2wall" type="Sprite" parent="."] position = Vector2( 0, 192 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 448, 64, 64, 64 ) [node name="collision" type="StaticBody2D" parent="ceiling2wall"] input_pickable = false -shapes/0/shape = SubResource( 10 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -359,22 +236,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( -32, -32, 24, -32, 24, 32, -32, 32 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="platform_floor" type="Sprite" parent="."] position = Vector2( 0, 256 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 128, 0, 64, 64 ) [node name="collision" type="StaticBody2D" parent="platform_floor"] input_pickable = false -shapes/0/shape = SubResource( 11 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -386,22 +257,16 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( 32, -24, 32, 24, -32, 24, -32, -24 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="platform_edge" type="Sprite" parent="."] position = Vector2( 64, 256 ) texture = ExtResource( 1 ) -region = true region_rect = Rect2( 192, 0, 64, 64 ) [node name="collision" type="StaticBody2D" parent="platform_edge"] input_pickable = false -shapes/0/shape = SubResource( 12 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false collision_layer = 1 collision_mask = 1 constant_linear_velocity = Vector2( 0, 0 ) @@ -413,18 +278,22 @@ bounce = 0.0 build_mode = 0 polygon = PoolVector2Array( 24, -24, 24, 24, -32, 24, -32, -24 ) -shape_range = Vector2( -1, -1 ) -trigger = false [node name="help" type="Label" parent="."] -focus_ignore_mouse = true -focus_stop_mouse = true -size_flags_horizontal = 2 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 1.0 margin_top = 331.0 margin_right = 727.0 margin_bottom = 422.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 4 text = "This scene serves as a tool for editing the tileset. Nodes (sprites) and their respective collisionsare edited here. @@ -435,3 +304,5 @@ Finally, the saved tileset resource (tileset.tres in this case), can be opened percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 + + diff --git a/2d/platformer/bullet.tscn b/2d/platformer/bullet.tscn index d99ca7a0..7b552213 100644 --- a/2d/platformer/bullet.tscn +++ b/2d/platformer/bullet.tscn @@ -5,17 +5,20 @@ [sub_resource type="CanvasItemMaterial" id=1] +render_priority = 0 blend_mode = 0 light_mode = 0 [sub_resource type="CanvasItemMaterial" id=2] +render_priority = 0 blend_mode = 1 light_mode = 0 _sections_unfolded = [ "Resource" ] [sub_resource type="ParticlesMaterial" id=3] +render_priority = 0 trail_divisor = 1 emission_shape = 0 flag_align_y = false @@ -54,6 +57,7 @@ _sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Dampi [sub_resource type="CanvasItemMaterial" id=4] +render_priority = 0 blend_mode = 0 light_mode = 0 diff --git a/2d/platformer/coin.tscn b/2d/platformer/coin.tscn index dc94ce74..8f245207 100644 --- a/2d/platformer/coin.tscn +++ b/2d/platformer/coin.tscn @@ -93,6 +93,7 @@ radius = 10.0 [sub_resource type="CanvasItemMaterial" id=4] +render_priority = 0 blend_mode = 1 light_mode = 0 @@ -102,6 +103,7 @@ width = 2048 [sub_resource type="ParticlesMaterial" id=6] +render_priority = 0 trail_divisor = 1 emission_shape = 1 emission_sphere_radius = 10.0 diff --git a/2d/platformer/enemy.tscn b/2d/platformer/enemy.tscn index 4a235f69..9c18e810 100644 --- a/2d/platformer/enemy.tscn +++ b/2d/platformer/enemy.tscn @@ -140,6 +140,7 @@ tracks/0/keys = { [sub_resource type="CanvasItemMaterial" id=4] +render_priority = 0 blend_mode = 0 light_mode = 0 @@ -151,11 +152,13 @@ height = 14.2002 [sub_resource type="CanvasItemMaterial" id=6] +render_priority = 0 blend_mode = 1 light_mode = 0 [sub_resource type="ParticlesMaterial" id=7] +render_priority = 0 trail_divisor = 1 emission_shape = 0 flag_align_y = false @@ -247,7 +250,7 @@ position = Vector2( -33.2868, -9.34363 ) enabled = true exclude_parent = true cast_to = Vector2( 0, 45 ) -collision_layer = 1 +collision_mask = 1 type_mask = 15 [node name="detect_wall_left" type="RayCast2D" parent="."] @@ -257,7 +260,7 @@ rotation = 1.5708 enabled = true exclude_parent = true cast_to = Vector2( 0, 20 ) -collision_layer = 1 +collision_mask = 1 type_mask = 15 [node name="detect_wall_right" type="RayCast2D" parent="."] @@ -267,7 +270,7 @@ rotation = -1.5708 enabled = true exclude_parent = true cast_to = Vector2( 0, 20 ) -collision_layer = 1 +collision_mask = 1 type_mask = 15 [node name="detect_floor_right" type="RayCast2D" parent="."] @@ -276,7 +279,7 @@ position = Vector2( 29.1987, -9.34363 ) enabled = true exclude_parent = true cast_to = Vector2( 0, 45 ) -collision_layer = 1 +collision_mask = 1 type_mask = 15 [node name="explosion" type="Particles2D" parent="."] diff --git a/2d/platformer/project.godot b/2d/platformer/project.godot index 2994203e..50734523 100644 --- a/2d/platformer/project.godot +++ b/2d/platformer/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/platformer/tileset_edit.tscn b/2d/platformer/tileset_edit.tscn index db4fa29b..7b0153a3 100644 --- a/2d/platformer/tileset_edit.tscn +++ b/2d/platformer/tileset_edit.tscn @@ -297,10 +297,15 @@ polygon = PoolVector2Array( 24, -24, 24, 24, -32, 24, -32, -24 ) [node name="help" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 1.0 margin_top = 331.0 margin_right = 727.0 margin_bottom = 422.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 diff --git a/2d/pong/ball.png.import b/2d/pong/ball.png.import index 110a99ab..93253891 100644 --- a/2d/pong/ball.png.import +++ b/2d/pong/ball.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/pong/icon.png.import b/2d/pong/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/pong/icon.png.import +++ b/2d/pong/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/pong/left_pallete.png.import b/2d/pong/left_pallete.png.import index 1507466d..6a57da04 100644 --- a/2d/pong/left_pallete.png.import +++ b/2d/pong/left_pallete.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/pong/project.godot b/2d/pong/project.godot index 4c3180db..03c694a0 100644 --- a/2d/pong/project.godot +++ b/2d/pong/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/pong/right_pallete.png.import b/2d/pong/right_pallete.png.import index e1ee6687..aac3bcbf 100644 --- a/2d/pong/right_pallete.png.import +++ b/2d/pong/right_pallete.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/pong/separator.png.import b/2d/pong/separator.png.import index 01df17d9..dddf5bb0 100644 --- a/2d/pong/separator.png.import +++ b/2d/pong/separator.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/screen_space_shaders/art/burano.jpg.import b/2d/screen_space_shaders/art/burano.jpg.import index 03faf6de..07e8fdd4 100644 --- a/2d/screen_space_shaders/art/burano.jpg.import +++ b/2d/screen_space_shaders/art/burano.jpg.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/screen_space_shaders/art/filmgrain.png.import b/2d/screen_space_shaders/art/filmgrain.png.import index 6fcd0932..431d60fa 100644 --- a/2d/screen_space_shaders/art/filmgrain.png.import +++ b/2d/screen_space_shaders/art/filmgrain.png.import @@ -22,3 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false +svg/scale=1.0 diff --git a/2d/screen_space_shaders/art/forest.jpg.import b/2d/screen_space_shaders/art/forest.jpg.import index 75543738..e23f071b 100644 --- a/2d/screen_space_shaders/art/forest.jpg.import +++ b/2d/screen_space_shaders/art/forest.jpg.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/screen_space_shaders/art/mountains.jpg.import b/2d/screen_space_shaders/art/mountains.jpg.import index 3daf91f8..ba6023f1 100644 --- a/2d/screen_space_shaders/art/mountains.jpg.import +++ b/2d/screen_space_shaders/art/mountains.jpg.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/screen_space_shaders/art/platformer.jpg.import b/2d/screen_space_shaders/art/platformer.jpg.import index 12506e0a..1f74cd9a 100644 --- a/2d/screen_space_shaders/art/platformer.jpg.import +++ b/2d/screen_space_shaders/art/platformer.jpg.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/screen_space_shaders/art/vignette.png.import b/2d/screen_space_shaders/art/vignette.png.import index 88b22523..67c3379f 100644 --- a/2d/screen_space_shaders/art/vignette.png.import +++ b/2d/screen_space_shaders/art/vignette.png.import @@ -22,3 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false +svg/scale=1.0 diff --git a/2d/screen_space_shaders/art/white.png.import b/2d/screen_space_shaders/art/white.png.import index 441e08db..84337180 100644 --- a/2d/screen_space_shaders/art/white.png.import +++ b/2d/screen_space_shaders/art/white.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/screen_space_shaders/icon.png.import b/2d/screen_space_shaders/icon.png.import index 627820bd..42e94a35 100644 --- a/2d/screen_space_shaders/icon.png.import +++ b/2d/screen_space_shaders/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/2d/screen_space_shaders/project.godot b/2d/screen_space_shaders/project.godot index 41a32552..e94d8856 100644 --- a/2d/screen_space_shaders/project.godot +++ b/2d/screen_space_shaders/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/2d/screen_space_shaders/screen_shaders.tscn b/2d/screen_space_shaders/screen_shaders.tscn index 9b7ae942..62597e4a 100644 --- a/2d/screen_space_shaders/screen_shaders.tscn +++ b/2d/screen_space_shaders/screen_shaders.tscn @@ -24,6 +24,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=2] +render_priority = 0 shader = SubResource( 1 ) shader_param/vignette = ExtResource( 6 ) _sections_unfolded = [ "shader", "shader_param" ] @@ -41,6 +42,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=4] +render_priority = 0 shader = SubResource( 3 ) shader_param/amount = 4.0 _sections_unfolded = [ "shader", "shader_param" ] @@ -62,6 +64,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=6] +render_priority = 0 shader = SubResource( 5 ) shader_param/size_x = null shader_param/size_y = null @@ -86,6 +89,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=8] +render_priority = 0 shader = SubResource( 7 ) shader_param/rotation = null _sections_unfolded = [ "shader" ] @@ -109,6 +113,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=10] +render_priority = 0 shader = SubResource( 9 ) shader_param/base = Color( 0.54451, 0.408353, 0.403137, 1 ) _sections_unfolded = [ "shader", "shader_param" ] @@ -127,6 +132,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=12] +render_priority = 0 shader = SubResource( 11 ) _sections_unfolded = [ "shader" ] @@ -144,6 +150,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=14] +render_priority = 0 shader = SubResource( 13 ) _sections_unfolded = [ "shader" ] @@ -159,6 +166,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=16] +render_priority = 0 shader = SubResource( 15 ) _sections_unfolded = [ "shader" ] @@ -184,6 +192,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=18] +render_priority = 0 shader = SubResource( 17 ) shader_param/brightness = null shader_param/contrast = null @@ -211,6 +220,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=20] +render_priority = 0 shader = SubResource( 19 ) shader_param/frequency = null shader_param/depth = null @@ -257,6 +267,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=22] +render_priority = 0 shader = SubResource( 21 ) shader_param/base = Color( 0.450274, 0.361255, 0.335059, 1 ) shader_param/grain_strength = 0.3 @@ -269,8 +280,11 @@ _sections_unfolded = [ "shader", "shader_param" ] [node name="Control" type="Control"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -280,8 +294,11 @@ _sections_unfolded = [ "Pause" ] [node name="pictures" type="Control" parent="."] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -289,8 +306,13 @@ size_flags_vertical = 2 [node name="burano" type="TextureRect" parent="pictures"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 size_flags_horizontal = 2 @@ -301,8 +323,13 @@ stretch_mode = 0 [node name="roby" type="TextureRect" parent="pictures"] visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 size_flags_horizontal = 2 @@ -313,8 +340,13 @@ stretch_mode = 0 [node name="mountains" type="TextureRect" parent="pictures"] visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 size_flags_horizontal = 2 @@ -325,8 +357,13 @@ stretch_mode = 0 [node name="forest" type="TextureRect" parent="pictures"] visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 size_flags_horizontal = 2 @@ -336,19 +373,27 @@ stretch_mode = 0 [node name="effects" type="Control" parent="."] -anchor_right = 1 -anchor_bottom = 1 -margin_right = -20.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 size_flags_horizontal = 2 size_flags_vertical = 2 +_sections_unfolded = [ "Rect" ] [node name="disabled" type="Control" parent="effects"] visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 size_flags_horizontal = 2 @@ -358,8 +403,11 @@ size_flags_vertical = 2 visible = false material = SubResource( 2 ) -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -373,8 +421,11 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 4 ) -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -388,8 +439,11 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 6 ) -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -403,8 +457,11 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 8 ) -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -418,10 +475,13 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 10 ) -anchor_right = 1 -anchor_bottom = 1 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 margin_right = 14.0 margin_bottom = -2.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 size_flags_horizontal = 2 @@ -435,8 +495,11 @@ _sections_unfolded = [ "Material", "Visibility" ] visible = false material = SubResource( 12 ) -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -450,8 +513,11 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 14 ) -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -465,8 +531,11 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 16 ) -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -480,10 +549,13 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 18 ) -anchor_right = 1 -anchor_bottom = 1 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 margin_top = 3.0 margin_bottom = -3.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 size_flags_horizontal = 2 @@ -497,8 +569,11 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 20 ) -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -512,10 +587,13 @@ _sections_unfolded = [ "Material" ] visible = false material = SubResource( 22 ) -anchor_right = 1 -anchor_bottom = 1 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 margin_left = -3.0 margin_right = 3.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 size_flags_horizontal = 2 @@ -527,10 +605,15 @@ _sections_unfolded = [ "Material" ] [node name="picture" type="OptionButton" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 8.0 margin_top = 7.0 margin_right = 131.0 margin_bottom = 28.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -546,10 +629,15 @@ items = [ ] [node name="effect" type="OptionButton" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 137.0 margin_top = 7.0 margin_right = 260.0 margin_bottom = 28.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/3d/kinematic_character/kinebody3d.png.import b/3d/kinematic_character/kinebody3d.png.import index d34f57e1..1c77c7a6 100644 --- a/3d/kinematic_character/kinebody3d.png.import +++ b/3d/kinematic_character/kinebody3d.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/kinematic_character/level.scn b/3d/kinematic_character/level.scn index 6f09179f..450ae777 100644 Binary files a/3d/kinematic_character/level.scn and b/3d/kinematic_character/level.scn differ diff --git a/3d/kinematic_character/project.godot b/3d/kinematic_character/project.godot index 3c2412cc..4c908ac2 100644 --- a/3d/kinematic_character/project.godot +++ b/3d/kinematic_character/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/3d/kinematic_character/purple_wood.png.import b/3d/kinematic_character/purple_wood.png.import index 55dba0d5..16c7d59e 100644 --- a/3d/kinematic_character/purple_wood.png.import +++ b/3d/kinematic_character/purple_wood.png.import @@ -22,3 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false +svg/scale=1.0 diff --git a/3d/kinematic_character/purplecube.scn b/3d/kinematic_character/purplecube.scn index 3cc7ec04..d92c2806 100644 Binary files a/3d/kinematic_character/purplecube.scn and b/3d/kinematic_character/purplecube.scn differ diff --git a/3d/kinematic_character/white_wood.png.import b/3d/kinematic_character/white_wood.png.import index d5aa202f..e893dd2a 100644 --- a/3d/kinematic_character/white_wood.png.import +++ b/3d/kinematic_character/white_wood.png.import @@ -22,3 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false +svg/scale=1.0 diff --git a/3d/material_testers/GodotBall.dae.import b/3d/material_testers/GodotBall.dae.import index 749424a6..80fbb2b4 100644 --- a/3d/material_testers/GodotBall.dae.import +++ b/3d/material_testers/GodotBall.dae.import @@ -20,6 +20,7 @@ external_files/store_in_subdir=true animation/import=true animation/fps=15 animation/filter_script="" +animation/storage=false animation/optimizer/enabled=true animation/optimizer/max_linear_error=0.05 animation/optimizer/max_angular_error=0.01 diff --git a/3d/material_testers/aluminium_albedo.png.import b/3d/material_testers/aluminium_albedo.png.import index bb7c0e3d..8193e583 100644 --- a/3d/material_testers/aluminium_albedo.png.import +++ b/3d/material_testers/aluminium_albedo.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/aluminium_flow.png.import b/3d/material_testers/aluminium_flow.png.import index 995537ff..a0c9c174 100644 --- a/3d/material_testers/aluminium_flow.png.import +++ b/3d/material_testers/aluminium_flow.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/aluminium_normal.png.import b/3d/material_testers/aluminium_normal.png.import index d7e48703..f57f4569 100644 --- a/3d/material_testers/aluminium_normal.png.import +++ b/3d/material_testers/aluminium_normal.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/experiment.hdr.import b/3d/material_testers/experiment.hdr.import index 2d2cee2b..9c0525b5 100644 --- a/3d/material_testers/experiment.hdr.import +++ b/3d/material_testers/experiment.hdr.import @@ -21,4 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/lobby.hdr.import b/3d/material_testers/lobby.hdr.import index f4c321be..84efd19f 100644 --- a/3d/material_testers/lobby.hdr.import +++ b/3d/material_testers/lobby.hdr.import @@ -21,4 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/marble_albedo.png.import b/3d/material_testers/marble_albedo.png.import index 9e225a57..d48b6ce3 100644 --- a/3d/material_testers/marble_albedo.png.import +++ b/3d/material_testers/marble_albedo.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/night.hdr.import b/3d/material_testers/night.hdr.import index b0417cee..8436d980 100644 --- a/3d/material_testers/night.hdr.import +++ b/3d/material_testers/night.hdr.import @@ -21,4 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/park.hdr.import b/3d/material_testers/park.hdr.import index 34f80b78..b0f581be 100644 --- a/3d/material_testers/park.hdr.import +++ b/3d/material_testers/park.hdr.import @@ -21,4 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/pbr_bed.dae.import b/3d/material_testers/pbr_bed.dae.import index 1cd2308c..d174e36e 100644 --- a/3d/material_testers/pbr_bed.dae.import +++ b/3d/material_testers/pbr_bed.dae.import @@ -20,6 +20,7 @@ external_files/store_in_subdir=true animation/import=true animation/fps=15 animation/filter_script="" +animation/storage=false animation/optimizer/enabled=true animation/optimizer/max_linear_error=0.05 animation/optimizer/max_angular_error=0.01 diff --git a/3d/material_testers/rock_albedo.jpg.import b/3d/material_testers/rock_albedo.jpg.import index 0e37066a..0455b7b6 100644 --- a/3d/material_testers/rock_albedo.jpg.import +++ b/3d/material_testers/rock_albedo.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/rock_ao.jpg.import b/3d/material_testers/rock_ao.jpg.import index 28def300..1d9ef962 100644 --- a/3d/material_testers/rock_ao.jpg.import +++ b/3d/material_testers/rock_ao.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/rock_depth.jpg.import b/3d/material_testers/rock_depth.jpg.import index 4a0c00fb..62828bea 100644 --- a/3d/material_testers/rock_depth.jpg.import +++ b/3d/material_testers/rock_depth.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/rock_metal.jpg.import b/3d/material_testers/rock_metal.jpg.import index f1204d86..837bf945 100644 --- a/3d/material_testers/rock_metal.jpg.import +++ b/3d/material_testers/rock_metal.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/rock_rough.jpg.import b/3d/material_testers/rock_rough.jpg.import index e57137e4..e407716c 100644 --- a/3d/material_testers/rock_rough.jpg.import +++ b/3d/material_testers/rock_rough.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/sand_albedo.jpg.import b/3d/material_testers/sand_albedo.jpg.import index 0f7be485..8602bc3f 100644 --- a/3d/material_testers/sand_albedo.jpg.import +++ b/3d/material_testers/sand_albedo.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/sand_metal.jpg.import b/3d/material_testers/sand_metal.jpg.import index 5070ebfe..d1d5b88c 100644 --- a/3d/material_testers/sand_metal.jpg.import +++ b/3d/material_testers/sand_metal.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/sand_normal.jpg.import b/3d/material_testers/sand_normal.jpg.import index ace3f01d..3645bb08 100644 --- a/3d/material_testers/sand_normal.jpg.import +++ b/3d/material_testers/sand_normal.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/sand_rough.jpg.import b/3d/material_testers/sand_rough.jpg.import index 5badcab0..b144bbc9 100644 --- a/3d/material_testers/sand_rough.jpg.import +++ b/3d/material_testers/sand_rough.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/sand_shine.jpg.import b/3d/material_testers/sand_shine.jpg.import index 0aaead01..105f5563 100644 --- a/3d/material_testers/sand_shine.jpg.import +++ b/3d/material_testers/sand_shine.jpg.import @@ -21,4 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/schelde.hdr.import b/3d/material_testers/schelde.hdr.import index 621ca5ae..ee7db309 100644 --- a/3d/material_testers/schelde.hdr.import +++ b/3d/material_testers/schelde.hdr.import @@ -21,4 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/test_bed.scn b/3d/material_testers/test_bed.scn index 9c04f0ee..07e4d803 100644 Binary files a/3d/material_testers/test_bed.scn and b/3d/material_testers/test_bed.scn differ diff --git a/3d/material_testers/texture_bricks.jpg.import b/3d/material_testers/texture_bricks.jpg.import index b692c93e..3f33f0b8 100644 --- a/3d/material_testers/texture_bricks.jpg.import +++ b/3d/material_testers/texture_bricks.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_bricks_depth.jpg.import b/3d/material_testers/texture_bricks_depth.jpg.import index 2d4d41c7..fce6d8d6 100644 --- a/3d/material_testers/texture_bricks_depth.jpg.import +++ b/3d/material_testers/texture_bricks_depth.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_bricks_metal.jpg.import b/3d/material_testers/texture_bricks_metal.jpg.import index 472ad264..e94474eb 100644 --- a/3d/material_testers/texture_bricks_metal.jpg.import +++ b/3d/material_testers/texture_bricks_metal.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_bricks_normal.jpg.import b/3d/material_testers/texture_bricks_normal.jpg.import index 78007da5..b0c8a570 100644 --- a/3d/material_testers/texture_bricks_normal.jpg.import +++ b/3d/material_testers/texture_bricks_normal.jpg.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_cheese_albedo.png.import b/3d/material_testers/texture_cheese_albedo.png.import index 3457b183..17f29b9f 100644 --- a/3d/material_testers/texture_cheese_albedo.png.import +++ b/3d/material_testers/texture_cheese_albedo.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_cheese_ao.png.import b/3d/material_testers/texture_cheese_ao.png.import index 96bdeda0..c7c6489b 100644 --- a/3d/material_testers/texture_cheese_ao.png.import +++ b/3d/material_testers/texture_cheese_ao.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_cheese_depth.png.import b/3d/material_testers/texture_cheese_depth.png.import index 37c569d8..33a5e1d6 100644 --- a/3d/material_testers/texture_cheese_depth.png.import +++ b/3d/material_testers/texture_cheese_depth.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_cheese_normal.png.import b/3d/material_testers/texture_cheese_normal.png.import index 28046935..c2e0d1a4 100644 --- a/3d/material_testers/texture_cheese_normal.png.import +++ b/3d/material_testers/texture_cheese_normal.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_rock_albedo.png.import b/3d/material_testers/texture_rock_albedo.png.import index 405456dc..06b241de 100644 --- a/3d/material_testers/texture_rock_albedo.png.import +++ b/3d/material_testers/texture_rock_albedo.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_rock_ao.png.import b/3d/material_testers/texture_rock_ao.png.import index e4121d2d..e7d0429e 100644 --- a/3d/material_testers/texture_rock_ao.png.import +++ b/3d/material_testers/texture_rock_ao.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_rock_depth.png.import b/3d/material_testers/texture_rock_depth.png.import index aa55e051..890c5a75 100644 --- a/3d/material_testers/texture_rock_depth.png.import +++ b/3d/material_testers/texture_rock_depth.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_rock_metal.png.import b/3d/material_testers/texture_rock_metal.png.import index 80ae99f5..f6f38297 100644 --- a/3d/material_testers/texture_rock_metal.png.import +++ b/3d/material_testers/texture_rock_metal.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_rock_normal.png.import b/3d/material_testers/texture_rock_normal.png.import index 0cfb68c7..e0d558ac 100644 --- a/3d/material_testers/texture_rock_normal.png.import +++ b/3d/material_testers/texture_rock_normal.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/texture_wood.png.import b/3d/material_testers/texture_wood.png.import index e1840907..b5f1a289 100644 --- a/3d/material_testers/texture_wood.png.import +++ b/3d/material_testers/texture_wood.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/wool_albedo.png.import b/3d/material_testers/wool_albedo.png.import index 590469a1..65b84e94 100644 --- a/3d/material_testers/wool_albedo.png.import +++ b/3d/material_testers/wool_albedo.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/wool_depth.png.import b/3d/material_testers/wool_depth.png.import index 4bf3fe6c..52039a39 100644 --- a/3d/material_testers/wool_depth.png.import +++ b/3d/material_testers/wool_depth.png.import @@ -22,4 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/material_testers/wool_normal.png.import b/3d/material_testers/wool_normal.png.import index aa7ed00e..c2f19d64 100644 --- a/3d/material_testers/wool_normal.png.import +++ b/3d/material_testers/wool_normal.png.import @@ -21,4 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false -vector_scale=1.0 +svg/scale=1.0 diff --git a/3d/navmesh/navmesh.scn b/3d/navmesh/navmesh.scn index 6639bf01..6928e19a 100644 Binary files a/3d/navmesh/navmesh.scn and b/3d/navmesh/navmesh.scn differ diff --git a/3d/navmesh/project.godot b/3d/navmesh/project.godot index f38bdc6a..9ae4b532 100644 --- a/3d/navmesh/project.godot +++ b/3d/navmesh/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/3d/platformer/bullet.scn b/3d/platformer/bullet.scn index 20a9e1ee..ca12055e 100644 Binary files a/3d/platformer/bullet.scn and b/3d/platformer/bullet.scn differ diff --git a/3d/platformer/coin.scn b/3d/platformer/coin.scn index d629ab12..64e8e5b6 100644 Binary files a/3d/platformer/coin.scn and b/3d/platformer/coin.scn differ diff --git a/3d/platformer/cutout.png.import b/3d/platformer/cutout.png.import index 85c44e9b..0e97dfac 100644 --- a/3d/platformer/cutout.png.import +++ b/3d/platformer/cutout.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/enemy.scn b/3d/platformer/enemy.scn index 501f18f9..e2adddb2 100644 Binary files a/3d/platformer/enemy.scn and b/3d/platformer/enemy.scn differ diff --git a/3d/platformer/icon.png.import b/3d/platformer/icon.png.import index 2dab34bb..d01c7477 100644 --- a/3d/platformer/icon.png.import +++ b/3d/platformer/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/osb_down.png.import b/3d/platformer/osb_down.png.import index 7839dcca..f45c7171 100644 --- a/3d/platformer/osb_down.png.import +++ b/3d/platformer/osb_down.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/osb_fire.png.import b/3d/platformer/osb_fire.png.import index a1ce074c..9c0638c5 100644 --- a/3d/platformer/osb_fire.png.import +++ b/3d/platformer/osb_fire.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/osb_jump.png.import b/3d/platformer/osb_jump.png.import index deb390ce..ff841372 100644 --- a/3d/platformer/osb_jump.png.import +++ b/3d/platformer/osb_jump.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/osb_left.png.import b/3d/platformer/osb_left.png.import index 4c27dee9..3a9ec0c1 100644 --- a/3d/platformer/osb_left.png.import +++ b/3d/platformer/osb_left.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/osb_right.png.import b/3d/platformer/osb_right.png.import index 0e24e0f6..e4b8c366 100644 --- a/3d/platformer/osb_right.png.import +++ b/3d/platformer/osb_right.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/osb_up.png.import b/3d/platformer/osb_up.png.import index 85b2e338..8f4618c9 100644 --- a/3d/platformer/osb_up.png.import +++ b/3d/platformer/osb_up.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/panorama.png.import b/3d/platformer/panorama.png.import index 58d953e6..dc71c6ae 100644 --- a/3d/platformer/panorama.png.import +++ b/3d/platformer/panorama.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/3d/platformer/player.scn b/3d/platformer/player.scn index ab5520b4..24e8d7e1 100644 Binary files a/3d/platformer/player.scn and b/3d/platformer/player.scn differ diff --git a/3d/platformer/project.godot b/3d/platformer/project.godot index bb263e09..0f486f3f 100644 --- a/3d/platformer/project.godot +++ b/3d/platformer/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/3d/platformer/robotrigged.scn b/3d/platformer/robotrigged.scn index 88868677..a4418835 100644 Binary files a/3d/platformer/robotrigged.scn and b/3d/platformer/robotrigged.scn differ diff --git a/3d/platformer/shine.png.import b/3d/platformer/shine.png.import index 1df8ac8d..f893033b 100644 --- a/3d/platformer/shine.png.import +++ b/3d/platformer/shine.png.import @@ -22,3 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false +svg/scale=1.0 diff --git a/3d/platformer/stage.scn b/3d/platformer/stage.scn index 853f30ee..2f80ed06 100644 Binary files a/3d/platformer/stage.scn and b/3d/platformer/stage.scn differ diff --git a/3d/platformer/texture.png.import b/3d/platformer/texture.png.import index d6ac6152..639497e6 100644 --- a/3d/platformer/texture.png.import +++ b/3d/platformer/texture.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false +svg/scale=1.0 diff --git a/3d/platformer/texturemr.png.import b/3d/platformer/texturemr.png.import index 94a0d931..f089f5c8 100644 --- a/3d/platformer/texturemr.png.import +++ b/3d/platformer/texturemr.png.import @@ -22,3 +22,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false +svg/scale=1.0 diff --git a/gui/drag_and_drop/drag_and_drop.scn b/gui/drag_and_drop/drag_and_drop.scn deleted file mode 100644 index 474b8e3a..00000000 Binary files a/gui/drag_and_drop/drag_and_drop.scn and /dev/null differ diff --git a/gui/drag_and_drop/drag_and_drop.tscn b/gui/drag_and_drop/drag_and_drop.tscn new file mode 100644 index 00000000..1ce222a1 --- /dev/null +++ b/gui/drag_and_drop/drag_and_drop.tscn @@ -0,0 +1,256 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://drag_drop_script.gd" type="Script" id=1] + +[node name="Control" type="Control"] + +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 +size_flags_horizontal = 2 +size_flags_vertical = 2 +__meta__ = { +"__editor_plugin_screen__": "2D" +} + +[node name="ColorPickerButton0" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 64.0 +margin_top = 64.0 +margin_right = 160.0 +margin_bottom = 128.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 0.671032, 0.605183, 0, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="ColorPickerButton1" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 224.0 +margin_top = 64.0 +margin_right = 320.0 +margin_bottom = 128.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 0, 0.797347, 0.741037, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="ColorPickerButton2" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 384.0 +margin_top = 64.0 +margin_right = 480.0 +margin_bottom = 128.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 0.443924, 0, 0.632923, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="ColorPickerButton3" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 64.0 +margin_top = 160.0 +margin_right = 160.0 +margin_bottom = 224.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 1, 1, 1, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="ColorPickerButton4" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 224.0 +margin_top = 160.0 +margin_right = 320.0 +margin_bottom = 224.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 1, 0.933842, 0, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="ColorPickerButton5" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 384.0 +margin_top = 160.0 +margin_right = 480.0 +margin_bottom = 224.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 0.287293, 0.886362, 0.122933, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="ColorPickerButton6" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 64.0 +margin_top = 256.0 +margin_right = 160.0 +margin_bottom = 320.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 0.908461, 0, 0.88789, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="ColorPickerButton7" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 224.0 +margin_top = 256.0 +margin_right = 320.0 +margin_bottom = 320.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 0, 0.283703, 0, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="ColorPickerButton8" type="ColorPickerButton" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 384.0 +margin_top = 256.0 +margin_right = 480.0 +margin_bottom = 320.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +flat = false +color = Color( 0, 0, 0.178211, 1 ) +edit_alpha = true +script = ExtResource( 1 ) + +[node name="Label" type="Label" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 10.0 +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 +size_flags_horizontal = 2 +size_flags_vertical = 0 +text = "Drag colors from button to button, or change button colors and drag them again." +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 + + diff --git a/gui/drag_and_drop/icon.png.import b/gui/drag_and_drop/icon.png.import index 627820bd..42e94a35 100644 --- a/gui/drag_and_drop/icon.png.import +++ b/gui/drag_and_drop/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/gui/drag_and_drop/project.godot b/gui/drag_and_drop/project.godot index 0334a90f..65aa91f7 100644 --- a/gui/drag_and_drop/project.godot +++ b/gui/drag_and_drop/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -11,11 +11,8 @@ config_version=3 [application] config/name="Drag & Drop (GUI)" -run/main_scene="res://drag_and_drop.scn" +run/main_scene="res://drag_and_drop.tscn" config/icon="res://icon.png" -icon="res://icon.png" -main_scene="res://drag_and_drop.scn" -name="Drag & Drop (GUI)" [gdnative] diff --git a/gui/input_mapping/project.godot b/gui/input_mapping/project.godot index 601c23c7..c2ddafb4 100644 --- a/gui/input_mapping/project.godot +++ b/gui/input_mapping/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/gui/rich_text_bbcode/icon.png.import b/gui/rich_text_bbcode/icon.png.import index 627820bd..42e94a35 100644 --- a/gui/rich_text_bbcode/icon.png.import +++ b/gui/rich_text_bbcode/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/gui/rich_text_bbcode/project.godot b/gui/rich_text_bbcode/project.godot index 4c693636..25b7fcb0 100644 --- a/gui/rich_text_bbcode/project.godot +++ b/gui/rich_text_bbcode/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/gui/rich_text_bbcode/rich_text_bbcode.tscn b/gui/rich_text_bbcode/rich_text_bbcode.tscn index 8f75c584..aca8270c 100644 --- a/gui/rich_text_bbcode/rich_text_bbcode.tscn +++ b/gui/rich_text_bbcode/rich_text_bbcode.tscn @@ -40,8 +40,11 @@ _sections_unfolded = [ "Font", "Settings" ] [node name="Panel" type="Panel"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -53,12 +56,15 @@ __meta__ = { [node name="RichTextLabel" type="RichTextLabel" parent="."] -anchor_right = 1 -anchor_bottom = 1 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 margin_left = 49.0 margin_top = 55.0 -margin_right = 55.0 -margin_bottom = 44.0 +margin_right = -48.0 +margin_bottom = -62.0 +rect_pivot_offset = Vector2( 0, 0 ) mouse_filter = 0 size_flags_horizontal = 2 size_flags_vertical = 2 @@ -78,6 +84,8 @@ Left alignment is default,[center]but center alignment is supported,[/center][ri For full reference [color=aqua][url=https://github.com/godotengine/godot/wiki/richtext_bbcode]check the wiki.[/url][/color] " visible_characters = -1 +percent_visible = 1.0 +override_selected_font_color = false _sections_unfolded = [ "BBCode", "custom_fonts" ] [connection signal="meta_clicked" from="RichTextLabel" to="." method="_on_RichTextLabel_meta_clicked"] diff --git a/gui/rich_text_bbcode/unicorn_icon.png.import b/gui/rich_text_bbcode/unicorn_icon.png.import index ce9c0fdd..c55333c9 100644 --- a/gui/rich_text_bbcode/unicorn_icon.png.import +++ b/gui/rich_text_bbcode/unicorn_icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/gui/translation/controls.gd b/gui/translation/controls.gd index ae2e2636..ae33c07d 100644 --- a/gui/translation/controls.gd +++ b/gui/translation/controls.gd @@ -1,9 +1,8 @@ extends Panel - func _on_back_pressed(): - var s = load("res://main.scn") - var si = s.instance() + var scene = load("res://main.tscn") + var si = scene.instance() get_parent().add_child(si) queue_free() diff --git a/gui/translation/controls.scn b/gui/translation/controls.scn deleted file mode 100644 index 3df35170..00000000 Binary files a/gui/translation/controls.scn and /dev/null differ diff --git a/gui/translation/controls.tscn b/gui/translation/controls.tscn new file mode 100644 index 00000000..043865ba --- /dev/null +++ b/gui/translation/controls.tscn @@ -0,0 +1,107 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://controls.gd" type="Script" id=1] +[ext_resource path="res://flag_uk.png" type="Texture" id=2] + +[node name="Panel" type="Panel"] + +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 +size_flags_horizontal = 2 +size_flags_vertical = 2 +script = ExtResource( 1 ) +__meta__ = { +"__editor_plugin_screen__": "2D" +} + +[node name="Label" type="Label" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 175.0 +margin_top = 118.0 +margin_right = 328.0 +margin_bottom = 132.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 0 +text = "KEY_HELLO" +align = 1 +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 + +[node name="Button" type="Button" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 166.0 +margin_top = 178.0 +margin_right = 335.0 +margin_bottom = 199.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "KEY_PUSH" +flat = false + +[node name="TextureFrame" type="TextureRect" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 377.0 +margin_top = 118.0 +margin_right = 505.0 +margin_bottom = 203.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 1 +size_flags_horizontal = 2 +size_flags_vertical = 2 +texture = ExtResource( 2 ) +stretch_mode = 0 + +[node name="back" type="Button" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 26.0 +margin_top = 20.0 +margin_right = 150.0 +margin_bottom = 44.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "<- back" +flat = false + +[connection signal="pressed" from="back" to="." method="_on_back_pressed"] + + diff --git a/gui/translation/flag_japan.png.import b/gui/translation/flag_japan.png.import index 68e09bc8..9e516234 100644 --- a/gui/translation/flag_japan.png.import +++ b/gui/translation/flag_japan.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/gui/translation/flag_spain.png.import b/gui/translation/flag_spain.png.import index b115c1db..73240db3 100644 --- a/gui/translation/flag_spain.png.import +++ b/gui/translation/flag_spain.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/gui/translation/flag_uk.png.import b/gui/translation/flag_uk.png.import index 58f73fbe..a5c3a69d 100644 --- a/gui/translation/flag_uk.png.import +++ b/gui/translation/flag_uk.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/gui/translation/icon.png.import b/gui/translation/icon.png.import index 627820bd..42e94a35 100644 --- a/gui/translation/icon.png.import +++ b/gui/translation/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/gui/translation/main.gd b/gui/translation/main.gd index 825aad57..21de7db1 100644 --- a/gui/translation/main.gd +++ b/gui/translation/main.gd @@ -1,19 +1,14 @@ extends Panel - - func _on_english_pressed(): TranslationServer.set_locale("en") - func _on_spanish_pressed(): TranslationServer.set_locale("es") - func _on_japanese_pressed(): TranslationServer.set_locale("ja") - func _on_play_pressed(): get_node("audio").play() diff --git a/gui/translation/main.scn b/gui/translation/main.scn deleted file mode 100644 index da50c0e4..00000000 Binary files a/gui/translation/main.scn and /dev/null differ diff --git a/gui/translation/main.tscn b/gui/translation/main.tscn new file mode 100644 index 00000000..8cf417a9 --- /dev/null +++ b/gui/translation/main.tscn @@ -0,0 +1,218 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://main.gd" type="Script" id=1] +[ext_resource path="res://font/droid_sans.tres" type="DynamicFont" id=2] +[ext_resource path="res://speaker.png" type="Texture" id=3] +[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"] + +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 +size_flags_horizontal = 2 +size_flags_vertical = 2 +script = ExtResource( 1 ) +__meta__ = { +"__editor_plugin_screen__": "2D" +} + +[node name="english" type="Button" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 32.0 +margin_top = 64.0 +margin_right = 192.0 +margin_bottom = 88.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "Use English" +flat = false + +[node name="spanish" type="Button" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 32.0 +margin_top = 112.0 +margin_right = 192.0 +margin_bottom = 136.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "Use Spanish" +flat = false + +[node name="japanese" type="Button" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 32.0 +margin_top = 160.0 +margin_right = 192.0 +margin_bottom = 184.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "Use Japanese" +flat = false + +[node name="description" type="Label" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 243.0 +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 +size_flags_horizontal = 2 +size_flags_vertical = 0 +custom_fonts/font = ExtResource( 2 ) +text = "This is a demo of how a game can be internationalized. +Translations are created in a CSV file and then imported into Godot. + +Using a TTF/OTF font with CJK is required for this demo to run. One is provided +in the font/ folder for your games. + +Godot allows internationalized text to change automatically when locale is +modified. Resources can also be set internationalized alternatives and replaced +automatically on locale change." +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 +_sections_unfolded = [ "custom_fonts" ] + +[node name="HSeparator" type="HSeparator" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 33.0 +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 +size_flags_horizontal = 1 +size_flags_vertical = 1 + +[node name="label" type="Label" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 246.0 +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 +size_flags_horizontal = 1 +size_flags_vertical = 0 +custom_fonts/font = ExtResource( 2 ) +text = "KEY_HELLO" +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 +_sections_unfolded = [ "custom_fonts" ] + +[node name="play" type="Button" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 243.0 +margin_top = 442.0 +margin_right = 475.0 +margin_bottom = 467.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 2 ) +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "KEY_PUSH" +icon = ExtResource( 3 ) +flat = false +_sections_unfolded = [ "custom_fonts" ] + +[node name="TextureRect" type="TextureRect" parent="."] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 85.0 +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 +size_flags_horizontal = 1 +size_flags_vertical = 1 +texture = ExtResource( 4 ) +stretch_mode = 0 + +[node name="audio" type="AudioStreamPlayer" parent="."] + +stream = ExtResource( 5 ) +volume_db = 0.0 +autoplay = false +mix_target = 0 +bus = "Master" + +[connection signal="pressed" from="english" to="." method="_on_english_pressed"] + +[connection signal="pressed" from="spanish" to="." method="_on_spanish_pressed"] + +[connection signal="pressed" from="japanese" to="." method="_on_japanese_pressed"] + +[connection signal="pressed" from="play" to="." method="_on_play_pressed"] + + diff --git a/gui/translation/project.godot b/gui/translation/project.godot index 990f3189..6102c20a 100644 --- a/gui/translation/project.godot +++ b/gui/translation/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -11,11 +11,8 @@ config_version=3 [application] config/name="Translation Demo" -run/main_scene="res://main.scn" +run/main_scene="res://main.tscn" config/icon="res://icon.png" -name="Translation Demo" -main_scene="res://main.scn" -icon="res://icon.png" [gdnative] diff --git a/gui/translation/speaker.png.import b/gui/translation/speaker.png.import index 3ac71c89..52e254c8 100644 --- a/gui/translation/speaker.png.import +++ b/gui/translation/speaker.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/gui/translation/text.csv.import b/gui/translation/text.csv.import index fe36e404..1e9c7a24 100644 --- a/gui/translation/text.csv.import +++ b/gui/translation/text.csv.import @@ -9,3 +9,4 @@ files=[ "res://text.en.translation", "res://text.es.translation", "res://text.ja [params] compress=true +delimiter=0 diff --git a/misc/android_iap/iap.gd b/misc/android_iap/iap.gd index 477c92f3..4b2b28d7 100644 --- a/misc/android_iap/iap.gd +++ b/misc/android_iap/iap.gd @@ -15,7 +15,7 @@ signal consume_not_required signal sku_details_complete signal sku_details_error -onready var payment = GlobalConfig.get_singleton("GodotPayments") +onready var payment = ProjectSettings.get_singleton("GodotPayments") func _ready(): if payment: diff --git a/misc/android_iap/iap_demo.gd b/misc/android_iap/iap_demo.gd index 3c5d07df..43ab6468 100644 --- a/misc/android_iap/iap_demo.gd +++ b/misc/android_iap/iap_demo.gd @@ -21,7 +21,7 @@ func _ready(): func on_purchase_success(item_name): - alert.set_text("Purchase success : "+item_name) + alert.set_text("Purchase success : " + item_name) alert.popup() func on_purchase_fail(): @@ -33,18 +33,18 @@ func on_purchase_cancel(): alert.popup() func on_purchase_owned(item_name): - alert.set_text("Purchase owned : "+item_name) + alert.set_text("Purchase owned : " + item_name) alert.popup() func on_has_purchased(item_name): if item_name == null: alert.set_text("Don't have purchased item") else: - alert.set_text("Has purchased : "+item_name) + alert.set_text("Has purchased : " + item_name) alert.popup() func on_consume_success(item_name): - alert.set_text("Consume success : "+item_name) + alert.set_text("Consume success : " + item_name) alert.popup() func on_consume_fail(): @@ -52,7 +52,7 @@ func on_consume_fail(): alert.popup() func on_sku_details_complete(): - alert.set_text("Got detail info : "+iap.sku_details["item_test_a"].to_json()) + alert.set_text("Got detail info : " + iap.sku_details["item_test_a"].to_json()) alert.popup() diff --git a/misc/android_iap/icon.png.import b/misc/android_iap/icon.png.import index 627820bd..42e94a35 100644 --- a/misc/android_iap/icon.png.import +++ b/misc/android_iap/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/android_iap/main.tscn b/misc/android_iap/main.tscn index 026fffcb..36b96448 100644 --- a/misc/android_iap/main.tscn +++ b/misc/android_iap/main.tscn @@ -4,8 +4,11 @@ [node name="Control" type="Control"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -14,10 +17,15 @@ script = ExtResource( 1 ) [node name="purchase" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 40.0 margin_top = 40.0 margin_right = 250.0 margin_bottom = 120.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -31,10 +39,15 @@ flat = false [node name="consume" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 40.0 margin_top = 150.0 margin_right = 250.0 margin_bottom = 230.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -48,10 +61,15 @@ flat = false [node name="request" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 40.0 margin_top = 260.0 margin_right = 250.0 margin_bottom = 340.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -65,10 +83,15 @@ flat = false [node name="query" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 40.0 margin_top = 370.0 margin_right = 250.0 margin_bottom = 450.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -83,10 +106,15 @@ flat = false [node name="alert" type="AcceptDialog" parent="."] visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 290.0 margin_top = 60.0 margin_right = 700.0 margin_bottom = 290.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -98,10 +126,15 @@ dialog_hide_on_ok = true [node name="Label" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 300.0 margin_top = 40.0 margin_right = 932.0 margin_bottom = 207.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 diff --git a/misc/android_iap/project.godot b/misc/android_iap/project.godot index c4f964b5..934108cb 100644 --- a/misc/android_iap/project.godot +++ b/misc/android_iap/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/misc/autoload/project.godot b/misc/autoload/project.godot index 650a34d4..e3985e8a 100644 --- a/misc/autoload/project.godot +++ b/misc/autoload/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/misc/autoload/scene_a.tscn b/misc/autoload/scene_a.tscn index 5b1b4c3b..712f1bcc 100644 --- a/misc/autoload/scene_a.tscn +++ b/misc/autoload/scene_a.tscn @@ -4,8 +4,11 @@ [node name="scene_a" type="Panel"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -14,12 +17,18 @@ script = ExtResource( 1 ) [node name="label" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 64.0 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 +size_flags_horizontal = 1 size_flags_vertical = 0 text = "This is scene A." percent_visible = 1.0 @@ -28,10 +37,15 @@ max_lines_visible = -1 [node name="goto_scene" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 64.0 margin_top = 128.0 margin_right = 192.0 margin_bottom = 160.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/misc/autoload/scene_b.tscn b/misc/autoload/scene_b.tscn index be22c214..b115c57b 100644 --- a/misc/autoload/scene_b.tscn +++ b/misc/autoload/scene_b.tscn @@ -4,8 +4,11 @@ [node name="scene_b" type="Panel"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -14,12 +17,18 @@ script = ExtResource( 1 ) [node name="label" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 64.0 margin_top = 48.0 margin_right = 164.0 margin_bottom = 62.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 +size_flags_horizontal = 1 size_flags_vertical = 0 text = "This is scene B." percent_visible = 1.0 @@ -28,10 +37,15 @@ max_lines_visible = -1 [node name="goto_scene" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 64.0 margin_top = 128.0 margin_right = 192.0 margin_bottom = 160.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/misc/instancing/bowling_ball.png.import b/misc/instancing/bowling_ball.png.import index bd02f5ea..50c9db61 100644 --- a/misc/instancing/bowling_ball.png.import +++ b/misc/instancing/bowling_ball.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/instancing/container.png.import b/misc/instancing/container.png.import index ff978f2e..b69ce84c 100644 --- a/misc/instancing/container.png.import +++ b/misc/instancing/container.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/instancing/icon.png.import b/misc/instancing/icon.png.import index 627820bd..42e94a35 100644 --- a/misc/instancing/icon.png.import +++ b/misc/instancing/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/instancing/project.godot b/misc/instancing/project.godot index e2868128..9accfbd4 100644 --- a/misc/instancing/project.godot +++ b/misc/instancing/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/misc/joypads/diagram.png.import b/misc/joypads/diagram.png.import index e1f3fa7c..5a1551dc 100644 --- a/misc/joypads/diagram.png.import +++ b/misc/joypads/diagram.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/joypads/icon.png.import b/misc/joypads/icon.png.import index 627820bd..42e94a35 100644 --- a/misc/joypads/icon.png.import +++ b/misc/joypads/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/joypads/indicators.png.import b/misc/joypads/indicators.png.import index 05456830..e2c421a6 100644 --- a/misc/joypads/indicators.png.import +++ b/misc/joypads/indicators.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/joypads/joypads.tscn b/misc/joypads/joypads.tscn index ce4534e1..20d93363 100644 --- a/misc/joypads/joypads.tscn +++ b/misc/joypads/joypads.tscn @@ -14,17 +14,29 @@ position = Vector2( 403.304, 161.318 ) [node name="device_info" type="Control" parent="."] editor/display_folded = true +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 +size_flags_horizontal = 1 +size_flags_vertical = 1 [node name="label_device" type="Label" parent="device_info"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 10.0 margin_right = 60.0 margin_bottom = 30.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -37,10 +49,15 @@ max_lines_visible = -1 [node name="joy_num" type="SpinBox" parent="device_info"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 65.0 margin_top = 10.0 margin_right = 139.0 margin_bottom = 34.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -58,10 +75,15 @@ suffix = "" [node name="joy_name" type="Label" parent="device_info"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 35.0 margin_right = 250.0 margin_bottom = 50.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -74,17 +96,29 @@ max_lines_visible = -1 [node name="axes" type="Control" parent="."] editor/display_folded = true +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 +size_flags_horizontal = 1 +size_flags_vertical = 1 [node name="axis_prog0" type="ProgressBar" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 60.0 margin_right = 250.0 margin_bottom = 76.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -100,10 +134,15 @@ percent_visible = false [node name="axis_prog1" type="ProgressBar" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 80.0 margin_right = 250.0 margin_bottom = 96.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -119,10 +158,15 @@ percent_visible = false [node name="axis_prog2" type="ProgressBar" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 100.0 margin_right = 250.0 margin_bottom = 116.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -138,10 +182,15 @@ percent_visible = false [node name="axis_prog3" type="ProgressBar" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 120.0 margin_right = 250.0 margin_bottom = 136.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -157,10 +206,15 @@ percent_visible = false [node name="axis_prog4" type="ProgressBar" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 140.0 margin_right = 250.0 margin_bottom = 156.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -176,10 +230,15 @@ percent_visible = false [node name="axis_prog5" type="ProgressBar" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 160.0 margin_right = 250.0 margin_bottom = 176.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -195,10 +254,15 @@ percent_visible = false [node name="axis_prog6" type="ProgressBar" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 180.0 margin_right = 250.0 margin_bottom = 196.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -214,10 +278,15 @@ percent_visible = false [node name="axis_prog7" type="ProgressBar" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 200.0 margin_right = 250.0 margin_bottom = 216.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -233,10 +302,15 @@ percent_visible = false [node name="axis_val0" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 60.0 margin_right = 250.0 margin_bottom = 75.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -250,10 +324,15 @@ max_lines_visible = -1 [node name="axis_val1" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 80.0 margin_right = 250.0 margin_bottom = 95.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -267,10 +346,15 @@ max_lines_visible = -1 [node name="axis_val2" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 100.0 margin_right = 250.0 margin_bottom = 115.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -284,10 +368,15 @@ max_lines_visible = -1 [node name="axis_val3" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 120.0 margin_right = 250.0 margin_bottom = 135.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -301,10 +390,15 @@ max_lines_visible = -1 [node name="axis_val4" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 140.0 margin_right = 250.0 margin_bottom = 155.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -318,10 +412,15 @@ max_lines_visible = -1 [node name="axis_val5" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 160.0 margin_right = 250.0 margin_bottom = 175.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -335,10 +434,15 @@ max_lines_visible = -1 [node name="axis_val6" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 180.0 margin_right = 250.0 margin_bottom = 195.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -352,10 +456,15 @@ max_lines_visible = -1 [node name="axis_val7" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 50.0 margin_top = 200.0 margin_right = 250.0 margin_bottom = 215.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -369,10 +478,15 @@ max_lines_visible = -1 [node name="label_axis0" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 60.0 margin_right = 51.0 margin_bottom = 75.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -385,10 +499,15 @@ max_lines_visible = -1 [node name="label_axis1" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 80.0 margin_right = 51.0 margin_bottom = 95.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -401,10 +520,15 @@ max_lines_visible = -1 [node name="label_axis2" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 100.0 margin_right = 51.0 margin_bottom = 115.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -417,10 +541,15 @@ max_lines_visible = -1 [node name="label_axis3" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 120.0 margin_right = 51.0 margin_bottom = 135.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -433,10 +562,15 @@ max_lines_visible = -1 [node name="label_axis4" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 140.0 margin_right = 51.0 margin_bottom = 155.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -449,10 +583,15 @@ max_lines_visible = -1 [node name="label_axis5" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 160.0 margin_right = 51.0 margin_bottom = 175.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -465,10 +604,15 @@ max_lines_visible = -1 [node name="label_axis6" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 180.0 margin_right = 51.0 margin_bottom = 195.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -481,10 +625,15 @@ max_lines_visible = -1 [node name="label_axis7" type="Label" parent="axes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 200.0 margin_right = 51.0 margin_bottom = 215.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -498,17 +647,29 @@ max_lines_visible = -1 [node name="buttons" type="Control" parent="."] editor/display_folded = true +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 +size_flags_horizontal = 1 +size_flags_vertical = 1 [node name="label_buttons" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 235.0 margin_right = 65.0 margin_bottom = 249.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -520,10 +681,15 @@ max_lines_visible = -1 [node name="btn0" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 20.0 margin_top = 255.0 margin_right = 45.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -536,10 +702,15 @@ max_lines_visible = -1 [node name="btn1" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 45.0 margin_top = 255.0 margin_right = 70.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -552,10 +723,15 @@ max_lines_visible = -1 [node name="btn2" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 70.0 margin_top = 255.0 margin_right = 95.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -568,10 +744,15 @@ max_lines_visible = -1 [node name="btn3" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 95.0 margin_top = 255.0 margin_right = 120.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -584,10 +765,15 @@ max_lines_visible = -1 [node name="btn4" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 120.0 margin_top = 255.0 margin_right = 145.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -600,10 +786,15 @@ max_lines_visible = -1 [node name="btn5" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 145.0 margin_top = 255.0 margin_right = 170.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -616,10 +807,15 @@ max_lines_visible = -1 [node name="btn6" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 170.0 margin_top = 255.0 margin_right = 195.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -632,10 +828,15 @@ max_lines_visible = -1 [node name="btn7" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 195.0 margin_top = 255.0 margin_right = 220.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -648,10 +849,15 @@ max_lines_visible = -1 [node name="btn8" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 220.0 margin_top = 255.0 margin_right = 245.0 margin_bottom = 269.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -664,10 +870,15 @@ max_lines_visible = -1 [node name="btn9" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 20.0 margin_top = 275.0 margin_right = 45.0 margin_bottom = 289.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -680,10 +891,15 @@ max_lines_visible = -1 [node name="btn10" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 45.0 margin_top = 275.0 margin_right = 70.0 margin_bottom = 289.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -696,10 +912,15 @@ max_lines_visible = -1 [node name="btn11" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 70.0 margin_top = 275.0 margin_right = 95.0 margin_bottom = 289.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -712,10 +933,15 @@ max_lines_visible = -1 [node name="btn12" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 95.0 margin_top = 275.0 margin_right = 120.0 margin_bottom = 289.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -728,10 +954,15 @@ max_lines_visible = -1 [node name="btn13" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 120.0 margin_top = 275.0 margin_right = 145.0 margin_bottom = 289.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -744,10 +975,15 @@ max_lines_visible = -1 [node name="btn14" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 145.0 margin_top = 275.0 margin_right = 170.0 margin_bottom = 289.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -760,10 +996,15 @@ max_lines_visible = -1 [node name="btn15" type="Label" parent="buttons"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 170.0 margin_top = 275.0 margin_right = 195.0 margin_bottom = 289.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -777,17 +1018,29 @@ max_lines_visible = -1 [node name="vibration" type="Control" parent="."] editor/display_folded = true +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 +size_flags_horizontal = 1 +size_flags_vertical = 1 [node name="weak_label" type="Label" parent="vibration"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 8.0 margin_top = 329.0 margin_right = 150.0 margin_bottom = 343.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -799,10 +1052,15 @@ max_lines_visible = -1 [node name="strong_label" type="Label" parent="vibration"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 8.0 margin_top = 367.0 margin_right = 155.0 margin_bottom = 381.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -814,10 +1072,15 @@ max_lines_visible = -1 [node name="duration_label" type="Label" parent="vibration"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 8.0 margin_top = 408.0 margin_right = 155.0 margin_bottom = 439.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -829,10 +1092,15 @@ max_lines_visible = -1 [node name="vibration_weak_value" type="SpinBox" parent="vibration"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 163.0 margin_top = 324.0 margin_right = 237.0 margin_bottom = 348.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -850,10 +1118,15 @@ suffix = "" [node name="vibration_strong_value" type="SpinBox" parent="vibration"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 163.0 margin_top = 362.0 margin_right = 237.0 margin_bottom = 386.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -871,10 +1144,15 @@ suffix = "" [node name="vibration_duration_value" type="SpinBox" parent="vibration"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 163.0 margin_top = 403.0 margin_right = 237.0 margin_bottom = 427.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -892,10 +1170,15 @@ suffix = "" [node name="start_vibration" type="Button" parent="vibration"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 288.0 margin_top = 352.0 margin_right = 390.0 margin_bottom = 372.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -909,10 +1192,15 @@ flat = false [node name="stop_vibration" type="Button" parent="vibration"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 406.0 margin_top = 352.0 margin_right = 507.0 margin_bottom = 372.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/misc/joypads/project.godot b/misc/joypads/project.godot index 72d85153..b617aa55 100644 --- a/misc/joypads/project.godot +++ b/misc/joypads/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/misc/pause/icon.png.import b/misc/pause/icon.png.import index 627820bd..42e94a35 100644 --- a/misc/pause/icon.png.import +++ b/misc/pause/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/pause/project.godot b/misc/pause/project.godot index 143a1af0..b16375a8 100644 --- a/misc/pause/project.godot +++ b/misc/pause/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/misc/pause/spinpause.tscn b/misc/pause/spinpause.tscn index cf573a94..100d91ef 100644 --- a/misc/pause/spinpause.tscn +++ b/misc/pause/spinpause.tscn @@ -36,7 +36,6 @@ layers = 1 material_override = null cast_shadow = 1 extra_cull_margin = 0.0 -visible_in_all_rooms = false use_in_baked_light = false lod_min_distance = 0.0 lod_min_hysteresis = 0.0 @@ -59,6 +58,7 @@ cull_mask = 1048575 environment = null h_offset = 0.0 v_offset = 0.0 +doppler/tracking = 0 [node name="anim" type="AnimationPlayer" parent="."] @@ -84,7 +84,7 @@ shadow_enabled = false shadow_color = Color( 0, 0, 0, 1 ) shadow_bias = 0.15 shadow_contact = 0.0 -shadow_max_distance = 0.0 +shadow_reverse_cull_face = false editor_only = false spot_range = 6.0 spot_attenuation = 1.0 @@ -94,10 +94,15 @@ _sections_unfolded = [ "Spot" ] [node name="pause" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 24.0 margin_top = 24.0 margin_right = 120.0 margin_bottom = 56.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -114,10 +119,15 @@ flat = false pause_mode = 2 visible = false self_modulate = Color( 1, 1, 1, 0.7 ) +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 185.0 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 size_flags_horizontal = 2 @@ -127,10 +137,15 @@ _sections_unfolded = [ "Pause" ] [node name="text" type="Label" parent="pause_popup"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 73.0 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 size_flags_horizontal = 2 @@ -143,10 +158,15 @@ max_lines_visible = -1 [node name="unpause" type="Button" parent="pause_popup"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 185.0 margin_top = 288.0 margin_right = 281.0 margin_bottom = 320.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/misc/regex/icon.png.import b/misc/regex/icon.png.import index 627820bd..42e94a35 100644 --- a/misc/regex/icon.png.import +++ b/misc/regex/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/regex/project.godot b/misc/regex/project.godot index 4983a179..7cf32d5b 100644 --- a/misc/regex/project.godot +++ b/misc/regex/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -13,7 +13,6 @@ config_version=3 config/name="RegEx" run/main_scene="res://regex.tscn" config/icon="res://icon.png" -name="RegEx" [gdnative] diff --git a/misc/regex/regex.tscn b/misc/regex/regex.tscn index 055ea0b6..163e7bea 100644 --- a/misc/regex/regex.tscn +++ b/misc/regex/regex.tscn @@ -4,20 +4,32 @@ [node name="VBoxContainer" type="VBoxContainer"] -anchor_right = 1 -anchor_bottom = 1 +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 +size_flags_horizontal = 1 +size_flags_vertical = 1 alignment = 0 script = ExtResource( 1 ) _sections_unfolded = [ "Size Flags" ] [node name="Expression" type="LineEdit" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 1024.0 margin_bottom = 24.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 text = "\"((?:\\\\.|[^\"])*)\"" expand_to_len = false focus_mode = 2 @@ -28,15 +40,26 @@ _sections_unfolded = [ "Size Flags" ] [node name="Text" type="TextEdit" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 28.0 margin_right = 1024.0 margin_bottom = 328.0 rect_min_size = Vector2( 0, 300 ) +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +highlight_current_line = false syntax_highlighting = false show_line_numbers = false highlight_all_occurrences = false +override_selected_font_color = false +smooth_scrolling = false +v_scroll_speed = 80.0 caret_block_mode = false caret_blink = false caret_blink_speed = 0.65 @@ -44,11 +67,18 @@ _sections_unfolded = [ "Rect", "Size Flags" ] [node name="List" type="VBoxContainer" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 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 +size_flags_horizontal = 1 +size_flags_vertical = 1 alignment = 0 _sections_unfolded = [ "Rect", "Size Flags" ] diff --git a/misc/scene_changer/project.godot b/misc/scene_changer/project.godot index b6994f63..db13591c 100644 --- a/misc/scene_changer/project.godot +++ b/misc/scene_changer/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/misc/scene_changer/scene_a.tscn b/misc/scene_changer/scene_a.tscn index 5b1b4c3b..712f1bcc 100644 --- a/misc/scene_changer/scene_a.tscn +++ b/misc/scene_changer/scene_a.tscn @@ -4,8 +4,11 @@ [node name="scene_a" type="Panel"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -14,12 +17,18 @@ script = ExtResource( 1 ) [node name="label" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 64.0 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 +size_flags_horizontal = 1 size_flags_vertical = 0 text = "This is scene A." percent_visible = 1.0 @@ -28,10 +37,15 @@ max_lines_visible = -1 [node name="goto_scene" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 64.0 margin_top = 128.0 margin_right = 192.0 margin_bottom = 160.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/misc/scene_changer/scene_b.tscn b/misc/scene_changer/scene_b.tscn index be22c214..b115c57b 100644 --- a/misc/scene_changer/scene_b.tscn +++ b/misc/scene_changer/scene_b.tscn @@ -4,8 +4,11 @@ [node name="scene_b" type="Panel"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -14,12 +17,18 @@ script = ExtResource( 1 ) [node name="label" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 64.0 margin_top = 48.0 margin_right = 164.0 margin_bottom = 62.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 +size_flags_horizontal = 1 size_flags_vertical = 0 text = "This is scene B." percent_visible = 1.0 @@ -28,10 +37,15 @@ max_lines_visible = -1 [node name="goto_scene" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 64.0 margin_top = 128.0 margin_right = 192.0 margin_bottom = 160.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/misc/threads/mona.png.import b/misc/threads/mona.png.import index cb6806fb..4137afa0 100644 --- a/misc/threads/mona.png.import +++ b/misc/threads/mona.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/threads/project.godot b/misc/threads/project.godot index 36bb5959..3b95e294 100644 --- a/misc/threads/project.godot +++ b/misc/threads/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/misc/threads/thread.tscn b/misc/threads/thread.tscn index 8b2c80df..0c73cd7c 100644 --- a/misc/threads/thread.tscn +++ b/misc/threads/thread.tscn @@ -8,10 +8,15 @@ script = ExtResource( 1 ) [node name="load" type="Button" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 192.0 margin_top = 32.0 margin_right = 320.0 margin_bottom = 64.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/misc/tween/godot.png.import b/misc/tween/godot.png.import index d000b215..6a737fa4 100644 --- a/misc/tween/godot.png.import +++ b/misc/tween/godot.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=false +svg/scale=1.0 diff --git a/misc/tween/icon.png.import b/misc/tween/icon.png.import index 627820bd..42e94a35 100644 --- a/misc/tween/icon.png.import +++ b/misc/tween/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/tween/main.tscn b/misc/tween/main.tscn index 1bf87e19..41618211 100644 --- a/misc/tween/main.tscn +++ b/misc/tween/main.tscn @@ -5,6 +5,10 @@ [node name="main" type="Control"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 800.0 margin_bottom = 600.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -17,6 +21,10 @@ script = ExtResource( 1 ) [node name="trans" type="VBoxContainer" parent="."] editor/display_folded = true +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 56.0 margin_top = 288.0 margin_right = 129.0 @@ -30,6 +38,10 @@ alignment = 0 [node name="linear" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 48.0 margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -46,6 +58,10 @@ flat = false [node name="sine" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 30.0 margin_right = 39.0 margin_bottom = 50.0 @@ -63,6 +79,10 @@ flat = false [node name="quint" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 60.0 margin_right = 45.0 margin_bottom = 80.0 @@ -80,6 +100,10 @@ flat = false [node name="quart" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 90.0 margin_right = 45.0 margin_bottom = 110.0 @@ -97,6 +121,10 @@ flat = false [node name="quad" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 120.0 margin_right = 43.0 margin_bottom = 140.0 @@ -114,6 +142,10 @@ flat = false [node name="expo" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 150.0 margin_right = 43.0 margin_bottom = 170.0 @@ -131,6 +163,10 @@ flat = false [node name="elastic" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 180.0 margin_right = 54.0 margin_bottom = 200.0 @@ -148,6 +184,10 @@ flat = false [node name="cubic" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 210.0 margin_right = 46.0 margin_bottom = 230.0 @@ -165,6 +205,10 @@ flat = false [node name="circ" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 240.0 margin_right = 35.0 margin_bottom = 260.0 @@ -182,6 +226,10 @@ flat = false [node name="bounce" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 270.0 margin_right = 59.0 margin_bottom = 290.0 @@ -199,6 +247,10 @@ flat = false [node name="back" type="Button" parent="trans"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 300.0 margin_right = 41.0 margin_bottom = 320.0 @@ -217,6 +269,10 @@ flat = false [node name="eases" type="VBoxContainer" parent="."] editor/display_folded = true +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 152.0 margin_top = 288.0 margin_right = 215.0 @@ -230,6 +286,10 @@ alignment = 0 [node name="in" type="Button" parent="eases"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 24.0 margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -246,6 +306,10 @@ flat = false [node name="out" type="Button" parent="eases"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 30.0 margin_right = 33.0 margin_bottom = 50.0 @@ -263,6 +327,10 @@ flat = false [node name="in_out" type="Button" parent="eases"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 60.0 margin_right = 51.0 margin_bottom = 80.0 @@ -280,6 +348,10 @@ flat = false [node name="out_in" type="Button" parent="eases"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 90.0 margin_right = 51.0 margin_bottom = 110.0 @@ -298,6 +370,10 @@ flat = false [node name="modes" type="VBoxContainer" parent="."] editor/display_folded = true +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 240.0 margin_top = 288.0 margin_right = 317.0 @@ -311,6 +387,10 @@ alignment = 0 [node name="move" type="Button" parent="modes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 48.0 margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -327,6 +407,10 @@ flat = false [node name="color" type="Button" parent="modes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 30.0 margin_right = 44.0 margin_bottom = 50.0 @@ -344,6 +428,10 @@ flat = false [node name="scale" type="Button" parent="modes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 60.0 margin_right = 45.0 margin_bottom = 80.0 @@ -361,6 +449,10 @@ flat = false [node name="rotate" type="Button" parent="modes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 90.0 margin_right = 50.0 margin_bottom = 110.0 @@ -378,6 +470,10 @@ flat = false [node name="callback" type="Button" parent="modes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 120.0 margin_right = 63.0 margin_bottom = 140.0 @@ -395,6 +491,10 @@ flat = false [node name="follow" type="Button" parent="modes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 150.0 margin_right = 50.0 margin_bottom = 170.0 @@ -412,6 +512,10 @@ flat = false [node name="repeat" type="Button" parent="modes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 180.0 margin_right = 53.0 margin_bottom = 200.0 @@ -429,6 +533,10 @@ flat = false [node name="pause" type="Button" parent="modes"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 210.0 margin_right = 50.0 margin_bottom = 230.0 @@ -446,6 +554,10 @@ flat = false [node name="colors" type="HBoxContainer" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 352.0 margin_top = 288.0 margin_right = 858.0 @@ -460,8 +572,12 @@ alignment = 0 [node name="color_from" type="VBoxContainer" parent="colors"] -margin_right = 233.0 -margin_bottom = 338.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 rect_min_size = Vector2( 0, 320 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -472,6 +588,10 @@ alignment = 0 [node name="label" type="Label" parent="colors/color_from"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 74.0 margin_bottom = 14.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -486,9 +606,13 @@ max_lines_visible = -1 [node name="picker" type="ColorPicker" parent="colors/color_from"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 18.0 -margin_right = 233.0 -margin_bottom = 338.0 +margin_right = 298.0 +margin_bottom = 460.0 rect_min_size = Vector2( 0, 320 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -499,9 +623,13 @@ alignment = 0 [node name="color_to" type="VBoxContainer" parent="colors"] -margin_left = 273.0 -margin_right = 506.0 -margin_bottom = 338.0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 338.0 +margin_right = 636.0 +margin_bottom = 460.0 rect_min_size = Vector2( 0, 320 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -512,6 +640,10 @@ alignment = 0 [node name="label" type="Label" parent="colors/color_to"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 56.0 margin_bottom = 14.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -526,9 +658,13 @@ max_lines_visible = -1 [node name="picker" type="ColorPicker" parent="colors/color_to"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 18.0 -margin_right = 233.0 -margin_bottom = 338.0 +margin_right = 298.0 +margin_bottom = 460.0 rect_min_size = Vector2( 0, 320 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -546,6 +682,10 @@ playback/speed = 1.0 [node name="area" type="Panel" parent="tween"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 32.0 margin_top = 32.0 margin_right = 896.0 @@ -558,6 +698,10 @@ size_flags_vertical = 2 [node name="label" type="RichTextLabel" parent="tween/area"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 176.0 margin_top = 24.0 margin_right = 552.0 @@ -570,6 +714,7 @@ bbcode_enabled = false bbcode_text = "" visible_characters = -1 percent_visible = 1.0 +override_selected_font_color = false [node name="sprite" type="Sprite" parent="tween/area"] @@ -587,6 +732,10 @@ texture = ExtResource( 2 ) [node name="timeline" type="HSlider" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 48.0 margin_top = 240.0 margin_right = 880.0 diff --git a/misc/tween/project.godot b/misc/tween/project.godot index 0493708b..9c68c5f6 100644 --- a/misc/tween/project.godot +++ b/misc/tween/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -17,8 +17,7 @@ target_fps=60 [display] -window/size/width=928 -window/size/height=672 +window/size/height=768 stretch/aspect="keep_width" stretch/mode="2d" diff --git a/misc/window_management/icon.png.import b/misc/window_management/icon.png.import index 627820bd..42e94a35 100644 --- a/misc/window_management/icon.png.import +++ b/misc/window_management/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/misc/window_management/observer/observer.tscn b/misc/window_management/observer/observer.tscn index e6ea12d3..229cfb5a 100644 --- a/misc/window_management/observer/observer.tscn +++ b/misc/window_management/observer/observer.tscn @@ -1,53 +1,47 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] [ext_resource path="res://observer/observer.gd" type="Script" id=1] [node name="Observer" type="KinematicBody"] -_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) input_ray_pickable = true input_capture_on_drag = false -shape_count = 0 collision_layer = 1 collision_mask = 1 -collide_with/static = true -collide_with/kinematic = true -collide_with/rigid = true -collide_with/character = true -collision/margin = 0.001 +collision/safe_margin = 0.001 script = ExtResource( 1 ) [node name="Camera" type="Camera" parent="."] -_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) projection = 0 fov = 60.0 near = 0.1 far = 1000.0 keep_aspect = 1 current = false -visible_layers = 1048575 +cull_mask = 1048575 environment = null h_offset = 0.0 v_offset = 0.0 +doppler/tracking = 0 [node name="OmniLight" type="OmniLight" parent="."] -_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ) layers = 1 -params/enabled = true -params/editor_only = false -params/bake_mode = 0 -params/energy = 1.0 -colors/diffuse = Color( 1, 1, 1, 1 ) -colors/specular = Color( 1, 1, 1, 1 ) -shadow/shadow = false -shadow/darkening = 0.0 -shadow/z_offset = 0.001 -shadow/z_slope_scale = 0.0 -shadow/esm_multiplier = 60.0 -shadow/blur_passes = 1.0 -projector = null -operator = 0 -params/radius = 100.0 -params/attenuation = 1.0 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +omni_range = 5.0 +omni_attenuation = 1.0 +omni_shadow_mode = 1 +omni_shadow_detail = 1 + + diff --git a/misc/window_management/project.godot b/misc/window_management/project.godot index 93507d28..dc8f20a6 100644 --- a/misc/window_management/project.godot +++ b/misc/window_management/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -13,9 +13,6 @@ config_version=3 config/name="Window Management" run/main_scene="res://window_management.tscn" config/icon="res://icon.png" -icon="res://icon.png" -main_scene="res://window_management.tscn" -name="Window Management" [display] diff --git a/misc/window_management/window_management.tscn b/misc/window_management/window_management.tscn index cb953351..e4ea069d 100644 --- a/misc/window_management/window_management.tscn +++ b/misc/window_management/window_management.tscn @@ -22,7 +22,6 @@ layers = 1 material_override = null cast_shadow = 1 extra_cull_margin = 0.0 -visible_in_all_rooms = false use_in_baked_light = false lod_min_distance = 0.0 lod_min_hysteresis = 0.0 diff --git a/networking/simple_multiplayer/bomb.gd b/networking/multiplayer_bomber/bomb.gd similarity index 100% rename from networking/simple_multiplayer/bomb.gd rename to networking/multiplayer_bomber/bomb.gd diff --git a/networking/simple_multiplayer/bomb.tscn b/networking/multiplayer_bomber/bomb.tscn similarity index 100% rename from networking/simple_multiplayer/bomb.tscn rename to networking/multiplayer_bomber/bomb.tscn diff --git a/networking/simple_multiplayer/brickfloor.png b/networking/multiplayer_bomber/brickfloor.png similarity index 100% rename from networking/simple_multiplayer/brickfloor.png rename to networking/multiplayer_bomber/brickfloor.png diff --git a/networking/simple_multiplayer/brickfloor.png.import b/networking/multiplayer_bomber/brickfloor.png.import similarity index 96% rename from networking/simple_multiplayer/brickfloor.png.import rename to networking/multiplayer_bomber/brickfloor.png.import index e107c8a7..89b969bf 100644 --- a/networking/simple_multiplayer/brickfloor.png.import +++ b/networking/multiplayer_bomber/brickfloor.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/networking/simple_multiplayer/charwalk.png b/networking/multiplayer_bomber/charwalk.png similarity index 100% rename from networking/simple_multiplayer/charwalk.png rename to networking/multiplayer_bomber/charwalk.png diff --git a/networking/simple_multiplayer/charwalk.png.import b/networking/multiplayer_bomber/charwalk.png.import similarity index 96% rename from networking/simple_multiplayer/charwalk.png.import rename to networking/multiplayer_bomber/charwalk.png.import index 8c2253f5..965cfe33 100644 --- a/networking/simple_multiplayer/charwalk.png.import +++ b/networking/multiplayer_bomber/charwalk.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/networking/simple_multiplayer/explosion.png b/networking/multiplayer_bomber/explosion.png similarity index 100% rename from networking/simple_multiplayer/explosion.png rename to networking/multiplayer_bomber/explosion.png diff --git a/networking/simple_multiplayer/explosion.png.import b/networking/multiplayer_bomber/explosion.png.import similarity index 96% rename from networking/simple_multiplayer/explosion.png.import rename to networking/multiplayer_bomber/explosion.png.import index 12e5656f..256294fe 100644 --- a/networking/simple_multiplayer/explosion.png.import +++ b/networking/multiplayer_bomber/explosion.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/networking/simple_multiplayer/gamestate.gd b/networking/multiplayer_bomber/gamestate.gd similarity index 100% rename from networking/simple_multiplayer/gamestate.gd rename to networking/multiplayer_bomber/gamestate.gd diff --git a/networking/simple_multiplayer/lobby.gd b/networking/multiplayer_bomber/lobby.gd similarity index 100% rename from networking/simple_multiplayer/lobby.gd rename to networking/multiplayer_bomber/lobby.gd diff --git a/networking/simple_multiplayer/lobby.tscn b/networking/multiplayer_bomber/lobby.tscn similarity index 73% rename from networking/simple_multiplayer/lobby.tscn rename to networking/multiplayer_bomber/lobby.tscn index 4e75d317..1247e2a6 100644 --- a/networking/simple_multiplayer/lobby.tscn +++ b/networking/multiplayer_bomber/lobby.tscn @@ -4,8 +4,11 @@ [node name="lobby" type="Control"] -anchor_right = 1 -anchor_bottom = 1 +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 size_flags_horizontal = 2 @@ -15,10 +18,15 @@ script = ExtResource( 1 ) [node name="players" type="Panel" parent="."] visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 393.0 margin_top = 113.0 margin_right = 645.0 margin_bottom = 468.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -26,10 +34,15 @@ size_flags_vertical = 2 [node name="label" type="Label" parent="players"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 26.0 margin_top = 18.0 margin_right = 142.0 margin_bottom = 32.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -41,10 +54,15 @@ max_lines_visible = -1 [node name="start" type="Button" parent="players"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 68.0 margin_top = 307.0 margin_right = 193.0 margin_bottom = 336.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -58,20 +76,33 @@ flat = false [node name="list" type="ItemList" parent="players"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 25.0 margin_top = 37.0 margin_right = 229.0 margin_bottom = 296.0 +rect_pivot_offset = Vector2( 0, 0 ) mouse_filter = 0 size_flags_horizontal = 2 size_flags_vertical = 2 +items = [ ] +select_mode = 0 +icon_mode = 1 [node name="connect" type="Panel" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 370.0 margin_top = 157.0 margin_right = 647.0 margin_bottom = 324.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -79,10 +110,15 @@ size_flags_vertical = 2 [node name="name_label" type="Label" parent="connect"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 14.0 margin_top = 11.0 margin_right = 56.0 margin_bottom = 25.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -94,10 +130,15 @@ max_lines_visible = -1 [node name="name" type="LineEdit" parent="connect"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 17.0 margin_top = 30.0 margin_right = 173.0 margin_bottom = 54.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -111,10 +152,15 @@ caret_blink_speed = 0.65 [node name="ip_label" type="Label" parent="connect"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 15.0 margin_top = 66.0 margin_right = 57.0 margin_bottom = 80.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -126,10 +172,15 @@ max_lines_visible = -1 [node name="ip" type="LineEdit" parent="connect"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 17.0 margin_top = 85.0 margin_right = 173.0 margin_bottom = 109.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -143,10 +194,15 @@ caret_blink_speed = 0.65 [node name="host" type="Button" parent="connect"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 181.0 margin_top = 31.0 margin_right = 246.0 margin_bottom = 51.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -160,10 +216,15 @@ flat = false [node name="join" type="Button" parent="connect"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 181.0 margin_top = 87.0 margin_right = 246.0 margin_bottom = 107.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -177,10 +238,15 @@ flat = false [node name="error_label" type="Label" parent="connect"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 15.0 margin_top = 125.0 margin_right = 257.0 margin_bottom = 139.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -194,8 +260,13 @@ max_lines_visible = -1 [node name="error" type="AcceptDialog" parent="."] visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 55.0 margin_bottom = 58.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 diff --git a/networking/simple_multiplayer/montserrat.otf b/networking/multiplayer_bomber/montserrat.otf similarity index 100% rename from networking/simple_multiplayer/montserrat.otf rename to networking/multiplayer_bomber/montserrat.otf diff --git a/networking/simple_multiplayer/player.gd b/networking/multiplayer_bomber/player.gd similarity index 100% rename from networking/simple_multiplayer/player.gd rename to networking/multiplayer_bomber/player.gd diff --git a/networking/simple_multiplayer/player.tscn b/networking/multiplayer_bomber/player.tscn similarity index 100% rename from networking/simple_multiplayer/player.tscn rename to networking/multiplayer_bomber/player.tscn diff --git a/networking/simple_multiplayer/project.godot b/networking/multiplayer_bomber/project.godot similarity index 95% rename from networking/simple_multiplayer/project.godot rename to networking/multiplayer_bomber/project.godot index 7db2a7c1..7281cd9f 100644 --- a/networking/simple_multiplayer/project.godot +++ b/networking/multiplayer_bomber/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -12,8 +12,6 @@ config_version=3 config/name="Multiplayer Bomber" run/main_scene="res://lobby.tscn" -main_scene="res://lobby.tscn" -name="Multiplayer Bomber" [autoload] diff --git a/networking/simple_multiplayer/rock.gd b/networking/multiplayer_bomber/rock.gd similarity index 100% rename from networking/simple_multiplayer/rock.gd rename to networking/multiplayer_bomber/rock.gd diff --git a/networking/simple_multiplayer/rock.tscn b/networking/multiplayer_bomber/rock.tscn similarity index 100% rename from networking/simple_multiplayer/rock.tscn rename to networking/multiplayer_bomber/rock.tscn diff --git a/networking/simple_multiplayer/rock_bit.png b/networking/multiplayer_bomber/rock_bit.png similarity index 100% rename from networking/simple_multiplayer/rock_bit.png rename to networking/multiplayer_bomber/rock_bit.png diff --git a/networking/simple_multiplayer/rock_bit.png.import b/networking/multiplayer_bomber/rock_bit.png.import similarity index 96% rename from networking/simple_multiplayer/rock_bit.png.import rename to networking/multiplayer_bomber/rock_bit.png.import index 36c2f47c..b56652fc 100644 --- a/networking/simple_multiplayer/rock_bit.png.import +++ b/networking/multiplayer_bomber/rock_bit.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/networking/simple_multiplayer/score.gd b/networking/multiplayer_bomber/score.gd similarity index 100% rename from networking/simple_multiplayer/score.gd rename to networking/multiplayer_bomber/score.gd diff --git a/networking/simple_multiplayer/tile_scene.tscn b/networking/multiplayer_bomber/tile_scene.tscn similarity index 100% rename from networking/simple_multiplayer/tile_scene.tscn rename to networking/multiplayer_bomber/tile_scene.tscn diff --git a/networking/simple_multiplayer/tileset.tres b/networking/multiplayer_bomber/tileset.tres similarity index 100% rename from networking/simple_multiplayer/tileset.tres rename to networking/multiplayer_bomber/tileset.tres diff --git a/networking/simple_multiplayer/world.tscn b/networking/multiplayer_bomber/world.tscn similarity index 100% rename from networking/simple_multiplayer/world.tscn rename to networking/multiplayer_bomber/world.tscn diff --git a/networking/multiplayer_pong/ball.png.import b/networking/multiplayer_pong/ball.png.import index 110a99ab..93253891 100644 --- a/networking/multiplayer_pong/ball.png.import +++ b/networking/multiplayer_pong/ball.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/networking/multiplayer_pong/ball.tscn b/networking/multiplayer_pong/ball.tscn index 532c6fff..70190ffc 100644 --- a/networking/multiplayer_pong/ball.tscn +++ b/networking/multiplayer_pong/ball.tscn @@ -11,13 +11,12 @@ radius = 5.11969 [node name="ball" type="Area2D"] input_pickable = true -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false gravity_vec = Vector2( 0, 1 ) gravity = 98.0 linear_damp = 0.1 angular_damp = 1.0 +audio_bus_override = false +audio_bus_name = "Master" script = ExtResource( 1 ) [node name="sprite" type="Sprite" parent="."] @@ -27,5 +26,5 @@ texture = ExtResource( 2 ) [node name="shape" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) -trigger = false -_update_shape_index = 0 + + diff --git a/networking/multiplayer_pong/icon.png.import b/networking/multiplayer_pong/icon.png.import index 627820bd..42e94a35 100644 --- a/networking/multiplayer_pong/icon.png.import +++ b/networking/multiplayer_pong/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/networking/multiplayer_pong/lobby.tscn b/networking/multiplayer_pong/lobby.tscn index d6fa8a49..53a03136 100644 --- a/networking/multiplayer_pong/lobby.tscn +++ b/networking/multiplayer_pong/lobby.tscn @@ -4,8 +4,13 @@ [node name="lobby" type="Control"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +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 size_flags_horizontal = 2 @@ -14,10 +19,15 @@ script = ExtResource( 1 ) [node name="title" type="Label" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 210.0 margin_top = 40.0 margin_right = 430.0 margin_bottom = 80.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -31,10 +41,15 @@ max_lines_visible = -1 [node name="panel" type="Panel" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 210.0 margin_top = 160.0 margin_right = 430.0 margin_bottom = 270.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -42,10 +57,15 @@ size_flags_vertical = 2 [node name="address_label" type="Label" parent="panel"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 10.0 margin_right = 62.0 margin_bottom = 24.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -57,10 +77,15 @@ max_lines_visible = -1 [node name="address" type="LineEdit" parent="panel"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 30.0 margin_right = 210.0 margin_bottom = 54.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -74,10 +99,15 @@ caret_blink_speed = 0.65 [node name="host" type="Button" parent="panel"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 60.0 margin_right = 90.0 margin_bottom = 80.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -91,10 +121,15 @@ flat = false [node name="join" type="Button" parent="panel"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 130.0 margin_top = 60.0 margin_right = 210.0 margin_bottom = 80.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 size_flags_horizontal = 2 @@ -108,10 +143,15 @@ flat = false [node name="status_ok" type="Label" parent="panel"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 90.0 margin_right = 210.0 margin_bottom = 104.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 @@ -124,10 +164,15 @@ max_lines_visible = -1 [node name="status_fail" type="Label" parent="panel"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 10.0 margin_top = 90.0 margin_right = 210.0 margin_bottom = 104.0 +rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 size_flags_horizontal = 2 diff --git a/networking/multiplayer_pong/paddle.png.import b/networking/multiplayer_pong/paddle.png.import index a942a1fd..26657b34 100644 --- a/networking/multiplayer_pong/paddle.png.import +++ b/networking/multiplayer_pong/paddle.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/networking/multiplayer_pong/paddle.tscn b/networking/multiplayer_pong/paddle.tscn index a62944e1..5522411c 100644 --- a/networking/multiplayer_pong/paddle.tscn +++ b/networking/multiplayer_pong/paddle.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://paddle.gd" type="Script" id=1] [ext_resource path="res://paddle.png" type="Texture" id=2] @@ -12,13 +12,12 @@ height = 23.6064 [node name="paddle" type="Area2D"] input_pickable = true -shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -shapes/0/trigger = false gravity_vec = Vector2( 0, 1 ) gravity = 98.0 linear_damp = 0.1 angular_damp = 1.0 +audio_bus_override = false +audio_bus_name = "Master" script = ExtResource( 1 ) left = false @@ -29,23 +28,28 @@ texture = ExtResource( 2 ) [node name="shape" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) -trigger = false -_update_shape_index = 0 [node name="you" type="Label" parent="."] -focus_ignore_mouse = true -focus_stop_mouse = true -size_flags_horizontal = 2 -size_flags_vertical = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = -26.0 margin_top = -33.0 margin_right = 27.0 margin_bottom = -19.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 0 text = "You" align = 1 percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[connection signal="area_entered" from="." to="." method="_on_paddle_area_enter" binds=[ ]] +[connection signal="area_entered" from="." to="." method="_on_paddle_area_enter"] + + diff --git a/networking/multiplayer_pong/pong.tscn b/networking/multiplayer_pong/pong.tscn index 63cb4ebf..24a7b650 100644 --- a/networking/multiplayer_pong/pong.tscn +++ b/networking/multiplayer_pong/pong.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://pong.gd" type="Script" id=1] [ext_resource path="res://separator.png" type="Texture" id=2] @@ -36,14 +36,19 @@ position = Vector2( 320.387, 189.525 ) [node name="score_left" type="Label" parent="."] -focus_ignore_mouse = true -focus_stop_mouse = true -size_flags_horizontal = 2 -size_flags_vertical = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 240.0 margin_top = 10.0 margin_right = 280.0 margin_bottom = 30.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 0 text = "0" align = 1 percent_visible = 1.0 @@ -52,14 +57,19 @@ max_lines_visible = -1 [node name="score_right" type="Label" parent="."] -focus_ignore_mouse = true -focus_stop_mouse = true -size_flags_horizontal = 2 -size_flags_vertical = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 360.0 margin_top = 10.0 margin_right = 400.0 margin_bottom = 30.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 0 text = "0" align = 1 percent_visible = 1.0 @@ -69,14 +79,19 @@ max_lines_visible = -1 [node name="winner_left" type="Label" parent="."] visible = false -focus_ignore_mouse = true -focus_stop_mouse = true -size_flags_horizontal = 2 -size_flags_vertical = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 190.0 margin_top = 170.0 margin_right = 267.0 margin_bottom = 184.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 0 text = "The Winner!" percent_visible = 1.0 lines_skipped = 0 @@ -85,14 +100,19 @@ max_lines_visible = -1 [node name="winner_right" type="Label" parent="."] visible = false -focus_ignore_mouse = true -focus_stop_mouse = true -size_flags_horizontal = 2 -size_flags_vertical = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 380.0 margin_top = 170.0 margin_right = 457.0 margin_bottom = 184.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 0 text = "The Winner!" percent_visible = 1.0 lines_skipped = 0 @@ -101,20 +121,28 @@ max_lines_visible = -1 [node name="exit_game" type="Button" parent="."] visible = false -focus_ignore_mouse = false -focus_stop_mouse = true -size_flags_horizontal = 2 -size_flags_vertical = 2 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 280.0 margin_top = 340.0 margin_right = 360.0 margin_bottom = 360.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "Exit Game" flat = false -[connection signal="pressed" from="exit_game" to="." method="_on_exit_game_pressed" binds=[ ]] +[connection signal="pressed" from="exit_game" to="." method="_on_exit_game_pressed"] + + [editable path="player1"] [editable path="player2"] diff --git a/networking/multiplayer_pong/project.godot b/networking/multiplayer_pong/project.godot index e01d2034..5d740665 100644 --- a/networking/multiplayer_pong/project.godot +++ b/networking/multiplayer_pong/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/networking/multiplayer_pong/separator.png.import b/networking/multiplayer_pong/separator.png.import index 01df17d9..dddf5bb0 100644 --- a/networking/multiplayer_pong/separator.png.import +++ b/networking/multiplayer_pong/separator.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/viewport/2d_in_3d/2D_in_3D.gd b/viewport/2d_in_3d/2D_in_3D.gd index 329a5d0c..577f0eee 100644 --- a/viewport/2d_in_3d/2D_in_3D.gd +++ b/viewport/2d_in_3d/2D_in_3D.gd @@ -4,11 +4,11 @@ func _ready(): # Get the viewport and clear it var viewport = get_node("Viewport") viewport.set_clear_mode(Viewport.CLEAR_MODE_ONLY_NEXT_FRAME) - + # Let two frames pass to make sure the vieport's is captured yield(get_tree(), "idle_frame") yield(get_tree(), "idle_frame") - + # Retrieve the texture and set it to the viewport quad get_node("Viewport_quad").material_override.albedo_texture = viewport.get_texture() - + diff --git a/viewport/2d_in_3d/2D_in_3D.tscn b/viewport/2d_in_3d/2D_in_3D.tscn index affddd1e..ea7802d0 100644 --- a/viewport/2d_in_3d/2D_in_3D.tscn +++ b/viewport/2d_in_3d/2D_in_3D.tscn @@ -69,7 +69,6 @@ uv2_offset = Vector3( 0, 0, 0 ) uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false -proximity_fade_distance = 1.0 distance_fade_enable = false script = SubResource( 2 ) _sections_unfolded = [ "Roughness" ] @@ -148,7 +147,9 @@ ssao_intensity2 = 1.0 ssao_bias = 0.01 ssao_light_affect = 0.0 ssao_color = Color( 0, 0, 0, 1 ) -ssao_blur = true +ssao_quality = 0 +ssao_blur = 1 +ssao_edge_sharpness = 4.0 dof_blur_far_enabled = false dof_blur_far_distance = 10.0 dof_blur_far_transition = 5.0 @@ -236,7 +237,6 @@ uv2_offset = Vector3( 0, 0, 0 ) uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false -proximity_fade_distance = 1.0 distance_fade_enable = false _sections_unfolded = [ "Albedo" ] @@ -320,7 +320,6 @@ uv2_offset = Vector3( 0, 0, 0 ) uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false -proximity_fade_distance = 1.0 distance_fade_enable = false [node name="2D_in_3D" type="Spatial"] diff --git a/viewport/2d_in_3d/default_env.tres b/viewport/2d_in_3d/default_env.tres index 0dd90843..2aeff64a 100644 --- a/viewport/2d_in_3d/default_env.tres +++ b/viewport/2d_in_3d/default_env.tres @@ -66,7 +66,9 @@ ssao_intensity2 = 1.0 ssao_bias = 0.01 ssao_light_affect = 0.0 ssao_color = Color( 0, 0, 0, 1 ) -ssao_blur = true +ssao_quality = 0 +ssao_blur = 1 +ssao_edge_sharpness = 4.0 dof_blur_far_enabled = false dof_blur_far_distance = 10.0 dof_blur_far_transition = 5.0 diff --git a/viewport/2d_in_3d/project.godot b/viewport/2d_in_3d/project.godot index d32f76a3..ebde1959 100644 --- a/viewport/2d_in_3d/project.godot +++ b/viewport/2d_in_3d/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/viewport/3d_in_2d/default_env.tres b/viewport/3d_in_2d/default_env.tres index dcff6d17..e47e9993 100644 --- a/viewport/3d_in_2d/default_env.tres +++ b/viewport/3d_in_2d/default_env.tres @@ -67,7 +67,9 @@ ssao_intensity2 = 1.0 ssao_bias = 0.01 ssao_light_affect = 0.0 ssao_color = Color( 0, 0, 0, 1 ) -ssao_blur = true +ssao_quality = 0 +ssao_blur = 1 +ssao_edge_sharpness = 4.0 dof_blur_far_enabled = false dof_blur_far_distance = 10.0 dof_blur_far_transition = 5.0 diff --git a/viewport/3d_in_2d/player.scn b/viewport/3d_in_2d/player.scn index 6ba33b86..e8c2dcf8 100644 Binary files a/viewport/3d_in_2d/player.scn and b/viewport/3d_in_2d/player.scn differ diff --git a/viewport/3d_in_2d/project.godot b/viewport/3d_in_2d/project.godot index fbfed817..79420249 100644 --- a/viewport/3d_in_2d/project.godot +++ b/viewport/3d_in_2d/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/viewport/gui_in_3d/Gui_in_3D.tscn b/viewport/gui_in_3d/Gui_in_3D.tscn index d0bfe71d..80648d45 100644 --- a/viewport/gui_in_3d/Gui_in_3D.tscn +++ b/viewport/gui_in_3d/Gui_in_3D.tscn @@ -58,7 +58,6 @@ uv2_offset = Vector3( 0, 0, 0 ) uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false -proximity_fade_distance = 1.0 distance_fade_enable = false script = SubResource( 1 ) _sections_unfolded = [ "UV1" ] @@ -193,7 +192,6 @@ uv2_offset = Vector3( 0, 0, 0 ) uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false -proximity_fade_distance = 1.0 distance_fade_enable = false _sections_unfolded = [ "Albedo" ] diff --git a/viewport/gui_in_3d/default_env.tres b/viewport/gui_in_3d/default_env.tres index d5bffde2..105f30ee 100644 --- a/viewport/gui_in_3d/default_env.tres +++ b/viewport/gui_in_3d/default_env.tres @@ -75,7 +75,9 @@ ssao_intensity2 = 1.0 ssao_bias = 0.01 ssao_light_affect = 0.0 ssao_color = Color( 0, 0, 0, 1 ) -ssao_blur = true +ssao_quality = 0 +ssao_blur = 1 +ssao_edge_sharpness = 4.0 dof_blur_far_enabled = false dof_blur_far_distance = 10.0 dof_blur_far_transition = 5.0 diff --git a/viewport/gui_in_3d/gui_3d.gd b/viewport/gui_in_3d/gui_3d.gd index 89e462d7..798158b0 100644 --- a/viewport/gui_in_3d/gui_3d.gd +++ b/viewport/gui_in_3d/gui_3d.gd @@ -8,7 +8,7 @@ var viewport = null func _input(event): - #Check if the event is a non-mouse event + # Check if the event is a non-mouse event var is_mouse_event = false var mouse_events = [InputEventMouseButton, InputEventMouseMotion, InputEventScreenDrag, InputEventScreenTouch] for mouse_event in mouse_events: diff --git a/viewport/gui_in_3d/project.godot b/viewport/gui_in_3d/project.godot index 90c8e071..781c6ef9 100644 --- a/viewport/gui_in_3d/project.godot +++ b/viewport/gui_in_3d/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/viewport/screen_capture/CaptureScreen.tscn b/viewport/screen_capture/capture_screen.tscn similarity index 99% rename from viewport/screen_capture/CaptureScreen.tscn rename to viewport/screen_capture/capture_screen.tscn index 697fbbe5..ca69cd64 100644 --- a/viewport/screen_capture/CaptureScreen.tscn +++ b/viewport/screen_capture/capture_screen.tscn @@ -35,6 +35,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 texture = ExtResource( 2 ) expand = true +stretch_mode = 0 _sections_unfolded = [ "Anchor" ] [node name="capture" type="TextureRect" parent="."] diff --git a/viewport/screen_capture/default_env.tres b/viewport/screen_capture/default_env.tres index 3236a130..2aeff64a 100644 --- a/viewport/screen_capture/default_env.tres +++ b/viewport/screen_capture/default_env.tres @@ -24,7 +24,7 @@ texture_size = 2 background_mode = 2 background_sky = SubResource( 1 ) -background_sky_scale = 1.0 +background_sky_custom_fov = 0.0 background_color = Color( 0, 0, 0, 1 ) background_energy = 1.0 background_canvas_max_layer = 0 @@ -66,7 +66,9 @@ ssao_intensity2 = 1.0 ssao_bias = 0.01 ssao_light_affect = 0.0 ssao_color = Color( 0, 0, 0, 1 ) -ssao_blur = true +ssao_quality = 0 +ssao_blur = 1 +ssao_edge_sharpness = 4.0 dof_blur_far_enabled = false dof_blur_far_distance = 10.0 dof_blur_far_transition = 5.0 diff --git a/viewport/screen_capture/project.godot b/viewport/screen_capture/project.godot index 1dbe72df..f26dcdc4 100644 --- a/viewport/screen_capture/project.godot +++ b/viewport/screen_capture/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters @@ -10,7 +10,8 @@ config_version=3 [application] -config/name="screen capture" +config/name="Screen capture" +run/main_scene="res://capture_screen.tscn" config/icon="res://icon.png" [gdnative] diff --git a/viewport/screen_capture/screen_capture.gd b/viewport/screen_capture/screen_capture.gd index e558b666..445cd598 100644 --- a/viewport/screen_capture/screen_capture.gd +++ b/viewport/screen_capture/screen_capture.gd @@ -11,16 +11,16 @@ func _on_button_pressed(): # Let two frames pass to make sure the screen was captured yield(get_tree(), "idle_frame") yield(get_tree(), "idle_frame") - + # Retrieve the captured image var img = get_viewport().get_texture().get_data() # Flip it on the y-axis (because it's flipped) img.flip_y() - + # Create a texture for it var tex = ImageTexture.new() tex.create_from_image(img) - + # Set it to the capture node get_node("capture").set_texture(tex) diff --git a/visual_script/visual_pong/ball.png.import b/visual_script/visual_pong/ball.png.import index 110a99ab..93253891 100644 --- a/visual_script/visual_pong/ball.png.import +++ b/visual_script/visual_pong/ball.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/visual_script/visual_pong/icon.png.import b/visual_script/visual_pong/icon.png.import index 627820bd..42e94a35 100644 --- a/visual_script/visual_pong/icon.png.import +++ b/visual_script/visual_pong/icon.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/visual_script/visual_pong/left_pallete.png.import b/visual_script/visual_pong/left_pallete.png.import index 1507466d..6a57da04 100644 --- a/visual_script/visual_pong/left_pallete.png.import +++ b/visual_script/visual_pong/left_pallete.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/visual_script/visual_pong/project.godot b/visual_script/visual_pong/project.godot index 1e2458e2..91e2e6c1 100644 --- a/visual_script/visual_pong/project.godot +++ b/visual_script/visual_pong/project.godot @@ -1,8 +1,8 @@ ; Engine configuration file. ; It's best edited using the editor UI and not directly, ; since the parameters that go here are not all obvious. -; -; Format: +; +; Format: ; [section] ; section goes between [] ; param=value ; assign values to parameters diff --git a/visual_script/visual_pong/right_pallete.png.import b/visual_script/visual_pong/right_pallete.png.import index e1ee6687..aac3bcbf 100644 --- a/visual_script/visual_pong/right_pallete.png.import +++ b/visual_script/visual_pong/right_pallete.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0 diff --git a/visual_script/visual_pong/separator.png.import b/visual_script/visual_pong/separator.png.import index 01df17d9..dddf5bb0 100644 --- a/visual_script/visual_pong/separator.png.import +++ b/visual_script/visual_pong/separator.png.import @@ -21,3 +21,4 @@ process/HDR_as_SRGB=false stream=false size_limit=0 detect_3d=true +svg/scale=1.0