This commit is contained in:
adrienmalin 2019-01-24 20:37:42 +01:00
parent 231ba2fbff
commit b7650efdf6
9 changed files with 63 additions and 29 deletions

View File

@ -145,7 +145,7 @@ extra_spacing_bottom = 5
font_data = ExtResource( 13 ) font_data = ExtResource( 13 )
_sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ]
[node name="Main" type="WorldEnvironment"] [node name="Main" type="WorldEnvironment" index="0"]
environment = ExtResource( 1 ) environment = ExtResource( 1 )
script = ExtResource( 2 ) script = ExtResource( 2 )

View File

@ -1,21 +1,30 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=9 format=2]
[ext_resource path="res://Start.gd" type="Script" id=1] [ext_resource path="res://Start.gd" type="Script" id=1]
[ext_resource path="res://fonts/TitleFont.tres" type="DynamicFont" id=2] [ext_resource path="res://fonts/TitleFont.tres" type="DynamicFont" id=2]
[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=3] [ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=3]
[ext_resource path="res://fonts/ButtonFont.tres" type="DynamicFont" id=4] [ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=4]
[ext_resource path="res://fonts/ButtonFont.tres" type="DynamicFont" id=5]
[sub_resource type="DynamicFont" id=1] [sub_resource type="DynamicFont" id=4]
size = 50
use_mipmaps = false
use_filter = false
font_data = ExtResource( 3 )
_sections_unfolded = [ "Font", "Settings" ]
[sub_resource type="DynamicFont" id=2]
size = 20 size = 20
use_mipmaps = false use_mipmaps = false
use_filter = false use_filter = false
font_data = ExtResource( 3 ) font_data = ExtResource( 4 )
_sections_unfolded = [ "Extra Spacing", "Font", "Font/fallback", "Settings" ] _sections_unfolded = [ "Extra Spacing", "Font", "Font/fallback", "Settings" ]
[sub_resource type="Theme" id=2] [sub_resource type="Theme" id=3]
default_font = SubResource( 1 ) default_font = SubResource( 2 )
[node name="Start" type="Control" index="0"] [node name="Start" type="Control" index="0"]
@ -42,9 +51,9 @@ anchor_top = 0.0
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 0.0 anchor_bottom = 0.0
margin_left = -250.0 margin_left = -250.0
margin_top = -100.0 margin_top = -109.0
margin_right = 250.0 margin_right = 250.0
margin_bottom = -26.0 margin_bottom = -69.0
rect_pivot_offset = Vector2( 0, 0 ) rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false rect_clip_content = false
mouse_filter = 2 mouse_filter = 2
@ -54,15 +63,40 @@ size_flags_vertical = 4
custom_fonts/font = ExtResource( 2 ) custom_fonts/font = ExtResource( 2 )
custom_colors/font_color = Color( 0.443137, 0.709804, 0.819608, 0.533333 ) custom_colors/font_color = Color( 0.443137, 0.709804, 0.819608, 0.533333 )
custom_colors/font_color_shadow = Color( 1, 1, 1, 0.101333 ) custom_colors/font_color_shadow = Color( 1, 1, 1, 0.101333 )
text = "TETRIS text = "TETRIS"
3000" align = 1
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "Theme", "custom_colors", "custom_fonts" ]
[node name="Label2" type="Label" parent="." index="1"]
anchor_left = 0.5
anchor_top = 0.0
anchor_right = 0.5
anchor_bottom = 0.0
margin_left = -250.0
margin_top = -75.0
margin_right = 250.0
margin_bottom = -19.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
custom_fonts/font = SubResource( 4 )
custom_colors/font_color = Color( 0.443137, 0.709804, 0.819608, 0.533333 )
custom_colors/font_color_shadow = Color( 1, 1, 1, 0.101333 )
text = "3000"
align = 1 align = 1
percent_visible = 1.0 percent_visible = 1.0
lines_skipped = 0 lines_skipped = 0
max_lines_visible = -1 max_lines_visible = -1
_sections_unfolded = [ "custom_colors", "custom_fonts" ] _sections_unfolded = [ "custom_colors", "custom_fonts" ]
[node name="SpinBox" type="SpinBox" parent="." index="1"] [node name="SpinBox" type="SpinBox" parent="." index="2"]
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
@ -78,7 +112,7 @@ mouse_filter = 0
mouse_default_cursor_shape = 0 mouse_default_cursor_shape = 0
size_flags_horizontal = 1 size_flags_horizontal = 1
size_flags_vertical = 1 size_flags_vertical = 1
theme = SubResource( 2 ) theme = SubResource( 3 )
min_value = 1.0 min_value = 1.0
max_value = 15.0 max_value = 15.0
step = 1.0 step = 1.0
@ -91,7 +125,7 @@ prefix = "Level "
suffix = "" suffix = ""
_sections_unfolded = [ "Margin", "Theme" ] _sections_unfolded = [ "Margin", "Theme" ]
[node name="PlayButton" type="Button" parent="." index="2"] [node name="PlayButton" type="Button" parent="." index="3"]
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
@ -108,7 +142,7 @@ mouse_filter = 0
mouse_default_cursor_shape = 0 mouse_default_cursor_shape = 0
size_flags_horizontal = 1 size_flags_horizontal = 1
size_flags_vertical = 1 size_flags_vertical = 1
custom_fonts/font = ExtResource( 4 ) custom_fonts/font = ExtResource( 5 )
toggle_mode = false toggle_mode = false
enabled_focus_mode = 2 enabled_focus_mode = 2
shortcut = null shortcut = null

