diff --git a/.gitignore b/.gitignore index c6d1c63..24c5026 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,6 @@ export_presets.cfg # Mono-specific ignores .mono/ + midi/FluidR3 GM.sf2 +release/ \ No newline at end of file diff --git a/ExplodingLine.tscn b/ExplodingLine.tscn index b29f056..754c74d 100644 --- a/ExplodingLine.tscn +++ b/ExplodingLine.tscn @@ -34,12 +34,12 @@ emission_box_extents = Vector3( 8, 0.5, 0.5 ) flag_align_y = false flag_rotate_y = true flag_disable_z = false -spread = 10.0 +spread = 30.0 flatness = 0.0 -gravity = Vector3( 0, -20, 0 ) +gravity = Vector3( 0, -30, 0 ) initial_velocity = 10.0 initial_velocity_random = 0.8 -angular_velocity = 197.74 +angular_velocity = 97.14 angular_velocity_random = 1.0 linear_accel = 100.0 linear_accel_random = 0.84 @@ -61,7 +61,7 @@ anim_speed_random = 0.0 anim_offset = 0.0 anim_offset_random = 0.0 anim_loop = false -_sections_unfolded = [ "Color", "Emission Shape", "Gravity", "Scale", "Spread" ] +_sections_unfolded = [ "Angular Velocity", "Color", "Emission Shape", "Gravity", "Scale", "Spread" ] [sub_resource type="PrismMesh" id=6] @@ -92,7 +92,7 @@ subdivide_width = 0 subdivide_height = 0 subdivide_depth = 0 -[node name="ExplodingLine" type="Particles" index="0"] +[node name="ExplodingLine" type="Particles"] layers = 1 material_override = null diff --git a/Main.gd b/Main.gd index 842569b..2e0db7b 100644 --- a/Main.gd +++ b/Main.gd @@ -236,6 +236,7 @@ func _notification(what): pause() MainLoop.NOTIFICATION_WM_QUIT_REQUEST: save_user_data() + get_tree().quit() func save_user_data(): var save_game = File.new() diff --git a/Main.tscn b/Main.tscn index 3767920..d205819 100644 --- a/Main.tscn +++ b/Main.tscn @@ -25,7 +25,7 @@ background_mode = 2 background_sky = SubResource( 1 ) background_sky_custom_fov = 0.0 background_color = Color( 0, 0, 0, 1 ) -background_energy = 2.0 +background_energy = 3.0 background_canvas_max_layer = 0 ambient_light_color = Color( 0.469971, 0.542197, 0.6875, 1 ) ambient_light_energy = 0.0 @@ -122,7 +122,7 @@ params_point_size = 1.0 params_billboard_mode = 0 params_grow = false params_use_alpha_scissor = false -albedo_color = Color( 0.601563, 0.775878, 1, 0.0338039 ) +albedo_color = Color( 0.601563, 0.775878, 1, 0.00784314 ) metallic = 0.0 metallic_specular = 0.0 metallic_texture_channel = 0 @@ -254,10 +254,10 @@ _sections_unfolded = [ "Transform" ] [node name="DirectionalLight" type="DirectionalLight" parent="." index="1"] -transform = Transform( 1, 0, 0, 0, 0.999391, -0.0348995, 0, 0.0348995, 0.999391, 0, 0, 50 ) +transform = Transform( 0.376951, 0.677372, -0.631724, -0.295744, 0.734355, 0.610949, 0.877749, -0.0434695, 0.477145, -20, 30, 0 ) layers = 1 light_color = Color( 1, 1, 1, 1 ) -light_energy = 0.5 +light_energy = 3.0 light_indirect_energy = 1.0 light_negative = false light_specular = 0.5 @@ -282,7 +282,6 @@ _sections_unfolded = [ "Light", "Transform" ] [node name="GridMap" type="GridMap" parent="." index="2"] -visible = false theme = ExtResource( 3 ) cell_size = Vector3( 1, 1, 1 ) cell_octant_size = 8 @@ -311,7 +310,7 @@ visible = false [node name="GridBack" type="MeshInstance" parent="Backs" index="0"] -transform = Transform( 10, 0, 0, 0, 20, 0, 0, 0, 0.1, 4.5, 9.5, -1 ) +transform = Transform( 10, 0, 0, 0, 20, 0, 0, 0, 1, 4.5, 9.5, 0 ) layers = 1 material_override = null cast_shadow = 1 @@ -328,7 +327,7 @@ _sections_unfolded = [ "Transform" ] [node name="HoldBack" type="MeshInstance" parent="Backs" index="1"] -transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 0.1, -5, 16, -1 ) +transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 1, -5, 16, 0 ) layers = 1 material_override = null cast_shadow = 1 @@ -345,7 +344,7 @@ _sections_unfolded = [ "Transform" ] [node name="NextBack" type="MeshInstance" parent="Backs" index="2"] -transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 0.1, 14, 16, -1 ) +transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 1, 14, 16, 0 ) layers = 1 material_override = null cast_shadow = 1 @@ -498,10 +497,10 @@ _sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ] [connection signal="piece_dropped" from="." to="Stats" method="_on_Main_piece_dropped"] -[connection signal="piece_locked" from="." to="MidiPlayer" method="_on_Main_piece_locked"] - [connection signal="piece_locked" from="." to="Stats" method="_on_Main_piece_locked"] +[connection signal="piece_locked" from="." to="MidiPlayer" method="_on_Main_piece_locked"] + [connection signal="timeout" from="DropTimer" to="." method="_on_DropTimer_timeout"] [connection signal="timeout" from="LockDelay" to="." method="_on_LockDelay_timeout"] diff --git a/MidiPlayer.gd b/MidiPlayer.gd index e44929b..4ef3e2b 100644 --- a/MidiPlayer.gd +++ b/MidiPlayer.gd @@ -7,7 +7,6 @@ const MOVE_CHANNELS = [3] func _ready(): mute_channels(MOVE_CHANNELS+LINE_CLEAR_CHANNELS) - resume() func resume(): play(position) diff --git a/Stats.tscn b/Stats.tscn index d957ead..690d707 100644 --- a/Stats.tscn +++ b/Stats.tscn @@ -21,14 +21,14 @@ _sections_unfolded = [ "Font", "Settings" ] [node name="Stats" type="MarginContainer" index="0"] -anchor_left = 0.4 -anchor_top = 0.6 -anchor_right = 0.6 -anchor_bottom = 0.6 -margin_left = -170.0 -margin_top = -70.0 -margin_right = -160.0 -margin_bottom = 140.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -230.0 +margin_top = -10.0 +margin_right = -120.0 +margin_bottom = 200.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 diff --git a/Tetrominos/Mino/Mino.tscn b/Tetrominos/Mino/Mino.tscn index 3d34596..ce82b56 100644 --- a/Tetrominos/Mino/Mino.tscn +++ b/Tetrominos/Mino/Mino.tscn @@ -207,7 +207,7 @@ _sections_unfolded = [ "Draw Passes", "Drawing", "Geometry", "LOD", "Process Mat transform = Transform( 1, 0, 0, 0, -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0.5 ) layers = 1 light_color = Color( 1, 1, 1, 1 ) -light_energy = 8.0 +light_energy = 16.0 light_indirect_energy = 1.0 light_negative = false light_specular = 0.5 diff --git a/Tetrominos/Mino/MinoMaterial.tres b/Tetrominos/Mino/MinoMaterial.tres index 5d25470..ff07883 100644 --- a/Tetrominos/Mino/MinoMaterial.tres +++ b/Tetrominos/Mino/MinoMaterial.tres @@ -31,7 +31,7 @@ roughness = 0.46 roughness_texture_channel = 0 emission_enabled = true emission = Color( 0.755859, 1, 0.914169, 1 ) -emission_energy = 0.7 +emission_energy = 1.0 emission_operator = 0 emission_on_uv2 = false normal_enabled = false diff --git a/icon.png b/icon.png deleted file mode 100644 index df023d1..0000000 Binary files a/icon.png and /dev/null differ diff --git a/icons/16.png b/icons/16.png new file mode 100644 index 0000000..2fbf557 Binary files /dev/null and b/icons/16.png differ diff --git a/icon.png.import b/icons/16.png.import similarity index 68% rename from icon.png.import rename to icons/16.png.import index 0041ef8..1b13d27 100644 --- a/icon.png.import +++ b/icons/16.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +path="res://.import/16.png-f3b4844aade9b270cbb38cff295ce33e.stex" [deps] -source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] +source_file="res://icons/16.png" +dest_files=[ "res://.import/16.png-f3b4844aade9b270cbb38cff295ce33e.stex" ] [params] diff --git a/icons/256.png b/icons/256.png new file mode 100644 index 0000000..81640a1 Binary files /dev/null and b/icons/256.png differ diff --git a/icons/256.png.import b/icons/256.png.import new file mode 100644 index 0000000..d000848 --- /dev/null +++ b/icons/256.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/256.png-9a56a9319a91fa74ee7ddb5c0b84a228.stex" + +[deps] + +source_file="res://icons/256.png" +dest_files=[ "res://.import/256.png-9a56a9319a91fa74ee7ddb5c0b84a228.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/icons/32.png b/icons/32.png new file mode 100644 index 0000000..19d1b02 Binary files /dev/null and b/icons/32.png differ diff --git a/icons/32.png.import b/icons/32.png.import new file mode 100644 index 0000000..a678029 --- /dev/null +++ b/icons/32.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/32.png-2c676109efa1e249139d639d1746eda5.stex" + +[deps] + +source_file="res://icons/32.png" +dest_files=[ "res://.import/32.png-2c676109efa1e249139d639d1746eda5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/icons/48.png b/icons/48.png new file mode 100644 index 0000000..daad90f Binary files /dev/null and b/icons/48.png differ diff --git a/icons/48.png.import b/icons/48.png.import new file mode 100644 index 0000000..78ab128 --- /dev/null +++ b/icons/48.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/48.png-477be3215ba369c304be5535b6005c78.stex" + +[deps] + +source_file="res://icons/48.png" +dest_files=[ "res://.import/48.png-477be3215ba369c304be5535b6005c78.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/icons/icon.ico b/icons/icon.ico new file mode 100644 index 0000000..2f7059a Binary files /dev/null and b/icons/icon.ico differ diff --git a/icons/splash.png b/icons/splash.png new file mode 100644 index 0000000..8db50a4 Binary files /dev/null and b/icons/splash.png differ diff --git a/icons/splash.png.import b/icons/splash.png.import new file mode 100644 index 0000000..c066c20 --- /dev/null +++ b/icons/splash.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/splash.png-47c0e91fea9ce360c80365c194f47837.stex" + +[deps] + +source_file="res://icons/splash.png" +dest_files=[ "res://.import/splash.png-47c0e91fea9ce360c80365c194f47837.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +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 12c00e1..97dc911 100644 --- a/project.godot +++ b/project.godot @@ -12,12 +12,15 @@ config_version=3 config/name="TETRIS 3000" run/main_scene="res://Main.tscn" -config/icon="res://icon.png" +boot_splash/image="res://icons/splash.png" +config/icon="res://icons/48.png" [display] window/size/width=500 window/size/height=500 +window/stretch/mode="2d" +window/stretch/aspect="expand" [gui] @@ -41,3 +44,7 @@ rotate_clockwise=[ Object(InputEventKey,"resource_local_to_scene":false,"resourc ] rotate_counterclockwise=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777238,"unicode":0,"echo":false,"script":null) ] + +[rendering] + +threads/thread_model=2