Merge pull request #184 from TwistedTwigleg/Demo_cleanup_for_Godot_3

Demo cleanup for godot 3
2026-01-04 23:10:08 +01:00 · 2018-01-09 20:16:34 +01:00
parent b37c8be2b2 b09fd3382f
commit 93427c5936
11 changed files with 235 additions and 60 deletions
--- a/2d/hexagonal_map/map.tscn
+++ b/2d/hexagonal_map/map.tscn
@@ -3,9 +3,9 @@
 [ext_resource path="res://tileset.tres" type="TileSet" id=1]
 [ext_resource path="res://troll.tscn" type="PackedScene" id=2]

-[node name="Node2D" type="Node2D"]
+[node name="Node2D" type="Node2D" index="0"]

-[node name="TileMap" type="TileMap" parent="."]
+[node name="TileMap" type="TileMap" parent="." index="0"]

 mode = 0
 tile_set = ExtResource( 1 )
@@ -15,15 +15,18 @@ cell_custom_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
 cell_half_offset = 1
 cell_tile_origin = 1
 cell_y_sort = false
+cell_clip_uv = false
 collision_use_kinematic = false
 collision_friction = 1.0
 collision_bounce = 0.0
 collision_layer = 1
 collision_mask = 1
 occluder_light_mask = 1
