Skip to content

Commit

Permalink
Release v1.1, add a couple of QoL improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Ichicoro committed Oct 22, 2019
1 parent 04439b5 commit 537bb8c
Show file tree
Hide file tree
Showing 13 changed files with 204 additions and 138 deletions.
21 changes: 0 additions & 21 deletions LICENSE.md

This file was deleted.

99 changes: 69 additions & 30 deletions MainMenu.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[gd_scene load_steps=12 format=2]
[gd_scene load_steps=14 format=2]

[ext_resource path="res://assets/fonts/PressStart2P.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://GameUI.tres" type="Theme" id=3]
[ext_resource path="res://GameUI.tres" type="Theme" id=4]

[sub_resource type="Shader" id=8]
[sub_resource type="Shader" id=1]
code = "shader_type canvas_item;
//render_mode skip_vertex_transform;

Expand All @@ -30,18 +30,18 @@ void fragment() {
}
}"

[sub_resource type="ShaderMaterial" id=9]
shader = SubResource( 8 )
[sub_resource type="ShaderMaterial" id=2]
shader = SubResource( 1 )
shader_param/color1 = Plane( 0.3, 0.1, 0.1, 1 )
shader_param/color2 = Plane( 0.2, 0.1, 0.1, 1 )
shader_param/pixel_size = 16
shader_param/global_transform = null

[sub_resource type="DynamicFont" id=1]
[sub_resource type="DynamicFont" id=2114]
size = 24
font_data = ExtResource( 1 )

[sub_resource type="GDScript" id=2]
[sub_resource type="GDScript" id=2115]
script/source = "extends Button

func _ready():
Expand All @@ -52,7 +52,7 @@ func _pressed():
pass
"
[sub_resource type="GDScript" id=3]
[sub_resource type="GDScript" id=2116]
script/source = "extends Button

