Merge pull request #341 from Calinou/handle-multiple-resolutions

Handle multiple resolutions in most demos

Author: aaronfranke

2d/finite_state_machine/Demo.tscn

@@ -1,20 +1,25 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://player/Player.tscn" type="PackedScene" id=1]
-[ext_resource path="res://debug/StatesStackDiplayer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://debug/ControlsPanel.tscn" type="PackedScene" id=3]
-[ext_resource path="res://debug/Explanations.tscn" type="PackedScene" id=4]
+[ext_resource path="res://debug/ControlsPanel.tscn" type="PackedScene" id=1]
+[ext_resource path="res://debug/Explanations.tscn" type="PackedScene" id=2]
+[ext_resource path="res://debug/StatesStackDiplayer.tscn" type="PackedScene" id=3]
+[ext_resource path="res://player/Player.tscn" type="PackedScene" id=4]
 
 [node name="Demo" type="Node"]
 
-[node name="Player" parent="." instance=ExtResource( 1 )]
-editor/display_folded = true
+[node name="Player" parent="." instance=ExtResource( 4 )]
 
-[node name="StatesStackDiplayer" parent="." instance=ExtResource( 2 )]
+[node name="Explanations" parent="." instance=ExtResource( 2 )]
 
-[node name="ControlsPanel" parent="." instance=ExtResource( 3 )]
+[node name="Control" type="Control" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
-[node name="Explanations" parent="." instance=ExtResource( 4 )]
+[node name="StatesStackDiplayer" parent="Control" instance=ExtResource( 3 )]
 
+[node name="ControlsPanel" parent="Control" instance=ExtResource( 1 )]
 
 [editable path="Player"]

2d/finite_state_machine/debug/ControlsPanel.tscn

@@ -1,14 +1,15 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://debug/top_level_ui.gd" type="Script" id=1]
 [ext_resource path="res://fonts/source_code_pro_explanations.tres" type="DynamicFont" id=2]
 
 [node name="ControlsPanel" type="Panel"]
 anchor_left = 1.0
 anchor_right = 1.0
 margin_left = -220.0
 margin_bottom = 170.0
-script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="Keys" type="Label" parent="."]
 anchor_right = 1.0
@@ -38,4 +39,3 @@ X
 Space
 Shift"
 align = 2
-

2d/finite_state_machine/debug/Explanations.tscn

@@ -1,8 +1,7 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://fonts/source_code_pro_explanations_bold.tres" type="DynamicFont" id=1]
 [ext_resource path="res://fonts/source_code_pro_explanations.tres" type="DynamicFont" id=2]
-[ext_resource path="res://debug/top_level_ui.gd" type="Script" id=3]
 
 [node name="Explanations" type="RichTextLabel"]
 anchor_right = 1.0
@@ -35,8 +34,6 @@ States are common in games. You can use the pattern to:
 3. Improve your code's structure. Look at the scene tree and FileSystem tab: without looking at the code, you'll know what the Player can or cannot do.
 
 You can read more about States in the excellent Game Programming Patterns ebook."
-script = ExtResource( 3 )
 __meta__ = {
 "_edit_lock_": true
 }
-

2d/finite_state_machine/debug/StatesStackDiplayer.tscn

@@ -46,4 +46,3 @@ margin_bottom = 170.0
 custom_fonts/font = SubResource( 1 )
 text = "1.
 2."
-

2d/finite_state_machine/debug/states_stack_displayer.gd

@@ -1,9 +1,6 @@
 extends Panel
 
-onready var fsm_node = get_node("../Player/StateMachine")
-
-func _ready():
-	set_as_toplevel(true)
+onready var fsm_node = get_node("../../Player/StateMachine")
 
 func _process(delta):
 	var states_names = ''

2d/finite_state_machine/debug/top_level_ui.gd

@@ -11,4 +11,3 @@ ground_curve = 0.01
 [resource]
 background_mode = 2
 background_sky = SubResource( 1 )
-

2d/finite_state_machine/default_env.tres

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

2d/finite_state_machine/icon.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/body.png-313f6363670a5852a7b7126ab476d8b1.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/body.png-313f6363670a5852a7b7126ab476d8b1.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

2d/finite_state_machine/player/body.png.import

@@ -1,5 +1,5 @@
 """
-The Player is a KinematicBody2D, in other words a physics-driven object. 
+The Player is a KinematicBody2D, in other words a physics-driven object.
 It can move, collide with the world...
 It HAS a state machine, but the body and the state machine are separate.
 """