-tile_data = PoolIntArray( -393210, 1073741831, -327676, 1073741831, -327675, 1073741831, -327674, 6, -327673, 1073741831, -327672, 1073741830, -327671, 1073741830, -327670, 6, -327669, 8, -262142, 1073741831, -262141, 1073741831, -262140, 1073741831, -262139, 1073741830, -262138, 1073741831, -262137, 6, -262136, 6, -262135, 6, -262134, 6, -262133, 6, -262132, 0, -262131, 0, -196606, 1073741831, -196605, 1073741831, -196604, 6, -196603, 6, -196602, 0, -196601, 6, -196600, 1, -196599, 0, -196598, 1, -196597, 1, -196596, 0, -196595, 0, -196594, 0, -131071, 9, -131070, 1073741832, -131069, 1073741830, -131068, 2, -131067, 2, -131066, 1073741845, -131065, 21, -131064, 19, -131063, 1073741826, -131062, 0, -131061, 16, -131060, 0, -131059, 0, -131058, 0, -131057, 0, -131056, 0, -65534, 0, -65533, 1, -65532, 1073741827, -65531, 1073741846, -65530, 20, -65529, 19, -65528, 2, -65527, 0, -65526, 14, -65525, 0, -65524, 0, -65523, 0, -65522, 0, -65521, 0, -65520, 0, -65519, 0, 3, 1, 4, 2, 5, 1073741827, 6, 1, 7, 1, 8, 0, 9, 10, 10, 12, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0, 16, 0, 17, 0, 65538, 0, 65539, 0, 65540, 2, 65541, 1073741826, 65542, 1, 65543, 15, 65544, 0, 65545, 0, 65546, 0, 65547, 0, 65548, 0, 65549, 0, 65550, 0, 65551, 0, 65552, 0, 65553, 0, 131074, 0, 131075, 1, 131076, 1610612749, 131077, 1, 131078, 0, 131079, 0, 131080, 0, 131081, 0, 131082, 1610612753, 131083, 0, 131084, 0, 131085, 0, 131086, 0, 131087, 1073741848, 131088, 1073741849, 131089, 0, 196610, 0, 196611, 0, 196612, 0, 196613, 0, 196614, 1610612751, 196615, 1610612752, 196616, 1610612752, 196617, 1610612751, 196618, 1610612751, 196619, 0, 196620, 0, 196621, 0, 196622, 0, 196623, 0, 262149, 0, 262150, 1610612751, 262151, 1610612752, 262152, 1610612751, 262153, 1610612751, 262154, 1073741839, 262155, 1073741839, 262156, 0, 262157, 0, 262158, 0, 327687, 0, 327689, 0, 327691, 0, 327693, 0 )
+format = 1
+tile_data = PoolIntArray( -458747, 0, 0, -458746, 0, 0, -393212, 0, 0, -393211, 0, 0, -393210, 0, 0, -393209, 0, 0, -393208, 0, 0, -393207, 0, 0, -327678, 0, 0, -327677, 0, 0, -327676, 0, 0, -327675, 6, 0, -327674, 6, 0, -327673, 6, 0, -327672, 6, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0, -262142, 0, 0, -262141, 0, 0, -262140, 6, 0, -262139, 6, 0, -262138, 6, 0, -262137, 6, 0, -262136, 6, 0, -262135, 0, 0, -262134, 0, 0, -262133, 0, 0, -262132, 0, 0, -262131, 0, -1200553578, -196606, 0, 0, -196605, 0, 0, -196604, 6, 0, -196603, 6, 0, -196602, 6, 0, -196601, 6, 0, -196600, 1, 0, -196599, 0, 0, -196598, 1, 0, -196597, 1, 0, -196596, 0, 0, -196595, 0, -1200553578, -196594, 0, -1200553578, -131071, 9, 0, -131070, 0, 0, -131069, 0, 0, -131068, 2, 0, -131067, 2, 0, -131066, 0, 0, -131065, 21, 0, -131064, 19, 0, -131063, 0, 0, -131062, 0, 0, -131061, 16, -1200553578, -131060, 0, -1200553578, -131059, 0, 0, -131058, 0, 0, -131057, 0, 0, -131056, 0, -1200553578, -65534, 0, 0, -65533, 1, 0, -65532, 0, 0, -65531, 0, 0, -65530, 20, 0, -65529, 19, 0, -65528, 2, 0, -65527, 0, 0, -65526, 14, 0, -65525, 0, -1200553578, -65524, 0, 0, -65523, 0, 0, -65522, 23, 0, -65521, 0, 0, -65520, 0, -1200553578, -65519, 0, -1200553578, 3, 1, 0, 4, 2, 0, 5, 0, 0, 6, 1, 0, 7, 1, -1200553578, 8, 0, -1200553578, 9, 10, -1200553578, 10, 12, -1200553578, 11, 0, -1200553578, 12, 0, 0, 13, 8, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, 0, 0, 65538, 0, -1200553578, 65539, 0, 0, 65540, 2, 0, 65541, 0, 0, 65542, 1, 0, 65543, 15, -1200553578, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 25, 0, 65550, 8, 0, 65551, 0, 0, 65552, 21, 0, 65553, 0, 0, 131074, 0, -1200553578, 131075, 1, 0, 131076, 0, 0, 131077, 1, 0, 131078, 0, 0, 131079, 0, 0, 131080, 0, 0, 131081, 5, 0, 131082, 0, 0, 131083, 0, 0, 131084, 0, 0, 131085, 0, 0, 131086, 0, 0, 131087, 0, 0, 131088, 0, 0, 131089, 0, 0, 196610, 0, -1200553578, 196611, 0, 0, 196612, 0, 0, 196613, 23, 0, 196614, 0, 0, 196615, 0, 0, 196616, 0, 0, 196617, 5, 0, 196618, 5, 0, 196619, 0, 0, 196620, 0, 0, 196621, 0, 0, 196622, 0, 0, 196623, 23, 0, 196624, 0, 0, 262148, 0, 0, 262149, 0, 0, 262150, 0, 0, 262151, 0, 0, 262152, 8, 0, 262153, 5, 0, 262154, 5, 0, 262155, 0, 0, 262156, 0, 0, 262157, 21, 0, 262158, 0, 0, 262159, 0, 0, 262160, 0, 0, 327686, 0, 0, 327687, 0, 0, 327688, 0, 0, 327689, 0, 0, 327690, 0, 0, 327691, 0, 0, 327692, 0, 0, 327693, 0, 0, 327694, 0, 0 )
+_sections_unfolded = [ "Cell" ]

-[node name="troll" parent="." instance=ExtResource( 2 )]
+[node name="troll" parent="." index="1" instance=ExtResource( 2 )]

 position = Vector2( 602.819, -39.2876 )

--- a/2d/isometric/dungeon.tscn
+++ b/2d/isometric/dungeon.tscn
@@ -3,9 +3,9 @@
 [ext_resource path="res://tileset.tres" type="TileSet" id=1]
 [ext_resource path="res://troll.tscn" type="PackedScene" id=2]

-[node name="dungeon" type="Node2D"]
+[node name="dungeon" type="Node2D" index="0"]

-[node name="floor" type="TileMap" parent="."]
+[node name="floor" type="TileMap" parent="." index="0"]

 mode = 1
 tile_set = ExtResource( 1 )