onready var settings_dialog = get_node(\"/root/Control/SettingsDialog\")
Expand All @@ -65,40 +65,64 @@ func _on_SettingsDialog_about_to_show():
get_node(\"/root/Control/SettingsDialog/VBoxContainer/EnableConsoleToggle\").pressed = Settings.is_console_enabled
"
[sub_resource type="GDScript" id=4]
[sub_resource type="GDScript" id=6]
script/source = "extends Button

func _ready():
if OS.get_name() == \"HTML5\":
self.queue_free()

func _pressed():
get_node(\"/root/Control/QuitDialog\").popup()
"
[sub_resource type="DynamicFont" id=5]
[sub_resource type="DynamicFont" id=2117]
size = 64
font_data = ExtResource( 1 )
[sub_resource type="GDScript" id=6]
[sub_resource type="GDScript" id=8]
script/source = "extends ConfirmationDialog

func confirmed():
get_tree().quit()
"
[sub_resource type="GDScript" id=7]
[sub_resource type="GDScript" id=2118]
script/source = "extends CheckButton

func toggled(button_pressed):
Settings.is_console_enabled = button_pressed
"
[sub_resource type="DynamicFont" id=2119]
font_data = ExtResource( 1 )
[sub_resource type="GDScript" id=2120]
script/source = "extends Label

# Declare member variables here. Examples:
# var a = 2
# var b = \"text\"

# Called when the node enters the scene tree for the first time.
func _ready():
self.text = \"v\" + str(ProjectSettings.get_setting(\"application/config/version\"))

# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
"
[node name="Control" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
theme = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="ColorRect" type="ColorRect" parent="."]
material = SubResource( 9 )
material = SubResource( 2 )
anchor_right = 1.0
anchor_bottom = 1.0
__meta__ = {
Expand All @@ -115,10 +139,10 @@ margin_top = -112.0
margin_right = 128.0
margin_bottom = -31.0
focus_next = NodePath("../SettingsButton")
theme = ExtResource( 3 )
custom_fonts/font = SubResource( 1 )
custom_fonts/font = SubResource( 2114 )
text = "PLAY"
script = SubResource( 2 )
flat = true
script = SubResource( 2115 )
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -129,13 +153,13 @@ anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -128.0
margin_top = -7.0
margin_top = -10.0
margin_right = 128.0
margin_bottom = 74.0
theme = ExtResource( 3 )
custom_fonts/font = SubResource( 1 )
margin_bottom = 71.0
custom_fonts/font = SubResource( 2114 )
text = "SETTINGS"
script = SubResource( 3 )
flat = true
script = SubResource( 2116 )
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -149,10 +173,10 @@ margin_left = -128.0
margin_top = 94.8112
margin_right = 128.0
margin_bottom = 175.811
theme = ExtResource( 3 )
custom_fonts/font = SubResource( 1 )
custom_fonts/font = SubResource( 2114 )
text = "QUIT"
script = SubResource( 4 )
flat = true
script = SubResource( 6 )
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -162,7 +186,7 @@ anchor_right = 1.0
anchor_bottom = 0.211
margin_right = 3.0
margin_bottom = 35.968
custom_fonts/font = SubResource( 5 )
custom_fonts/font = SubResource( 2117 )
text = "TETRIS"
align = 1
valign = 1
Expand All @@ -180,10 +204,9 @@ margin_top = -42.0
margin_right = 147.0
margin_bottom = 54.0
rect_min_size = Vector2( 100, 60 )
theme = ExtResource( 3 )
popup_exclusive = true
dialog_text = "Do you really want to quit?"
script = SubResource( 6 )
script = SubResource( 8 )
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -197,7 +220,6 @@ margin_left = -152.0
margin_top = -94.0
margin_right = 153.0
margin_bottom = 12.0
theme = ExtResource( 3 )
window_title = "Settings"
__meta__ = {
"_edit_use_anchors_": false
Expand All @@ -215,12 +237,13 @@ margin_right = 305.0
margin_bottom = 52.0
text = "Enable Console"
flat = true
script = SubResource( 7 )
script = SubResource( 2118 )
[node name="Button" type="Button" parent="SettingsDialog/VBoxContainer"]
margin_top = 60.0
margin_right = 305.0
margin_bottom = 96.0
margin_bottom = 84.0
disabled = true
text = "Dump debug data to console"
[node name="CheckBox" type="CheckBox" parent="SettingsDialog/VBoxContainer"]
Expand All @@ -229,6 +252,22 @@ margin_top = 104.0
margin_right = 360.0
margin_bottom = 152.0
text = "Enable console"
[node name="Label2" type="Label" parent="."]
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = -100.0
margin_top = -42.0
custom_fonts/font = SubResource( 2119 )
text = "v1.0"
align = 2
valign = 1
script = SubResource( 2120 )
__meta__ = {
"_edit_use_anchors_": false
}
[connection signal="pressed" from="SettingsButton" to="SettingsButton" method="pressed"]
[connection signal="pressed" from="SettingsButton" to="SettingsButton" method="_on_Button2_pressed"]
[connection signal="confirmed" from="QuitDialog" to="QuitDialog" method="confirmed"]
Expand Down
46 changes: 42 additions & 4 deletions MainScene.tscn
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[gd_scene load_steps=17 format=2]

[ext_resource path="res://grid.tres" type="Material" id=1]
[ext_resource path="res://GameUI.tres" type="Theme" id=2]
[ext_resource path="res://Background noise test.tscn" type="PackedScene" id=2]
[ext_resource path="res://Shaders/Blur.shader" type="Shader" id=3]
[ext_resource path="res://src/GridContainer.gd" type="Script" id=4]
[ext_resource path="res://assets/fonts/PressStart2P.ttf" type="DynamicFontData" id=5]
[ext_resource path="res://src/PauseController.gd" type="Script" id=6]
[ext_resource path="res://Background noise test.tscn" type="PackedScene" id=7]
[ext_resource path="res://GameUI.tres" type="Theme" id=7]
[ext_resource path="res://game_view.gd" type="Script" id=8]

[sub_resource type="GDScript" id=1]
Expand Down Expand Up @@ -55,7 +55,7 @@ anchor_bottom = 1.0
margin_right = -215.0
margin_bottom = -254.0
rect_scale = Vector2( 2, 2 )
theme = ExtResource( 2 )
theme = ExtResource( 7 )
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -70,7 +70,7 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Background noise" parent="." instance=ExtResource( 7 )]
[node name="Background noise" parent="." instance=ExtResource( 2 )]
visible = false
position = Vector2( 136.784, 245.109 )
scale = Vector2( 8.43884, 8.43884 )
Expand Down Expand Up @@ -161,6 +161,44 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="HiscorePanel" type="Panel" parent="."]
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
margin_left = -55.0
margin_top = 21.0
margin_bottom = 46.0
custom_styles/panel = SubResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Label" type="Label" parent="HiscorePanel"]
margin_left = 1.57974
margin_top = -3.9604
margin_right = 57.5797
margin_bottom = 20.0396
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "HI"
align = 2
clip_text = true
__meta__ = {
"_edit_use_anchors_": false
}
[node name="HiscoreLabel" type="Label" parent="HiscorePanel"]
margin_left = 2.1405
margin_top = 5.5
margin_right = 58.1405
margin_bottom = 29.5
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "0"
align = 2
__meta__ = {
"_edit_use_anchors_": false
}
[node name="LevelPanel" type="Panel" parent="."]
anchor_left = 1.0
anchor_top = 0.5
Expand Down
Loading

0 comments on commit 537bb8c

Please sign in to comment.