Skip to content

Commit 78cb437

Browse files
popcar2popcar2
committed
Add Godotris credits, minor cleanup
1 parent 3243c5a commit 78cb437

File tree

8 files changed

+52
-29
lines changed

8 files changed

+52
-29
lines changed

‎Default Files/Credits.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ https://ko-fi.com/popcar2
1313
( https://unsplash.com/photos/snow-capped-mountain-at-night-3s85IxVDyXE )
1414
* File icons are from FlatIcon.
1515
* Misc icons are from game-icons.
16+
17+
--- Game credits ---
18+
* Pong & Super Bit Boy by popcar2
19+
* Godotris by MrakDun-desu

‎Games/Godotris/Game/godotris_game.tscn‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ anchor_right = 1.0
2828
anchor_bottom = 1.0
2929
grow_horizontal = 2
3030
grow_vertical = 2
31+
mouse_filter = 2
3132
script = ExtResource("1_0mtes")
3233
start_menu = NodePath("StartMenu")
3334
end_menu = NodePath("EndMenu")
@@ -49,6 +50,7 @@ anchor_right = 1.0
4950
anchor_bottom = 1.0
5051
grow_horizontal = 2
5152
grow_vertical = 2
53+
mouse_filter = 2
5254
texture = SubResource("GradientTexture2D_he5fk")
5355

5456
[node name="Grid" parent="." instance=ExtResource("2_1r4od")]
@@ -59,6 +61,7 @@ layout_mode = 0
5961
offset_left = 320.0
6062
offset_right = 480.0
6163
offset_bottom = 96.0
64+
mouse_filter = 2
6265

6366
[node name="ControlsLabel" type="Label" parent="Grid"]
6467
layout_mode = 1
@@ -160,6 +163,7 @@ anchor_right = 1.0
160163
anchor_bottom = 1.0
161164
grow_horizontal = 2
162165
grow_vertical = 2
166+
mouse_filter = 2
163167

164168
[node name="VBoxContainer" type="VBoxContainer" parent="StartMenu"]
165169
layout_mode = 1
@@ -169,6 +173,7 @@ anchor_bottom = 1.0
169173
offset_bottom = -100.0
170174
grow_horizontal = 2
171175
grow_vertical = 2
176+
mouse_filter = 2
172177
theme_override_constants/separation = 40
173178
alignment = 1
174179

@@ -196,6 +201,7 @@ anchor_right = 1.0
196201
anchor_bottom = 1.0
197202
grow_horizontal = 2
198203
grow_vertical = 2
204+
mouse_filter = 2
199205

200206
[node name="RestartButton" type="Button" parent="EndMenu"]
201207
custom_minimum_size = Vector2(250, 0)

‎Games/Godotris/Game/godotris_input_handler.gd‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,3 @@ func handle_das(time: int) -> void:
157157
active_piece.position += Vector2i.LEFT * grid.BLOCK_SIZE
158158
DasStatus.Inactive:
159159
pass
160-
161-
162-
163-
164-
165-
166-
167-
168-
169-
170-

‎Games/Godotris/Grid/godotris_grid.gd‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,3 @@ func clear_lines(lines: Array[int]) -> void:
100100
if block == null:
101101
continue
102102
block.global_position += Vector2.DOWN * BLOCK_SIZE
103-
104-
105-
106-
107-
108-
109-
110-
111-
112-
113-
114-
115-
116-

‎Games/Godotris/Grid/grid.tscn‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ anchor_bottom = 0.5
2626
grow_horizontal = 2
2727
grow_vertical = 2
2828
size_flags_horizontal = 4
29+
mouse_filter = 2
2930
script = ExtResource("1_dx6kk")
3031

3132
[node name="Background" type="ColorRect" parent="."]
@@ -35,6 +36,7 @@ anchor_right = 1.0
3536
anchor_bottom = 1.0
3637
grow_horizontal = 2
3738
grow_vertical = 2
39+
mouse_filter = 2
3840
color = Color(0, 0, 0, 1)
3941

4042
[node name="Lines" type="Control" parent="."]
@@ -45,6 +47,7 @@ anchor_right = 1.0
4547
anchor_bottom = 1.0
4648
grow_horizontal = 2
4749
grow_vertical = 2
50+
mouse_filter = 2
4851

4952
[node name="HorizontalLines" type="VBoxContainer" parent="Lines"]
5053
layout_mode = 1
@@ -57,130 +60,152 @@ offset_right = 1.0
5760
offset_bottom = -1.0
5861
grow_horizontal = 2
5962
grow_vertical = 2
63+
mouse_filter = 2
6064

6165
[node name="Panel1" type="Panel" parent="Lines/HorizontalLines"]
6266
layout_mode = 2
6367
size_flags_horizontal = 3
6468
size_flags_vertical = 3
69+
mouse_filter = 2
6570
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
6671

6772
[node name="Panel2" type="Panel" parent="Lines/HorizontalLines"]
6873
layout_mode = 2
6974
size_flags_horizontal = 3
7075
size_flags_vertical = 3
76+
mouse_filter = 2
7177
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
7278

7379
[node name="Panel3" type="Panel" parent="Lines/HorizontalLines"]
7480
layout_mode = 2
7581
size_flags_horizontal = 3
7682
size_flags_vertical = 3
83+
mouse_filter = 2
7784
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
7885

7986
[node name="Panel4" type="Panel" parent="Lines/HorizontalLines"]
8087
layout_mode = 2
8188
size_flags_horizontal = 3
8289
size_flags_vertical = 3
90+
mouse_filter = 2
8391
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
8492

8593
[node name="Panel5" type="Panel" parent="Lines/HorizontalLines"]
8694
layout_mode = 2
8795
size_flags_horizontal = 3
8896
size_flags_vertical = 3
97+
mouse_filter = 2
8998
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
9099

91100
[node name="Panel6" type="Panel" parent="Lines/HorizontalLines"]
92101
layout_mode = 2
93102
size_flags_horizontal = 3
94103
size_flags_vertical = 3
104+
mouse_filter = 2
95105
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
96106

97107
[node name="Panel7" type="Panel" parent="Lines/HorizontalLines"]
98108
layout_mode = 2
99109
size_flags_horizontal = 3
100110
size_flags_vertical = 3
111+
mouse_filter = 2
101112
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
102113

103114
[node name="Panel8" type="Panel" parent="Lines/HorizontalLines"]
104115
layout_mode = 2
105116
size_flags_horizontal = 3
106117
size_flags_vertical = 3
118+
mouse_filter = 2
107119
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
108120

109121
[node name="Panel9" type="Panel" parent="Lines/HorizontalLines"]
110122
layout_mode = 2
111123
size_flags_horizontal = 3
112124
size_flags_vertical = 3
125+
mouse_filter = 2
113126
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
114127

115128
[node name="Panel10" type="Panel" parent="Lines/HorizontalLines"]
116129
layout_mode = 2
117130
size_flags_horizontal = 3
118131
size_flags_vertical = 3
132+
mouse_filter = 2
119133
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
120134

121135
[node name="Panel11" type="Panel" parent="Lines/HorizontalLines"]
122136
layout_mode = 2
123137
size_flags_horizontal = 3
124138
size_flags_vertical = 3
139+
mouse_filter = 2
125140
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
126141

127142
[node name="Panel12" type="Panel" parent="Lines/HorizontalLines"]
128143
layout_mode = 2
129144
size_flags_horizontal = 3
130145
size_flags_vertical = 3
146+
mouse_filter = 2
131147
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
132148

133149
[node name="Panel13" type="Panel" parent="Lines/HorizontalLines"]
134150
layout_mode = 2
135151
size_flags_horizontal = 3
136152
size_flags_vertical = 3
153+
mouse_filter = 2
137154
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
138155

139156
[node name="Panel14" type="Panel" parent="Lines/HorizontalLines"]
140157
layout_mode = 2
141158
size_flags_horizontal = 3
142159
size_flags_vertical = 3
160+
mouse_filter = 2
143161
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
144162

145163
[node name="Panel15" type="Panel" parent="Lines/HorizontalLines"]
146164
layout_mode = 2
147165
size_flags_horizontal = 3
148166
size_flags_vertical = 3
167+
mouse_filter = 2
149168
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
150169

151170
[node name="Panel16" type="Panel" parent="Lines/HorizontalLines"]
152171
layout_mode = 2
153172
size_flags_horizontal = 3
154173
size_flags_vertical = 3
174+
mouse_filter = 2
155175
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
156176

157177
[node name="Panel17" type="Panel" parent="Lines/HorizontalLines"]
158178
layout_mode = 2
159179
size_flags_horizontal = 3
160180
size_flags_vertical = 3
181+
mouse_filter = 2
161182
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
162183

163184
[node name="Panel18" type="Panel" parent="Lines/HorizontalLines"]
164185
layout_mode = 2
165186
size_flags_horizontal = 3
166187
size_flags_vertical = 3
188+
mouse_filter = 2
167189
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
168190

169191
[node name="Panel19" type="Panel" parent="Lines/HorizontalLines"]
170192
layout_mode = 2
171193
size_flags_horizontal = 3
172194
size_flags_vertical = 3
195+
mouse_filter = 2
173196
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
174197

175198
[node name="Panel20" type="Panel" parent="Lines/HorizontalLines"]
176199
layout_mode = 2
177200
size_flags_horizontal = 3
178201
size_flags_vertical = 3
202+
mouse_filter = 2
179203
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
180204

181205
[node name="Panel21" type="Panel" parent="Lines/HorizontalLines"]
182206
layout_mode = 2
183207
size_flags_horizontal = 3
208+
mouse_filter = 2
184209
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")
185210

186211
[node name="VerticalLines" type="HBoxContainer" parent="Lines"]
@@ -192,57 +217,69 @@ offset_left = -1.0
192217
offset_right = -1.0
193218
grow_horizontal = 2
194219
grow_vertical = 2
220+
mouse_filter = 2
195221

196222
[node name="Panel1" type="Panel" parent="Lines/VerticalLines"]
197223
layout_mode = 2
198224
size_flags_horizontal = 3
225+
mouse_filter = 2
199226
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
200227

201228
[node name="Panel2" type="Panel" parent="Lines/VerticalLines"]
202229
layout_mode = 2
203230
size_flags_horizontal = 3
231+
mouse_filter = 2
204232
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
205233

206234
[node name="Panel3" type="Panel" parent="Lines/VerticalLines"]
207235
layout_mode = 2
208236
size_flags_horizontal = 3
237+
mouse_filter = 2
209238
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
210239

211240
[node name="Panel4" type="Panel" parent="Lines/VerticalLines"]
212241
layout_mode = 2
213242
size_flags_horizontal = 3
243+
mouse_filter = 2
214244
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
215245

216246
[node name="Panel5" type="Panel" parent="Lines/VerticalLines"]
217247
layout_mode = 2
218248
size_flags_horizontal = 3
249+
mouse_filter = 2
219250
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
220251

221252
[node name="Panel6" type="Panel" parent="Lines/VerticalLines"]
222253
layout_mode = 2
223254
size_flags_horizontal = 3
255+
mouse_filter = 2
224256
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
225257

226258
[node name="Panel7" type="Panel" parent="Lines/VerticalLines"]
227259
layout_mode = 2
228260
size_flags_horizontal = 3
261+
mouse_filter = 2
229262
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
230263

231264
[node name="Panel8" type="Panel" parent="Lines/VerticalLines"]
232265
layout_mode = 2
233266
size_flags_horizontal = 3
267+
mouse_filter = 2
234268
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
235269

236270
[node name="Panel9" type="Panel" parent="Lines/VerticalLines"]
237271
layout_mode = 2
238272
size_flags_horizontal = 3
273+
mouse_filter = 2
239274
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
240275

241276
[node name="Panel10" type="Panel" parent="Lines/VerticalLines"]
242277
layout_mode = 2
243278
size_flags_horizontal = 3
279+
mouse_filter = 2
244280
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
245281

246282
[node name="Panel11" type="Panel" parent="Lines/VerticalLines"]
247283
layout_mode = 2
284+
mouse_filter = 2
248285
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

‎Games/Godotris/Piece/godotris_piece.gd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ func on_block_cleared() -> void:
1616
child_count -= 1
1717
if child_count == 0:
1818
queue_free()
19-

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Aside from that, GodotOS is also meant to be a hub for small games and experienc
1919
* [Default wallpaper](https://unsplash.com/photos/snow-capped-mountain-at-night-3s85IxVDyXE) was made by Haseeb Jamil.
2020
* Misc icons are from [game-icons](https://game-icons.net/).
2121
* Folder icons are from [flaticon](https://www.flaticon.com/)
22+
* "Godotris" by [MrakDun-desu](https://github.com/MrakDun-desu)
2223

2324
---
2425

‎export_presets.cfg‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ custom_features=""
88
export_filter="all_resources"
99
include_filter="*.txt"
1010
exclude_filter=""
11-
export_path="../../GodotOS Export/GodotOS.exe"
11+
export_path="../../Desktop/Godot Temp/GodotOS v1.0.1/GodotOS.exe"
1212
encryption_include_filters=""
1313
encryption_exclude_filters=""
1414
encrypt_pck=false
@@ -111,7 +111,7 @@ custom_features=""
111111
export_filter="all_resources"
112112
include_filter="*.txt"
113113
exclude_filter=""
114-
export_path="../../Desktop/Godot Exports/GodotOS Web 6/index.html"
114+
export_path="../../Desktop/Godot Threadless 2/GodotOS Release Godotris/index.html"
115115
encryption_include_filters=""
116116
encryption_exclude_filters=""
117117
encrypt_pck=false
@@ -120,7 +120,7 @@ encrypt_directory=false
120120
[preset.2.options]
121121

122122
custom_template/debug=""
123-
custom_template/release=""
123+
custom_template/release="C:/Users/Ahmed/Desktop/Godot Threadless 2/godot.web.template_release.wasm32.nothreads.zip"
124124
variant/extensions_support=false
125125
vram_texture_compression/for_desktop=true
126126
vram_texture_compression/for_mobile=false
@@ -138,3 +138,4 @@ progressive_web_app/icon_144x144=""
138138
progressive_web_app/icon_180x180=""
139139
progressive_web_app/icon_512x512=""
140140
progressive_web_app/background_color=Color(0, 0, 0, 1)
141+
variant/thread_support=false

0 commit comments

Comments
 (0)