@@ -15,15 +15,17 @@ cell_custom_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
 cell_half_offset = 2
 cell_tile_origin = 1
 cell_y_sort = false
+cell_clip_uv = false
 collision_use_kinematic = false
 collision_friction = 1.0
 collision_bounce = 0.0
 collision_layer = 1
 collision_mask = 1
 occluder_light_mask = 1
-tile_data = PoolIntArray( -851956, 0, -851955, 0, -851954, 0, -786420, 1, -786419, 0, -786418, 0, -720884, 0, -720883, 0, -720882, 0, -655348, 1, -655347, 0, -655346, 0, -589812, 1, -589811, 0, -589810, 0, -524276, 0, -524275, 1, -524274, 0, -458740, 0, -458739, 0, -458738, 0, -393210, 0, -393209, 0, -393208, 0, -393207, 0, -393206, 0, -393205, 0, -393204, 0, -393203, 0, -393202, 0, -327674, 0, -327673, 0, -327672, 1, -327671, 1, -327670, 1, -327669, 1, -327668, 1, -327667, 0, -327666, 0, -262138, 0, -262137, 0, -262136, 0, -262135, 0, -262134, 0, -262133, 0, -262132, 0, -262131, 0, -262130, 0, -196602, 0, -196601, 0, -196600, 0, -196599, 0, -196598, 0, -196597, 0, -196596, 0, -196595, 0, -196594, 0, -131066, 0, -131065, 0, -131064, 0, -131063, 0, -65530, 0, -65529, 0, -65528, 0, -65527, 0, 6, 0, 7, 1, 8, 0, 9, 0, 65542, 0, 65543, 0, 65544, 0, 65545, 0, 131078, 0, 131079, 0, 131080, 0, 131081, 0, 196614, 0, 196615, 0, 196616, 0 )
+format = 1
+tile_data = PoolIntArray( -851956, 0, -1200553578, -851955, 0, -1200553578, -851954, 0, -1200553578, -786420, 1, -1200553578, -786419, 0, -1200553578, -786418, 0, -1200553578, -720884, 0, -1200553578, -720883, 0, -1200553578, -720882, 0, -1200553578, -655348, 1, -1200553578, -655347, 0, -1200553578, -655346, 0, -1200553578, -589812, 1, -1200553578, -589811, 0, -1200553578, -589810, 0, -1200553578, -524276, 0, -1200553578, -524275, 1, -1200553578, -524274, 0, -1200553578, -458740, 0, -1200553578, -458739, 0, -1200553578, -458738, 0, -1200553578, -393210, 0, -1200553578, -393209, 0, -1200553578, -393208, 0, -1200553578, -393207, 0, -1200553578, -393206, 0, -1200553578, -393205, 0, -1200553578, -393204, 0, -1200553578, -393203, 0, -1200553578, -393202, 0, -1200553578, -327674, 0, -1200553578, -327673, 0, -1200553578, -327672, 1, -1200553578, -327671, 1, -1200553578, -327670, 1, -1200553578, -327669, 1, -1200553578, -327668, 1, -1200553578, -327667, 0, -1200553578, -327666, 0, -1200553578, -262138, 0, -1200553578, -262137, 0, -1200553578, -262136, 0, -1200553578, -262135, 0, -1200553578, -262134, 0, -1200553578, -262133, 0, -1200553578, -262132, 0, -1200553578, -262131, 0, -1200553578, -262130, 0, -1200553578, -196602, 0, -1200553578, -196601, 0, -1200553578, -196600, 0, -1200553578, -196599, 0, -1200553578, -196598, 0, -1200553578, -196597, 0, -1200553578, -196596, 0, -1200553578, -196595, 0, -1200553578, -196594, 0, -1200553578, -131066, 0, -1200553578, -131065, 0, -1200553578, -131064, 0, -1200553578, -131063, 0, -1200553578, -65530, 0, -1200553578, -65529, 0, -1200553578, -65528, 0, -1200553578, -65527, 0, -1200553578, 6, 0, -1200553578, 7, 1, -1200553578, 8, 0, -1200553578, 9, 0, -1200553578, 65542, 0, -1200553578, 65543, 0, -1200553578, 65544, 0, -1200553578, 65545, 0, -1200553578, 131078, 0, -1200553578, 131079, 0, -1200553578, 131080, 0, -1200553578, 131081, 0, -1200553578, 196614, 0, -1200553578, 196615, 0, -1200553578, 196616, 0, -1200553578 )

