From e37cb87622eff5abd3d9aafe1f8cc80ff00624f9 Mon Sep 17 00:00:00 2001 From: adrienmalin <41926238+adrienmalin@users.noreply.github.com> Date: Tue, 29 Jan 2019 11:11:05 +0100 Subject: [PATCH] Godot 3.1 --- source/Environment.tres | 69 +--- source/Main.tscn | 443 ++--------------------- source/Tetrominos/Mino/MinoMaterial.tres | 42 +-- source/project.godot | 54 ++- 4 files changed, 82 insertions(+), 526 deletions(-) diff --git a/source/Environment.tres b/source/Environment.tres index 16da657..9dbb9a5 100644 --- a/source/Environment.tres +++ b/source/Environment.tres @@ -7,81 +7,16 @@ radiance_size = 0 [resource] resource_local_to_scene = true -background_mode = 0 +background_mode = 1 background_sky = SubResource( 1 ) -background_sky_custom_fov = 0.0 -background_color = Color( 0, 0, 0, 1 ) +background_color = Color( 0.0431373, 0.0235294, 0.137255, 1 ) background_energy = 0.0 -background_canvas_max_layer = 0 ambient_light_color = Color( 0.86908, 0.949502, 0.958984, 1 ) ambient_light_energy = 2.0 ambient_light_sky_contribution = 0.92 -fog_enabled = false -fog_color = Color( 0.5, 0.6, 0.7, 1 ) -fog_sun_color = Color( 1, 0.9, 0.7, 1 ) -fog_sun_amount = 0.0 -fog_depth_enabled = true -fog_depth_begin = 10.0 -fog_depth_curve = 1.0 -fog_transmit_enabled = false -fog_transmit_curve = 1.0 -fog_height_enabled = false -fog_height_min = 0.0 -fog_height_max = 100.0 -fog_height_curve = 1.0 tonemap_mode = 3 -tonemap_exposure = 1.0 -tonemap_white = 1.0 -auto_exposure_enabled = false -auto_exposure_scale = 0.4 -auto_exposure_min_luma = 0.05 auto_exposure_max_luma = 0.26 -auto_exposure_speed = 0.5 -ss_reflections_enabled = false -ss_reflections_max_steps = 64 -ss_reflections_fade_in = 0.15 -ss_reflections_fade_out = 2.0 -ss_reflections_depth_tolerance = 0.2 -ss_reflections_roughness = true -ssao_enabled = false -ssao_radius = 1.0 -ssao_intensity = 1.0 -ssao_radius2 = 0.0 -ssao_intensity2 = 1.0 -ssao_bias = 0.01 -ssao_light_affect = 0.0 -ssao_color = Color( 0, 0, 0, 1 ) -ssao_quality = 0 -ssao_blur = 3 -ssao_edge_sharpness = 4.0 -dof_blur_far_enabled = false -dof_blur_far_distance = 10.0 -dof_blur_far_transition = 5.0 -dof_blur_far_amount = 0.1 -dof_blur_far_quality = 1 -dof_blur_near_enabled = false -dof_blur_near_distance = 2.0 -dof_blur_near_transition = 1.0 -dof_blur_near_amount = 0.1 -dof_blur_near_quality = 1 -glow_enabled = false -glow_levels/1 = false -glow_levels/2 = false -glow_levels/3 = true -glow_levels/4 = false -glow_levels/5 = true -glow_levels/6 = false -glow_levels/7 = false glow_intensity = 6.17 -glow_strength = 1.0 -glow_bloom = 0.0 -glow_blend_mode = 2 -glow_hdr_threshold = 1.0 -glow_hdr_scale = 2.0 -glow_bicubic_upscale = false -adjustment_enabled = false adjustment_brightness = 0.27 -adjustment_contrast = 1.0 adjustment_saturation = 0.34 -_sections_unfolded = [ "Adjustments", "Ambient Light", "Background", "Resource" ] diff --git a/source/Main.tscn b/source/Main.tscn index 1204398..05a7ee3 100644 --- a/source/Main.tscn +++ b/source/Main.tscn @@ -18,89 +18,32 @@ [sub_resource type="SpatialMaterial" id=1] -render_priority = 0 flags_transparent = true -flags_unshaded = false -flags_vertex_lighting = false -flags_no_depth_test = false -flags_use_point_size = false -flags_world_triplanar = false -flags_fixed_size = false -flags_albedo_tex_force_srgb = false -vertex_color_use_as_albedo = false -vertex_color_is_srgb = false -params_diffuse_mode = 0 -params_specular_mode = 0 params_blend_mode = 1 -params_cull_mode = 0 -params_depth_draw_mode = 0 -params_line_width = 1.0 -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.00784314 ) -metallic = 0.0 metallic_specular = 0.0 -metallic_texture_channel = 0 roughness = 0.46 -roughness_texture_channel = 0 -emission_enabled = false -normal_enabled = false -rim_enabled = false -clearcoat_enabled = false -anisotropy_enabled = false -ao_enabled = false -depth_enabled = false -subsurf_scatter_enabled = false -transmission_enabled = false -refraction_enabled = false -detail_enabled = false -uv1_scale = Vector3( 1, 1, 1 ) -uv1_offset = Vector3( 0, 0, 0 ) -uv1_triplanar = false -uv1_triplanar_sharpness = 1.0 -uv2_scale = Vector3( 1, 1, 1 ) -uv2_offset = Vector3( 0, 0, 0 ) -uv2_triplanar = false -uv2_triplanar_sharpness = 1.0 proximity_fade_enable = true proximity_fade_distance = 1.0 -distance_fade_enable = false -_sections_unfolded = [ "Albedo", "Anisotropy", "Clearcoat", "Detail", "Distance Fade", "Emission", "Flags", "Metallic", "NormalMap", "Parameters", "Proximity Fade", "Rim", "Roughness" ] [sub_resource type="CubeMesh" id=2] material = SubResource( 1 ) -custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector3( 1, 1, 1 ) -subdivide_width = 0 -subdivide_height = 0 -subdivide_depth = 0 [sub_resource type="CubeMesh" id=3] material = SubResource( 1 ) -custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector3( 1, 1, 1 ) -subdivide_width = 0 -subdivide_height = 0 -subdivide_depth = 0 [sub_resource type="DynamicFont" id=4] size = 50 -use_mipmaps = true -use_filter = false font_data = ExtResource( 10 ) -_sections_unfolded = [ "Font", "Settings" ] [sub_resource type="Animation" id=5] resource_name = "Flash" -length = 1.0 -loop = false -step = 0.1 tracks/0/type = "value" tracks/0/path = NodePath("Label:custom_fonts/font:size") tracks/0/interp = 1 @@ -141,393 +84,139 @@ tracks/2/keys = { [sub_resource type="DynamicFont" id=6] size = 20 -use_mipmaps = false -use_filter = false extra_spacing_bottom = 5 font_data = ExtResource( 14 ) -_sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] - -[node name="Main" type="WorldEnvironment" index="0"] +[node name="Main" type="WorldEnvironment"] environment = ExtResource( 1 ) script = ExtResource( 2 ) -[node name="Background" type="Sprite3D" parent="." index="0"] - +[node name="Background" type="Sprite3D" parent="."] transform = Transform( 12.8, 0, 0, 0, 8.53, 0, 0, 0, 1, 4.5, 28.8, -34 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false modulate = Color( 0.334808, 0.343253, 0.359375, 0 ) -opacity = 1.0 -pixel_size = 0.01 -axis = 2 transparent = false -shaded = false double_sided = false -alpha_cut = 0 texture = ExtResource( 3 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Animation", "Flags", "Geometry", "Transform" ] - -[node name="Camera" type="Camera" parent="." index="1"] +[node name="Camera" type="Camera" parent="."] transform = Transform( 1, 0, 0, 0, 0.939693, -0.34202, 0, 0.34202, 0.939693, 4.5, 2, 19 ) -keep_aspect = 1 -cull_mask = 1048575 -environment = null -h_offset = 0.0 -v_offset = 0.0 -doppler_tracking = 0 -projection = 0 current = true fov = 60.3 -size = 1.0 -near = 0.05 far = 500.0 -_sections_unfolded = [ "Transform" ] - -[node name="DirectionalLight" type="DirectionalLight" parent="." index="2"] +[node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.332668, 0.771982, -0.541642, 0.579657, 0.285656, 0.763151, 0.743861, -0.567843, -0.352456, 5, 30, 0 ) -layers = 1 -light_color = Color( 1, 1, 1, 1 ) light_energy = 3.0 -light_indirect_energy = 1.0 -light_negative = false -light_specular = 0.5 -light_bake_mode = 1 -light_cull_mask = -1 -shadow_enabled = false -shadow_color = Color( 0, 0, 0, 1 ) -shadow_bias = 0.1 -shadow_contact = 0.0 -shadow_reverse_cull_face = false -editor_only = false -directional_shadow_mode = 2 -directional_shadow_split_1 = 0.1 -directional_shadow_split_2 = 0.2 -directional_shadow_split_3 = 0.5 -directional_shadow_blend_splits = false -directional_shadow_normal_bias = 0.8 -directional_shadow_bias_split_scale = 0.25 -directional_shadow_depth_range = 0 -directional_shadow_max_distance = 200.0 -_sections_unfolded = [ "Light", "Transform" ] - -[node name="Matrix" type="MeshInstance" parent="." index="3"] +[node name="Matrix" type="MeshInstance" parent="."] transform = Transform( 10, 0, 0, 0, 20, 0, 0, 0, 1, 4.5, 9.5, 0 ) visible = false -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 mesh = SubResource( 2 ) -skeleton = NodePath("..") material/0 = null -_sections_unfolded = [ "Transform", "material" ] - -[node name="GridMap" type="GridMap" parent="Matrix" index="0"] +[node name="GridMap" type="GridMap" parent="Matrix"] transform = Transform( 0.1, 0, 0, 0, 0.05, 0, 0, 0, 1, -0.45, -0.475, 0 ) -theme = ExtResource( 4 ) +mesh_library = ExtResource( 4 ) cell_size = Vector3( 1, 1, 1 ) -cell_octant_size = 8 cell_center_x = false cell_center_y = false cell_center_z = false -cell_scale = 1.0 -collision_layer = 1 -collision_mask = 1 data = { "cells": PoolIntArray( ) } script = ExtResource( 5 ) -_sections_unfolded = [ "Cell", "Transform" ] __meta__ = { "_editor_clip_": 1, "_editor_floor_": Vector3( 0, -2, 0 ) } -[node name="Position3D" type="Position3D" parent="Matrix" index="1"] - +[node name="Position3D" type="Position3D" parent="Matrix"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 20, 0 ) -_sections_unfolded = [ "Transform" ] - -[node name="DropTrail" type="Spatial" parent="Matrix" index="2"] +[node name="DropTrail" type="Spatial" parent="Matrix"] editor/display_folded = true transform = Transform( 0.1, 0, 0, 0, 0.05, 0, 0, 0, 1, -0.45, -0.475, 0 ) visible = false -_sections_unfolded = [ "Transform" ] -[node name="0" type="Spatial" parent="Matrix/DropTrail" index="0"] - -_sections_unfolded = [ "Transform" ] - -[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/0" index="0"] +[node name="0" type="Spatial" parent="Matrix/DropTrail"] +[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/0"] transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false -modulate = Color( 1, 1, 1, 1 ) opacity = 0.1 -pixel_size = 0.01 -axis = 2 -transparent = true -shaded = false -double_sided = true -alpha_cut = 0 texture = ExtResource( 6 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Flags", "Transform" ] - -[node name="1" type="Spatial" parent="Matrix/DropTrail" index="1"] +[node name="1" type="Spatial" parent="Matrix/DropTrail"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 0 ) -_sections_unfolded = [ "Transform" ] - -[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/1" index="0"] +[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/1"] transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false -modulate = Color( 1, 1, 1, 1 ) opacity = 0.1 -pixel_size = 0.01 -axis = 2 -transparent = true -shaded = false -double_sided = true -alpha_cut = 0 texture = ExtResource( 6 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Flags", "Transform" ] - -[node name="2" type="Spatial" parent="Matrix/DropTrail" index="2"] +[node name="2" type="Spatial" parent="Matrix/DropTrail"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 ) -_sections_unfolded = [ "Transform" ] - -[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/2" index="0"] +[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/2"] transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false -modulate = Color( 1, 1, 1, 1 ) opacity = 0.1 -pixel_size = 0.01 -axis = 2 -transparent = true -shaded = false -double_sided = true -alpha_cut = 0 texture = ExtResource( 6 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Flags", "Transform" ] - -[node name="3" type="Spatial" parent="Matrix/DropTrail" index="3"] +[node name="3" type="Spatial" parent="Matrix/DropTrail"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) -_sections_unfolded = [ "Transform" ] - -[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/3" index="0"] +[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/3"] transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false -modulate = Color( 1, 1, 1, 1 ) opacity = 0.1 -pixel_size = 0.01 -axis = 2 -transparent = true -shaded = false -double_sided = true -alpha_cut = 0 texture = ExtResource( 6 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Flags", "Transform" ] -[node name="Delay" type="Timer" parent="Matrix/DropTrail" index="4"] - -process_mode = 1 +[node name="Delay" type="Timer" parent="Matrix/DropTrail"] wait_time = 0.06 one_shot = true -autostart = false - -[node name="Hold" type="MeshInstance" parent="." index="4"] +[node name="Hold" type="MeshInstance" parent="."] transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 1, -5, 16, 0 ) visible = false -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 mesh = SubResource( 3 ) -skeleton = NodePath("..") material/0 = null -_sections_unfolded = [ "Transform" ] - -[node name="Position3D" type="Position3D" parent="Hold" index="0"] +[node name="Position3D" type="Position3D" parent="Hold"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 16, 0 ) -_sections_unfolded = [ "Transform" ] - -[node name="Next" type="MeshInstance" parent="." index="5"] +[node name="Next" type="MeshInstance" parent="."] transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 1, 14, 16, 0 ) visible = false -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 mesh = SubResource( 3 ) -skeleton = NodePath("..") material/0 = null -_sections_unfolded = [ "Transform" ] - -[node name="Position3D" type="Position3D" parent="Next" index="0"] +[node name="Position3D" type="Position3D" parent="Next"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 13, 16, 0 ) -_sections_unfolded = [ "Transform" ] -[node name="DropTimer" type="Timer" parent="." index="6"] +[node name="DropTimer" type="Timer" parent="."] -process_mode = 1 -wait_time = 1.0 -one_shot = false -autostart = false - -[node name="LockDelay" type="Timer" parent="." index="7"] - -process_mode = 1 +[node name="LockDelay" type="Timer" parent="."] wait_time = 0.5 one_shot = true -autostart = false -[node name="AutoShiftDelay" type="Timer" parent="." index="8"] - -process_mode = 1 +[node name="AutoShiftDelay" type="Timer" parent="."] wait_time = 0.2 one_shot = true -autostart = false -[node name="AutoShiftTimer" type="Timer" parent="." index="9"] - -process_mode = 1 +[node name="AutoShiftTimer" type="Timer" parent="."] wait_time = 0.03 -one_shot = false -autostart = false - -[node name="MidiPlayer" parent="." index="10" instance=ExtResource( 7 )] +[node name="MidiPlayer" parent="." instance=ExtResource( 7 )] editor/display_folded = true script = ExtResource( 8 ) -_sections_unfolded = [ "Pause" ] file = "res://midi/music-a-dance-remix-.mid" volume_db = -24 loop = true soundfont = "res://midi/TimGM6mb.sf2" -[node name="LineCLearTimer" type="Timer" parent="MidiPlayer" index="1"] - -process_mode = 1 +[node name="LineCLearTimer" type="Timer" parent="MidiPlayer"] wait_time = 1.41 one_shot = true -autostart = false - -[node name="FlashText" type="Control" parent="." index="11"] +[node name="FlashText" type="Control" parent="."] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -536,52 +225,21 @@ margin_left = -250.0 margin_top = -300.0 margin_right = 250.0 margin_bottom = 200.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 script = ExtResource( 9 ) -_sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme" ] -[node name="Label" type="Label" parent="FlashText" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 +[node name="Label" type="Label" parent="FlashText"] margin_top = -100.0 margin_right = 500.0 margin_bottom = 400.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.445404, 0.710476, 0.820313, 0 ) align = 1 valign = 1 -percent_visible = 1.0 -lines_skipped = 0 -max_lines_visible = -1 -_sections_unfolded = [ "custom_colors", "custom_fonts" ] -[node name="AnimationPlayer" type="AnimationPlayer" parent="FlashText" index="1"] - -root_node = NodePath("..") -autoplay = "" -playback_process_mode = 1 -playback_default_blend_time = 0.0 -playback_speed = 1.0 +[node name="AnimationPlayer" type="AnimationPlayer" parent="FlashText"] anims/Flash = SubResource( 5 ) -blend_times = [ ] -_sections_unfolded = [ "Playback Options" ] - -[node name="Stats" parent="." index="12" instance=ExtResource( 11 )] +[node name="Stats" parent="." instance=ExtResource( 11 )] visible = false anchor_left = 0.0 anchor_top = 1.0 @@ -592,14 +250,12 @@ margin_top = -220.0 margin_right = 140.0 margin_bottom = -25.0 -[node name="controls_ui" parent="." index="13" instance=ExtResource( 12 )] - +[node name="controls_ui" parent="." instance=ExtResource( 12 )] visible = false -[node name="Start" parent="." index="14" instance=ExtResource( 13 )] - -[node name="ReplayButton" type="Button" parent="." index="15"] +[node name="Start" parent="." instance=ExtResource( 13 )] +[node name="ReplayButton" type="Button" parent="."] visible = false anchor_left = 1.0 anchor_top = 1.0 @@ -609,48 +265,21 @@ margin_left = -170.0 margin_top = -90.0 margin_right = -45.0 margin_bottom = -50.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 custom_fonts/font = SubResource( 6 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) -toggle_mode = false -enabled_focus_mode = 2 -shortcut = null -group = null text = "play again" -flat = false -align = 1 -_sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ] - -[node name="Ghost" parent="." index="16" instance=ExtResource( 15 )] +[node name="Ghost" parent="." instance=ExtResource( 15 )] visible = false [connection signal="timeout" from="Matrix/DropTrail/Delay" to="." method="_on_DropTrailDelay_timeout"] - [connection signal="timeout" from="DropTimer" to="." method="_on_DropTimer_timeout"] - [connection signal="timeout" from="LockDelay" to="." method="_on_LockDelay_timeout"] - [connection signal="timeout" from="AutoShiftDelay" to="." method="_on_AutoShiftDelay_timeout"] - [connection signal="timeout" from="AutoShiftTimer" to="." method="_on_AutoShiftTimer_timeout"] - [connection signal="timeout" from="MidiPlayer/LineCLearTimer" to="MidiPlayer" method="_on_LineCLearTimer_timeout"] - [connection signal="animation_finished" from="FlashText/AnimationPlayer" to="FlashText" method="_on_AnimationPlayer_animation_finished"] - [connection signal="flash_text" from="Stats" to="FlashText" method="print"] - [connection signal="level_up" from="Stats" to="." method="new_level"] - [connection signal="start" from="Start" to="." method="new_game"] - [connection signal="pressed" from="ReplayButton" to="." method="_on_ReplayButton_pressed"] - - diff --git a/source/Tetrominos/Mino/MinoMaterial.tres b/source/Tetrominos/Mino/MinoMaterial.tres index 95d3a04..1dd6029 100644 --- a/source/Tetrominos/Mino/MinoMaterial.tres +++ b/source/Tetrominos/Mino/MinoMaterial.tres @@ -2,58 +2,18 @@ [resource] -render_priority = 0 flags_transparent = true -flags_unshaded = false -flags_vertex_lighting = false -flags_no_depth_test = false -flags_use_point_size = false -flags_world_triplanar = false -flags_fixed_size = false -flags_albedo_tex_force_srgb = false -vertex_color_use_as_albedo = false -vertex_color_is_srgb = false -params_diffuse_mode = 0 -params_specular_mode = 0 params_blend_mode = 1 -params_cull_mode = 0 -params_depth_draw_mode = 0 -params_line_width = 1.0 -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.259529 ) +albedo_color = Color( 0.6, 0.776471, 1, 0.521569 ) metallic = 1.0 metallic_specular = 0.63 metallic_texture_channel = 4 roughness = 0.46 -roughness_texture_channel = 0 emission_enabled = true emission = Color( 0.755859, 1, 0.914169, 1 ) emission_energy = 0.15 emission_operator = 0 emission_on_uv2 = false -normal_enabled = false -rim_enabled = false -clearcoat_enabled = false -anisotropy_enabled = false -ao_enabled = false -depth_enabled = false -subsurf_scatter_enabled = false -transmission_enabled = false -refraction_enabled = false -detail_enabled = false -uv1_scale = Vector3( 1, 1, 1 ) -uv1_offset = Vector3( 0, 0, 0 ) -uv1_triplanar = false -uv1_triplanar_sharpness = 1.0 -uv2_scale = Vector3( 1, 1, 1 ) -uv2_offset = Vector3( 0, 0, 0 ) -uv2_triplanar = false -uv2_triplanar_sharpness = 1.0 proximity_fade_enable = true proximity_fade_distance = 1.0 -distance_fade_enable = false -_sections_unfolded = [ "Albedo", "Emission", "Metallic", "NormalMap", "Proximity Fade" ] diff --git a/source/project.godot b/source/project.godot index 3d8b98a..c3509bb 100644 --- a/source/project.godot +++ b/source/project.godot @@ -6,7 +6,12 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=3 +config_version=4 + +_global_script_classes=[ ] +_global_script_class_icons={ + +} [application] @@ -20,7 +25,7 @@ config/icon="res://icons/48.png" window/size/width=640 window/size/height=480 window/vsync/use_vsync=false -window/stretch/aspect="expand" +window/stretch/aspect="keep_height" [gui] @@ -28,24 +33,51 @@ theme/use_hidpi=true [input] -hold=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null) +hold={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null) ] -pause=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null) +} +pause={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null) ] -hard_drop=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) +} +hard_drop={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) ] -move_left=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) +} +move_left={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) ] -soft_drop=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) +} +soft_drop={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) ] -move_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) +} +move_right={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) ] -rotate_clockwise=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) +} +rotate_clockwise={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) ] -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) +} +rotate_counterclockwise={ +"deadzone": 0.5, +"events": [ 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) ] -toggle_fullscreen=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) +} +toggle_fullscreen={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) ] +} [rendering]