Skip to content

Commit

Permalink
Add Godotris credits, minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@popcar2
popcar2 committed Jan 14, 2024
1 parent 3243c5a commit 78cb437
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 29 deletions.
4 changes: 4 additions & 0 deletions Default Files/Credits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ https://ko-fi.com/popcar2
( https://unsplash.com/photos/snow-capped-mountain-at-night-3s85IxVDyXE )
* File icons are from FlatIcon.
* Misc icons are from game-icons.

--- Game credits ---
* Pong & Super Bit Boy by popcar2
* Godotris by MrakDun-desu
6 changes: 6 additions & 0 deletions Games/Godotris/Game/godotris_game.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2
script = ExtResource("1_0mtes")
start_menu = NodePath("StartMenu")
end_menu = NodePath("EndMenu")
Expand All @@ -49,6 +50,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2
texture = SubResource("GradientTexture2D_he5fk")

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

[node name="ControlsLabel" type="Label" parent="Grid"]
layout_mode = 1
Expand Down Expand Up @@ -160,6 +163,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2

[node name="VBoxContainer" type="VBoxContainer" parent="StartMenu"]
layout_mode = 1
Expand All @@ -169,6 +173,7 @@ anchor_bottom = 1.0
offset_bottom = -100.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2
theme_override_constants/separation = 40
alignment = 1

Expand Down Expand Up @@ -196,6 +201,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2

[node name="RestartButton" type="Button" parent="EndMenu"]
custom_minimum_size = Vector2(250, 0)
Expand Down
11 changes: 0 additions & 11 deletions Games/Godotris/Game/godotris_input_handler.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,3 @@ func handle_das(time: int) -> void:
active_piece.position += Vector2i.LEFT * grid.BLOCK_SIZE
DasStatus.Inactive:
pass











14 changes: 0 additions & 14 deletions Games/Godotris/Grid/godotris_grid.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,3 @@ func clear_lines(lines: Array[int]) -> void:
if block == null:
continue
block.global_position += Vector2.DOWN * BLOCK_SIZE














37 changes: 37 additions & 0 deletions Games/Godotris/Grid/grid.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ anchor_bottom = 0.5
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 4
mouse_filter = 2
script = ExtResource("1_dx6kk")

[node name="Background" type="ColorRect" parent="."]
Expand All @@ -35,6 +36,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2
color = Color(0, 0, 0, 1)

[node name="Lines" type="Control" parent="."]
Expand All @@ -45,6 +47,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2

[node name="HorizontalLines" type="VBoxContainer" parent="Lines"]
layout_mode = 1
Expand All @@ -57,130 +60,152 @@ offset_right = 1.0
offset_bottom = -1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2

[node name="Panel1" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel2" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel3" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel4" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel5" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel6" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel7" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel8" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel9" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel10" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel11" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel12" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel13" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel14" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel15" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel16" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel17" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel18" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel19" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel20" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="Panel21" type="Panel" parent="Lines/HorizontalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_m513q")

[node name="VerticalLines" type="HBoxContainer" parent="Lines"]
Expand All @@ -192,57 +217,69 @@ offset_left = -1.0
offset_right = -1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2

[node name="Panel1" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel2" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel3" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel4" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel5" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel6" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel7" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel8" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel9" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel10" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
size_flags_horizontal = 3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")

[node name="Panel11" type="Panel" parent="Lines/VerticalLines"]
layout_mode = 2
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxLine_rlnry")
1 change: 0 additions & 1 deletion Games/Godotris/Piece/godotris_piece.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ func on_block_cleared() -> void:
child_count -= 1
if child_count == 0:
queue_free()

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

---

Expand Down
7 changes: 4 additions & 3 deletions export_presets.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ custom_features=""
export_filter="all_resources"
include_filter="*.txt"
exclude_filter=""
export_path="../../GodotOS Export/GodotOS.exe"
export_path="../../Desktop/Godot Temp/GodotOS v1.0.1/GodotOS.exe"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
Expand Down Expand Up @@ -111,7 +111,7 @@ custom_features=""
export_filter="all_resources"
include_filter="*.txt"
exclude_filter=""
export_path="../../Desktop/Godot Exports/GodotOS Web 6/index.html"
export_path="../../Desktop/Godot Threadless 2/GodotOS Release Godotris/index.html"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
Expand All @@ -120,7 +120,7 @@ encrypt_directory=false
[preset.2.options]

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

0 comments on commit 78cb437

Please sign in to comment.