-[node name="walls" type="TileMap" parent="."]
+[node name="walls" type="TileMap" parent="." index="1"]

 mode = 1
 tile_set = ExtResource( 1 )
@@ -33,17 +35,18 @@ cell_custom_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
 cell_half_offset = 2
 cell_tile_origin = 1
 cell_y_sort = true
+cell_clip_uv = false
 collision_use_kinematic = false
 collision_friction = 1.0
 collision_bounce = 0.0
 collision_layer = 1
 collision_mask = 1
 occluder_light_mask = 1
-tile_data = PoolIntArray( -917493, 2, -917492, 2, -917491, 2, -917490, 2, -917489, 2, -851957, 2, -851956, 3, -851954, 3, -851953, 2, -786421, 2, -786420, 3, -786418, 3, -786417, 2, -720885, 2, -720881, 2, -655349, 2, -655348, 2, -655346, 3, -655345, 2, -589813, 2, -589809, 2, -524277, 2, -524273, 2, -458747, 2, -458746, 2, -458745, 2, -458744, 536870916, -458743, 536870916, -458742, 2, -458741, 2, -458740, 2, -458738, 2, -458737, 2, -393211, 2, -393209, 3, -393205, 3, -393201, 2, -327675, 4, -327665, 2, -262139, 4, -262134, 3, -262133, 3, -262129, 2, -196603, 2, -196601, 3, -196593, 2, -131067, 2, -131066, 3, -131062, 2, -131061, 2, -131060, 2, -131059, 2, -131058, 2, -131057, 2, -65531, 2, -65530, 2, -65527, 2, -65526, 2, 5, 2, 10, 2, 65541, 2, 65543, 3, 65546, 2, 131077, 2, 131082, 2, 196613, 2, 196618, 2, 262149, 2, 262150, 2, 262151, 2, 262152, 2, 262153, 2, 262154, 2 )
+format = 1
+tile_data = PoolIntArray( -917493, 2, -1200553578, -917492, 2, -1200553578, -917491, 2, -1200553578, -917490, 2, -1200553578, -917489, 2, -1200553578, -851957, 2, -1200553578, -851956, 3, -1200553578, -851954, 3, -1200553578, -851953, 2, -1200553578, -786421, 2, -1200553578, -786420, 3, -1200553578, -786418, 3, -1200553578, -786417, 2, -1200553578, -720885, 2, -1200553578, -720881, 2, -1200553578, -655349, 2, -1200553578, -655348, 2, -1200553578, -655346, 3, -1200553578, -655345, 2, -1200553578, -589813, 2, -1200553578, -589809, 2, -1200553578, -524277, 2, -1200553578, -524273, 2, -1200553578, -458747, 2, -1200553578, -458746, 2, -1200553578, -458745, 2, -1200553578, -458744, 536870916, -1200553578, -458743, 536870916, -1200553578, -458742, 2, -1200553578, -458741, 2, -1200553578, -458740, 2, -1200553578, -458738, 2, -1200553578, -458737, 2, -1200553578, -393211, 2, -1200553578, -393209, 3, -1200553578, -393205, 3, -1200553578, -393201, 2, -1200553578, -327675, 4, -1200553578, -327665, 2, -1200553578, -262139, 4, -1200553578, -262134, 3, -1200553578, -262133, 3, -1200553578, -262129, 2, -1200553578, -196603, 2, -1200553578, -196601, 3, -1200553578, -196593, 2, -1200553578, -131067, 2, -1200553578, -131066, 3, -1200553578, -131062, 2, -1200553578, -131061, 2, -1200553578, -131060, 2, -1200553578, -131059, 2, -1200553578, -131058, 2, -1200553578, -131057, 2, -1200553578, -65531, 2, -1200553578, -65530, 2, -1200553578, -65527, 2, -1200553578, -65526, 2, -1200553578, 5, 2, -1200553578, 10, 2, -1200553578, 65541, 2, -1200553578, 65543, 3, -1200553578, 65546, 2, -1200553578, 131077, 2, -1200553578, 131082, 2, -1200553578, 196613, 2, -1200553578, 196618, 2, -1200553578, 262149, 2, -1200553578, 262150, 2, -1200553578, 262151, 2, -1200553578, 262152, 2, -1200553578, 262153, 2, -1200553578, 262154, 2, -1200553578 )

