From 5ae62e44bc0fc0e89f819e9e99c08144408f16d5 Mon Sep 17 00:00:00 2001 From: Chris Bradfield Date: Mon, 25 Sep 2017 12:25:54 -0700 Subject: [PATCH] Change anchor settings due to Control changes --- HUD.tscn | 43 ++++++++++++++------------- Main.tscn | 4 +++ art/House In a Forest Loop.ogg.import | 1 + art/enemyFlyingAlt_1.png.import | 1 + art/enemyFlyingAlt_2.png.import | 1 + art/enemySwimming_1.png.import | 1 + art/enemySwimming_2.png.import | 1 + art/enemyWalking_1.png.import | 1 + art/enemyWalking_2.png.import | 1 + art/playerGrey_up1.png.import | 1 + art/playerGrey_up2.png.import | 1 + art/playerGrey_walk1.png.import | 1 + art/playerGrey_walk2.png.import | 1 + art/set3_tiles.png.import | 1 + icon.png.import | 1 + project.godot | 12 ++++++++ 16 files changed, 51 insertions(+), 21 deletions(-) diff --git a/HUD.tscn b/HUD.tscn index 2f4ec73..c084a70 100644 --- a/HUD.tscn +++ b/HUD.tscn @@ -37,10 +37,12 @@ script = ExtResource( 1 ) [node name="ScoreLabel" type="Label" parent="."] -anchor_left = 2 -anchor_right = 2 -margin_left = 240.0 -margin_right = -240.0 +anchor_left = 0.5 +anchor_top = 0.0 +anchor_right = 0.5 +anchor_bottom = 0.0 +margin_left = -25.0 +margin_right = 25.0 margin_bottom = 100.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -57,14 +59,13 @@ _sections_unfolded = [ "Anchor", "Margin", "custom_fonts" ] [node name="MessageLabel" type="Label" parent="."] -anchor_left = 2 -anchor_top = 2 -anchor_right = 2 -anchor_bottom = 2 -margin_left = 240.0 -margin_top = 260.0 -margin_right = -240.0 -margin_bottom = -60.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -200.0 +margin_top = -150.0 +margin_right = 200.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -89,14 +90,14 @@ autostart = false [node name="StartButton" type="Button" parent="."] -anchor_left = 2 -anchor_top = 2 -anchor_right = 2 -anchor_bottom = 2 -margin_left = 60.0 -margin_top = -70.0 -margin_right = -60.0 -margin_bottom = -150.0 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -100.0 +margin_top = -200.0 +margin_right = 100.0 +margin_bottom = -100.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -109,7 +110,7 @@ shortcut = null group = null text = "Start" flat = false -_sections_unfolded = [ "Visibility", "custom_fonts" ] +_sections_unfolded = [ "Anchor", "Margin", "Visibility", "custom_fonts" ] [connection signal="timeout" from="MessageTimer" to="." method="_on_MessageTimer_timeout"] diff --git a/Main.tscn b/Main.tscn index 1949ce0..8b52aec 100644 --- a/Main.tscn +++ b/Main.tscn @@ -21,6 +21,10 @@ Mob = ExtResource( 2 ) [node name="ColorRect" type="ColorRect" parent="."] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 486.0 margin_bottom = 734.0 rect_pivot_offset = Vector2( 0, 0 ) diff --git a/art/House In a Forest Loop.ogg.import b/art/House In a Forest Loop.ogg.import index 8ce9f57..ad28732 100644 --- a/art/House In a Forest Loop.ogg.import +++ b/art/House In a Forest Loop.ogg.import @@ -7,3 +7,4 @@ path="res://.import/House In a Forest Loop.ogg-1a6a72ae843ad792b7039931227e8d50. [params] loop=true +loop_offset=0 diff --git a/art/enemyFlyingAlt_1.png.import b/art/enemyFlyingAlt_1.png.import index 80a71dc..e4727a0 100644 --- a/art/enemyFlyingAlt_1.png.import +++ b/art/enemyFlyingAlt_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/art/enemyFlyingAlt_2.png.import b/art/enemyFlyingAlt_2.png.import index aedb83c..f582fb1 100644 --- a/art/enemyFlyingAlt_2.png.import +++ b/art/enemyFlyingAlt_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/art/enemySwimming_1.png.import b/art/enemySwimming_1.png.import index 17f0a64..cf62c2f 100644 --- a/art/enemySwimming_1.png.import +++ b/art/enemySwimming_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/art/enemySwimming_2.png.import b/art/enemySwimming_2.png.import index 990ea13..8d4d01b 100644 --- a/art/enemySwimming_2.png.import +++ b/art/enemySwimming_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/art/enemyWalking_1.png.import b/art/enemyWalking_1.png.import index 58b332b..71b815e 100644 --- a/art/enemyWalking_1.png.import +++ b/art/enemyWalking_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/art/enemyWalking_2.png.import b/art/enemyWalking_2.png.import index b0aec9f..b066b7b 100644 --- a/art/enemyWalking_2.png.import +++ b/art/enemyWalking_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/art/playerGrey_up1.png.import b/art/playerGrey_up1.png.import index 68bf24e..7cc6531 100644 --- a/art/playerGrey_up1.png.import +++ b/art/playerGrey_up1.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/art/playerGrey_up2.png.import b/art/playerGrey_up2.png.import index dde6e6b..740fb10 100644 --- a/art/playerGrey_up2.png.import +++ b/art/playerGrey_up2.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/art/playerGrey_walk1.png.import b/art/playerGrey_walk1.png.import index c8f3e87..64bac5f 100644 --- a/art/playerGrey_walk1.png.import +++ b/art/playerGrey_walk1.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/art/playerGrey_walk2.png.import b/art/playerGrey_walk2.png.import index 0280703..6ff7bde 100644 --- a/art/playerGrey_walk2.png.import +++ b/art/playerGrey_walk2.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/art/set3_tiles.png.import b/art/set3_tiles.png.import index e08ee0a..3518e4b 100644 --- a/art/set3_tiles.png.import +++ b/art/set3_tiles.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/icon.png.import b/icon.png.import index 627820b..42e94a3 100644 --- a/icon.png.import +++ b/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/project.godot b/project.godot index 10eeaad..78fcc30 100644 --- a/project.godot +++ b/project.godot @@ -1,3 +1,11 @@ +; 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: +; [section] ; section goes between [] +; param=value ; assign values to parameters + config_version=3 [application] @@ -16,6 +24,10 @@ window/size/width=480 window/size/height=720 window/size/resizable=false +[gdnative] + +singletons=[ ] + [rendering] environment/default_environment="res://default_env.tres"