View File

@ -267,9 +267,10 @@ anchor_left = 0.0
anchor_top = 0.0 anchor_top = 0.0
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
margin_top = 153.0 margin_left = -116.0
margin_right = 78.0 margin_top = 205.0
margin_bottom = 170.0 margin_right = -38.0
margin_bottom = 222.0
rect_pivot_offset = Vector2( 0, 0 ) rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false rect_clip_content = false
mouse_filter = 2 mouse_filter = 2

View File

@ -36,7 +36,7 @@ flag_rotate_y = true
flag_disable_z = false flag_disable_z = false
spread = 0.0 spread = 0.0
flatness = 0.0 flatness = 0.0
gravity = Vector3( 0, -20, 10 ) gravity = Vector3( 0, -30, 5 )
initial_velocity = 100.0 initial_velocity = 100.0
initial_velocity_random = 1.0 initial_velocity_random = 1.0
angular_velocity = 210.0 angular_velocity = 210.0
@ -63,7 +63,7 @@ anim_offset_random = 0.0
anim_loop = false anim_loop = false
_sections_unfolded = [ "Angular Velocity", "Color", "Emission Shape", "Gravity", "Initial Velocity", "Linear Accel", "Scale", "Spread" ] _sections_unfolded = [ "Angular Velocity", "Color", "Emission Shape", "Gravity", "Initial Velocity", "Linear Accel", "Scale", "Spread" ]
[node name="ExplodingMino" type="Particles" index="0"] [node name="ExplodingMino" type="Particles"]
layers = 1 layers = 1
material_override = null material_override = null

View File

@ -162,7 +162,7 @@ subdivide_width = 0
subdivide_height = 0 subdivide_height = 0
subdivide_depth = 0 subdivide_depth = 0
[node name="Mino" type="Spatial"] [node name="Mino" type="Spatial" index="0"]
transform = Transform( 0.997027, 0, 0, 0, 0.997027, 0, 0, 0, 0.997027, 0, 0, 0 ) transform = Transform( 0.997027, 0, 0, 0, 0.997027, 0, 0, 0, 0.997027, 0, 0, 0 )
_sections_unfolded = [ "Pause", "Transform", "Visibility" ] _sections_unfolded = [ "Pause", "Transform", "Visibility" ]
@ -204,13 +204,13 @@ _sections_unfolded = [ "Draw Passes", "Drawing", "Geometry", "LOD", "Process Mat
[node name="SpotLight" type="SpotLight" parent="." index="2"] [node name="SpotLight" type="SpotLight" parent="." index="2"]
transform = Transform( 1, 0, 0, 0, 0.0174524, 0.999848, 0, -0.999848, 0.0174524, 0, -0.5, 0.6 ) transform = Transform( 1, 0, 0, 0, 0.0174524, 0.999848, 0, -0.999848, 0.0174524, 0, 4, 1 )
layers = 1 layers = 1
light_color = Color( 1, 1, 1, 1 ) light_color = Color( 1, 1, 1, 1 )
light_energy = 16.0 light_energy = 16.0
light_indirect_energy = 1.0 light_indirect_energy = 1.0
light_negative = false light_negative = false
light_specular = 0.5 light_specular = 0.86
light_bake_mode = 1 light_bake_mode = 1
light_cull_mask = -1 light_cull_mask = -1
shadow_enabled = false shadow_enabled = false
@ -219,10 +219,10 @@ shadow_bias = 0.15
shadow_contact = 0.0 shadow_contact = 0.0
shadow_reverse_cull_face = false shadow_reverse_cull_face = false
editor_only = false editor_only = false
spot_range = 20.0 spot_range = 30.0
spot_attenuation = 0.5 spot_attenuation = 0.5
spot_angle = 5.0 spot_angle = 5.0
spot_angle_attenuation = 2.0 spot_angle_attenuation = 2.0
_sections_unfolded = [ "Light", "Spot", "Transform" ] _sections_unfolded = [ "Editor", "Light", "Spot", "Transform" ]

View File

@ -2,8 +2,6 @@
[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1] [ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1]
[sub_resource type="CubeMesh" id=1] [sub_resource type="CubeMesh" id=1]
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
@ -12,7 +10,7 @@ subdivide_width = 0
subdivide_height = 0 subdivide_height = 0
subdivide_depth = 0 subdivide_depth = 0
[node name="Mino" type="MeshInstance" index="0"] [node name="Mino" type="MeshInstance"]
layers = 1 layers = 1
material_override = null material_override = null

View File

@ -6,6 +6,7 @@
[node name="TetroT" type="Spatial"] [node name="TetroT" type="Spatial"]
script = ExtResource( 1 ) script = ExtResource( 1 )
_sections_unfolded = [ "Transform" ]
[node name="Mino0" parent="." index="0" instance=ExtResource( 2 )] [node name="Mino0" parent="." index="0" instance=ExtResource( 2 )]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 KiB

After

Width:  |  Height:  |  Size: 421 KiB