-[node name="troll" parent="walls" instance=ExtResource( 2 )]
+[node name="troll" parent="walls" index="0" instance=ExtResource( 2 )]

-position = Vector2( 299.38, 326.037 )
-collision/safe_margin = 0.08
+position = Vector2( 368.142, 347.007 )


--- a/2d/physics_platformer/bullet.tscn
+++ b/2d/physics_platformer/bullet.tscn
@@ -1,23 +1,69 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=7 format=2]

 [ext_resource path="res://bullet.gd" type="Script" id=1]
 [ext_resource path="res://bullet.png" type="Texture" id=2]

-[sub_resource type="CircleShape2D" id=1]
+[sub_resource type="CanvasItemMaterial" id=1]
+
+render_priority = 0
+blend_mode = 1
+light_mode = 0
+
+[sub_resource type="ParticlesMaterial" id=4]
+
+render_priority = 0
+trail_divisor = 1
+emission_shape = 0
+flag_align_y = false
+flag_rotate_y = false
+flag_disable_z = true
+spread = 0.0
+flatness = 0.0
+gravity = Vector3( 0, 0, 0 )
+initial_velocity = 1.0
+initial_velocity_random = 0.0
+angular_velocity = 38.0
+angular_velocity_random = 0.0
+orbit_velocity = 0.0
+orbit_velocity_random = 0.0
+linear_accel = 0.0
+linear_accel_random = 0.0
+radial_accel = 0.0
+radial_accel_random = 0.0
+tangential_accel = 0.0
+tangential_accel_random = 0.0
+damping = 0.0
+damping_random = 0.0
+angle = 0.0
+angle_random = 0.0
+scale = 0.8
+scale_random = 0.0
+color = Color( 1, 1, 1, 1 )
+hue_variation = 0.0
+hue_variation_random = 0.0
+anim_speed = 0.0
+anim_speed_random = 0.0
+anim_offset = 0.0
+anim_offset_random = 0.0
+anim_loop = false
+_sections_unfolded = [ "Scale" ]
+
+[sub_resource type="CircleShape2D" id=2]

 custom_solver_bias = 0.0
 radius = 10.0

-[sub_resource type="Animation" id=2]
+[sub_resource type="Animation" id=3]

 length = 1.5
 loop = false
-step = 0.0
+step = 0.1
 tracks/0/type = "method"
 tracks/0/path = NodePath(".")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
+tracks/0/enabled = true
 tracks/0/keys = {
 "times": PoolRealArray( 1.31 ),
 "transitions": PoolRealArray( 1 ),
@@ -31,12 +77,25 @@ tracks/1/path = NodePath("sprite:modulate")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/imported = false
+tracks/1/enabled = true
 tracks/1/keys = {
 "times": PoolRealArray( 0, 1.03 ),
 "transitions": PoolRealArray( 1, 1 ),
 "update": 0,
 "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
 }
+tracks/2/type = "value"
+tracks/2/path = NodePath("Particles2D:self_modulate")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0, 0.5 ),
+"transitions": PoolRealArray( 1, 1 ),
+"update": 0,
+"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
+}

 [node name="bullet" type="RigidBody2D"]

@@ -60,29 +119,50 @@ angular_velocity = 0.0
 angular_damp = -1.0
 script = ExtResource( 1 )

-[node name="particles" type="Node2D" parent="."]
+[node name="Particles2D" type="Particles2D" parent="." index="0"]

-[node name="sprite" type="Sprite" parent="."]
+material = SubResource( 1 )
+emitting = true
+amount = 8
+lifetime = 0.3
+one_shot = false
+preprocess = 0.0
+speed_scale = 3.0
+explosiveness = 0.0
+randomness = 0.0
+fixed_fps = 0
+fract_delta = true
+visibility_rect = Rect2( -100, -100, 200, 200 )
+local_coords = false
+draw_order = 0
+process_material = SubResource( 4 )
+texture = ExtResource( 2 )
+normal_map = null
+h_frames = 1
+v_frames = 1
+_sections_unfolded = [ "Process Material", "Time", "Visibility" ]
+
+[node name="sprite" type="Sprite" parent="." index="1"]

 texture = ExtResource( 2 )

-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="2"]

-shape = SubResource( 1 )
+shape = SubResource( 2 )

-[node name="Timer" type="Timer" parent="."]
+[node name="Timer" type="Timer" parent="." index="3"]

 process_mode = 1
 wait_time = 1.0
 one_shot = true
 autostart = false

