diff --git a/source/Main.tscn b/source/Main.tscn index 034fc53..8983d4a 100644 --- a/source/Main.tscn +++ b/source/Main.tscn @@ -145,7 +145,7 @@ extra_spacing_bottom = 5 font_data = ExtResource( 13 ) _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] -[node name="Main" type="WorldEnvironment"] +[node name="Main" type="WorldEnvironment" index="0"] environment = ExtResource( 1 ) script = ExtResource( 2 ) diff --git a/source/Start.tscn b/source/Start.tscn index 61e0a04..7b2b15d 100644 --- a/source/Start.tscn +++ b/source/Start.tscn @@ -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://fonts/TitleFont.tres" type="DynamicFont" id=2] -[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=3] -[ext_resource path="res://fonts/ButtonFont.tres" type="DynamicFont" id=4] +[ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=3] +[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 use_mipmaps = false use_filter = false -font_data = ExtResource( 3 ) +font_data = ExtResource( 4 ) _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"] @@ -42,9 +51,9 @@ anchor_top = 0.0 anchor_right = 0.5 anchor_bottom = 0.0 margin_left = -250.0 -margin_top = -100.0 +margin_top = -109.0 margin_right = 250.0 -margin_bottom = -26.0 +margin_bottom = -69.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -54,15 +63,40 @@ size_flags_vertical = 4 custom_fonts/font = ExtResource( 2 ) 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 = "TETRIS -3000" +text = "TETRIS" +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 percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 _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_top = 0.5 @@ -78,7 +112,7 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -theme = SubResource( 2 ) +theme = SubResource( 3 ) min_value = 1.0 max_value = 15.0 step = 1.0 @@ -91,7 +125,7 @@ prefix = "Level " suffix = "" _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_top = 0.5 @@ -108,7 +142,7 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -custom_fonts/font = ExtResource( 4 ) +custom_fonts/font = ExtResource( 5 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null diff --git a/source/Stats.tscn b/source/Stats.tscn index 0ea80e2..b45545d 100644 --- a/source/Stats.tscn +++ b/source/Stats.tscn @@ -267,9 +267,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 153.0 -margin_right = 78.0 -margin_bottom = 170.0 +margin_left = -116.0 +margin_top = 205.0 +margin_right = -38.0 +margin_bottom = 222.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 diff --git a/source/Tetrominos/Mino/ExplodingMino.tscn b/source/Tetrominos/Mino/ExplodingMino.tscn index c9bbfe7..006f9de 100644 --- a/source/Tetrominos/Mino/ExplodingMino.tscn +++ b/source/Tetrominos/Mino/ExplodingMino.tscn @@ -36,7 +36,7 @@ flag_rotate_y = true flag_disable_z = false spread = 0.0 flatness = 0.0 -gravity = Vector3( 0, -20, 10 ) +gravity = Vector3( 0, -30, 5 ) initial_velocity = 100.0 initial_velocity_random = 1.0 angular_velocity = 210.0 @@ -63,7 +63,7 @@ anim_offset_random = 0.0 anim_loop = false _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 material_override = null diff --git a/source/Tetrominos/Mino/Mino.tscn b/source/Tetrominos/Mino/Mino.tscn index 4e1debf..fe5e0a1 100644 --- a/source/Tetrominos/Mino/Mino.tscn +++ b/source/Tetrominos/Mino/Mino.tscn @@ -162,7 +162,7 @@ subdivide_width = 0 subdivide_height = 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 ) _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"] -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 light_color = Color( 1, 1, 1, 1 ) light_energy = 16.0 light_indirect_energy = 1.0 light_negative = false -light_specular = 0.5 +light_specular = 0.86 light_bake_mode = 1 light_cull_mask = -1 shadow_enabled = false @@ -219,10 +219,10 @@ shadow_bias = 0.15 shadow_contact = 0.0 shadow_reverse_cull_face = false editor_only = false -spot_range = 20.0 +spot_range = 30.0 spot_attenuation = 0.5 spot_angle = 5.0 spot_angle_attenuation = 2.0 -_sections_unfolded = [ "Light", "Spot", "Transform" ] +_sections_unfolded = [ "Editor", "Light", "Spot", "Transform" ] diff --git a/source/Tetrominos/Mino/MinoMesh.tscn b/source/Tetrominos/Mino/MinoMesh.tscn index 7500a1b..0fa6088 100644 --- a/source/Tetrominos/Mino/MinoMesh.tscn +++ b/source/Tetrominos/Mino/MinoMesh.tscn @@ -2,8 +2,6 @@ [ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1] - - [sub_resource type="CubeMesh" id=1] custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) @@ -12,7 +10,7 @@ subdivide_width = 0 subdivide_height = 0 subdivide_depth = 0 -[node name="Mino" type="MeshInstance" index="0"] +[node name="Mino" type="MeshInstance"] layers = 1 material_override = null diff --git a/source/Tetrominos/TetroT.tscn b/source/Tetrominos/TetroT.tscn index 0f8dd94..aec1aac 100644 --- a/source/Tetrominos/TetroT.tscn +++ b/source/Tetrominos/TetroT.tscn @@ -6,6 +6,7 @@ [node name="TetroT" type="Spatial"] script = ExtResource( 1 ) +_sections_unfolded = [ "Transform" ] [node name="Mino0" parent="." index="0" instance=ExtResource( 2 )] diff --git a/source/splash.png b/source/splash.png index ff10590..eaed709 100644 Binary files a/source/splash.png and b/source/splash.png differ diff --git a/web/screenshot.png b/web/screenshot.png index 2814d71..e27db5f 100644 Binary files a/web/screenshot.png and b/web/screenshot.png differ