-[node name="anim" type="AnimationPlayer" parent="."]
+[node name="anim" type="AnimationPlayer" parent="." index="4"]

 playback_process_mode = 1
 playback_default_blend_time = 0.0
 root_node = NodePath("..")
-anims/shutdown = SubResource( 2 )
+anims/shutdown = SubResource( 3 )
 playback/active = true
 playback/speed = 1.0
 blend_times = [  ]
--- a/2d/physics_platformer/project.godot
+++ b/2d/physics_platformer/project.godot
@@ -18,6 +18,7 @@ config/icon="res://icon.png"

 window/size/width=800
 window/size/height=480
+window/stretch/mode="2d"
 stretch/aspect="keep_height"
 stretch/mode="2d"

@@ -42,6 +43,7 @@ move_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name
 ]
 shoot=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null)
 ]
 spawn=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777244,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
--- a/2d/platformer/bullet.tscn
+++ b/2d/platformer/bullet.tscn
@@ -9,14 +9,13 @@ render_priority = 0
 blend_mode = 0
 light_mode = 0

-[sub_resource type="CanvasItemMaterial" id=2]
+[sub_resource type="CanvasItemMaterial" id=8]

 render_priority = 0
 blend_mode = 1
 light_mode = 0
-_sections_unfolded = [ "Resource" ]

-[sub_resource type="ParticlesMaterial" id=3]
+[sub_resource type="ParticlesMaterial" id=7]

 render_priority = 0
 trail_divisor = 1
@@ -24,10 +23,10 @@ emission_shape = 0
 flag_align_y = false
 flag_rotate_y = false
 flag_disable_z = true
-spread = 10.0
+spread = 0.0
 flatness = 0.0
-gravity = Vector3( 0, 98, 0 )
-initial_velocity = 1.0
+gravity = Vector3( 0, 0, 0 )
+initial_velocity = 0.0
 initial_velocity_random = 0.0
 angular_velocity = 0.0
 angular_velocity_random = 0.0
@@ -43,17 +42,17 @@ damping = 0.0
 damping_random = 0.0
 angle = 0.0
 angle_random = 0.0
-scale = 1.0
+scale = 0.8
 scale_random = 0.0
-color = Color( 1, 1, 1, 1 )
+color = Color( 1, 1, 1, 0.705882 )
 hue_variation = 0.0
 hue_variation_random = 0.0
-anim_speed = 1.0
+anim_speed = 0.0
 anim_speed_random = 0.0
 anim_offset = 0.0
 anim_offset_random = 0.0
 anim_loop = false
-_sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Damping", "Emission Shape", "Flags", "Gravity", "Hue Variation", "Initial Velocity", "Linear Accel", "Orbit Velocity", "Radial Accel", "Scale", "Spread", "Tangential Accel", "Trail" ]
+_sections_unfolded = [ "Color", "Trail" ]

 [sub_resource type="CanvasItemMaterial" id=4]

@@ -70,12 +69,13 @@ radius = 10.0

 length = 1.5
 loop = false
-step = 0.0
+step = 0.1
 tracks/0/type = "method"
 tracks/0/path = NodePath(".")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
+tracks/0/enabled = true
 tracks/0/keys = {
 "times": PoolRealArray( 1.31 ),
 "transitions": PoolRealArray( 1 ),
@@ -89,6 +89,7 @@ tracks/1/path = NodePath("sprite:self_modulate")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/imported = false
+tracks/1/enabled = true
 tracks/1/keys = {
 "times": PoolRealArray( 0, 1 ),
 "transitions": PoolRealArray( 1, 1 ),
@@ -96,18 +97,19 @@ tracks/1/keys = {
 "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
 }
 tracks/2/type = "value"
-tracks/2/path = NodePath("particles:emitting")
+tracks/2/path = NodePath("Particles2D:self_modulate")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/imported = false
+tracks/2/enabled = true
 tracks/2/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 1,
-"values": [ false ]
+"times": PoolRealArray( 0, 0.5 ),
+"transitions": PoolRealArray( 1, 1 ),
+"update": 0,
+"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
 }

-[node name="bullet" type="RigidBody2D"]
+[node name="bullet" type="RigidBody2D" index="0"]

 material = SubResource( 1 )
 input_pickable = false
@@ -131,49 +133,48 @@ angular_damp = -1.0
 script = ExtResource( 1 )
 _sections_unfolded = [ "Angular", "Collision", "Linear", "Material", "Pickable", "Transform", "Visibility", "Z" ]

-[node name="particles" type="Particles2D" parent="."]
+[node name="Particles2D" type="Particles2D" parent="." index="0"]

-modulate = Color( 1, 1, 1, 0.56 )
-material = SubResource( 2 )
-emitting = false
-amount = 24
-lifetime = 0.1
+material = SubResource( 8 )
+emitting = true
+amount = 8
+lifetime = 0.3
 one_shot = false
 preprocess = 0.0
-speed_scale = 1.0
-explosiveness = 1.0
+speed_scale = 3.0
+explosiveness = 0.0
 randomness = 0.0
 fixed_fps = 0
 fract_delta = true
 visibility_rect = Rect2( -100, -100, 200, 200 )
 local_coords = false
 draw_order = 0
-process_material = SubResource( 3 )
+process_material = SubResource( 7 )
 texture = ExtResource( 2 )
 normal_map = null
 h_frames = 1
 v_frames = 1
-_sections_unfolded = [ "Drawing", "Material", "Process Material", "Textures", "Time", "Transform", "Visibility", "Z" ]
+_sections_unfolded = [ "Drawing", "Process Material", "Time", "Visibility" ]

-[node name="sprite" type="Sprite" parent="."]
+[node name="sprite" type="Sprite" parent="." index="1"]

 material = SubResource( 4 )
 texture = ExtResource( 2 )
 _sections_unfolded = [ "Animation", "Material", "Offset", "Region", "Transform", "Visibility", "Z" ]

-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="2"]

 shape = SubResource( 5 )
 _sections_unfolded = [ "Material", "Transform", "Visibility", "Z" ]

-[node name="Timer" type="Timer" parent="."]
+[node name="Timer" type="Timer" parent="." index="3"]

 process_mode = 1
 wait_time = 1.0
 one_shot = true
 autostart = true

-[node name="anim" type="AnimationPlayer" parent="."]
+[node name="anim" type="AnimationPlayer" parent="." index="4"]

 playback_process_mode = 1
 playback_default_blend_time = 0.0
--- a/2d/platformer/project.godot
+++ b/2d/platformer/project.godot
@@ -19,6 +19,7 @@ target_fps="60"

 window/size/width=800
 window/size/height=480
+window/stretch/mode="2d"
 stretch/aspect="keep_height"
 stretch/mode="2d"

@@ -43,6 +44,7 @@ move_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name
 ]
 shoot=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null)
 ]
 spawn=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777244,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
--- a/2d/sdf_font/default_environment.tres
+++ b/2d/sdf_font/default_environment.tres
@@ -0,0 +1,81 @@
+[gd_resource type="Environment" format=2]
+
+[resource]
+
+background_mode = 0
+background_sky_custom_fov = 0.0
+background_color = Color( 0, 0, 0, 1 )
+background_energy = 1.0
+background_canvas_max_layer = 0
+ambient_light_color = Color( 0, 0, 0, 1 )
+ambient_light_energy = 1.0
+ambient_light_sky_contribution = 1.0
+fog_enabled = false
+fog_color = Color( 0.5, 0.6, 0.7, 1 )
+fog_sun_color = Color( 1, 0.9, 0.7, 1 )
+fog_sun_amount = 0.0
+fog_depth_enabled = true
+fog_depth_begin = 10.0
+fog_depth_curve = 1.0
+fog_transmit_enabled = false
+fog_transmit_curve = 1.0
+fog_height_enabled = false
+fog_height_min = 0.0
+fog_height_max = 100.0
+fog_height_curve = 1.0
+tonemap_mode = 0
+tonemap_exposure = 1.0
+tonemap_white = 1.0
+auto_exposure_enabled = false
+auto_exposure_scale = 0.4
+auto_exposure_min_luma = 0.05
+auto_exposure_max_luma = 8.0
+auto_exposure_speed = 0.5
+ss_reflections_enabled = false
+ss_reflections_max_steps = 64
+ss_reflections_fade_in = 0.15
+ss_reflections_fade_out = 2.0
+ss_reflections_depth_tolerance = 0.2
+ss_reflections_roughness = true
+ssao_enabled = false
+ssao_radius = 1.0
+ssao_intensity = 1.0
+ssao_radius2 = 0.0
+ssao_intensity2 = 1.0
+ssao_bias = 0.01
+ssao_light_affect = 0.0
+ssao_color = Color( 0, 0, 0, 1 )
+ssao_quality = 0
+ssao_blur = 3
+ssao_edge_sharpness = 4.0
+dof_blur_far_enabled = false
+dof_blur_far_distance = 10.0
+dof_blur_far_transition = 5.0
+dof_blur_far_amount = 0.1
+dof_blur_far_quality = 1
+dof_blur_near_enabled = false
+dof_blur_near_distance = 2.0
+dof_blur_near_transition = 1.0
+dof_blur_near_amount = 0.1
+dof_blur_near_quality = 1
+glow_enabled = false
+glow_levels/1 = false
+glow_levels/2 = false
+glow_levels/3 = true
+glow_levels/4 = false
+glow_levels/5 = true
+glow_levels/6 = false
+glow_levels/7 = false
+glow_intensity = 0.8
+glow_strength = 1.0
+glow_bloom = 0.0
+glow_blend_mode = 2
+glow_hdr_threshold = 1.0
+glow_hdr_scale = 2.0
+glow_bicubic_upscale = false
+adjustment_enabled = false
+adjustment_brightness = 1.0
+adjustment_contrast = 1.0
+adjustment_saturation = 1.0
+_sections_unfolded = [ "Background" ]
+
--- a/2d/sdf_font/project.godot
+++ b/2d/sdf_font/project.godot
@@ -20,4 +20,4 @@ singletons=[  ]

 [rendering]

-environment/default_environment="res://default_env.tres"
+environment/default_environment="res://default_environment.tres"
--- a/gui/input_mapping/controls.gd
+++ b/gui/input_mapping/controls.gd
@@ -99,3 +99,6 @@ func _ready():
 		var button = get_node("bindings").get_node(action).get_node("Button")
 		button.text = OS.get_scancode_string(input_event.scancode)
 		button.connect("pressed", self, "wait_for_input", [action])
+	
+	# Do not start processing input until a button is pressed
+	set_process_input(false)
--- a/gui/rich_text_bbcode/rich_text_bbcode.tscn
+++ b/gui/rich_text_bbcode/rich_text_bbcode.tscn
@@ -38,14 +38,13 @@ use_filter = false
 font_data = ExtResource( 5 )
 _sections_unfolded = [ "Font", "Settings" ]

-[node name="Panel" type="Panel"]
+[node name="Panel" type="Panel" index="0"]

 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
@@ -54,7 +53,7 @@ __meta__ = {
 "__editor_plugin_screen__": "2D"
 }

-[node name="RichTextLabel" type="RichTextLabel" parent="."]
+[node name="RichTextLabel" type="RichTextLabel" parent="." index="0"]

 anchor_left = 0.0
 anchor_top = 0.0
@@ -65,6 +64,7 @@ margin_top = 55.0
 margin_right = -48.0
 margin_bottom = -62.0
 rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = true
 mouse_filter = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
@@ -81,7 +81,7 @@ It is also possible to include [img]res://unicorn_icon.png[/img] custom images,
 Left alignment is default,[center]but center alignment is supported,[/center][right]as well as right alignment.[/right]
 [fill]Fill alignment is also supported, and allows writing very long text that will end up fitting the horizontal space entirely with  words of joy.[/fill]

-For full reference [color=aqua][url=https://github.com/godotengine/godot/wiki/richtext_bbcode]check the wiki.[/url][/color]
+For full reference [color=aqua][url=http://docs.godotengine.org/en/latest/learning/features/gui/bbcode_in_richtextlabel.html]check the documentation.[/url][/color]
 "
 visible_characters = -1
 percent_visible = 1.0
--- a/misc/tween/main.gd
+++ b/misc/tween/main.gd
@@ -108,7 +108,7 @@ func reset_tween():
 		sprite.set_scale(Vector2(1,1))

 	if get_node("modes/rotate").is_pressed():
-		tween.interpolate_method(sprite, "set_rotation_in_degrees", 0, 360, 2, state.trans, state.eases)
+		tween.interpolate_method(sprite, "set_rotation_degrees", 0, 360, 2, state.trans, state.eases)
 		tween.interpolate_property(sprite, "rotation_degrees", 360, 0, 2, state.trans, state.eases, 2)

 	if get_node("modes/callback").is_pressed():