Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ csharp_style_var_elsewhere = true:silent

#Style - modifiers
dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
csharp_preferred_modifier_order = public,private,protected,internal,abstract,virtual,sealed,override,static,new,readonly,extern,unsafe,volatile,async:warning

#Style - parentheses
# Skipped because roslyn cannot separate +-*/ with << >>
Expand Down Expand Up @@ -190,4 +190,7 @@ dotnet_diagnostic.CA1305.severity = warning
insert_final_newline = true
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
trim_trailing_whitespace = true

[addons/**]
generated_code = true
15 changes: 15 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@ jobs:
with:
dotnet-version: 10.0.x
cache: true
- name: Read gde_gozen URL
id: gozen-link
run: |
url=$(dotnet msbuild -getProperty:AddonUrl Rhythia.csproj)
if [ -z "$url" ]; then
echo "AddonUrl is empty or missing in Rhythia.csproj"
exit 1
fi
echo "url=$url" >> "$GITHUB_OUTPUT"
- name: Download gde_gozen
run: |
wget ${{ steps.gozen-link.outputs.url }} -O gde_gozen.zip
mkdir addons
unzip -o gde_gozen.zip -d addons/
rm gde_gozen.zip
- name: Restore dependencies
run: dotnet restore --locked-mode
- name: Restore tools
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ mono_crash.*.json
# Other
nuget.config
*.lscache
addons/gde_gozen
.tmp
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ We ❤️ developers! Contributions are welcome — whether it's bug fixes, feat
> [!WARNING]
> **Nightly is no longer actively maintained.** This guide is for contributing to the **Rewrite** client. The contribution process is the same, but you'll be working with the [Rewrite repository](https://github.com/Rhythia/Client).

> [!WARNING]
> **The first build will fail** because it downloads the addon, just restart godot and rerun the build and it should work.

### Required Software

| Software | Notes |
Expand Down
23 changes: 23 additions & 0 deletions Rhythia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,27 @@
<PackageReference Include="Tomlyn" Version="0.20.0" />
<PackageReference Include="Updatum" Version="1.3.2" />
</ItemGroup>
<PropertyGroup>
<AddonBuildVersion>0.1.0</AddonBuildVersion>
<AddonUrl>https://github.com/Rhythia/gde_gozen/releases/download/v$(AddonBuildVersion)/GDE_GoZen_v9.7_csharp.zip</AddonUrl>
<ZipAddonName>GdeGozen_v9.7.zip</ZipAddonName>
</PropertyGroup>
<Target Name="CheckAddon" BeforeTargets="BeforeBuild">
<ReadLinesFromFile File="addons/gde_gozen/version.txt" Condition="Exists('addons/gde_gozen/version.txt')">
<Output TaskParameter="Lines" PropertyName="InstalledAddonVersion" />
</ReadLinesFromFile>
<CallTarget Targets="DownloadAddon" Condition="!Exists('addons/gde_gozen') Or '$(InstalledAddonVersion.Trim())' != '$(AddonBuildVersion)'" />
</Target>
<Target Name="DownloadAddon">
<Message Text="Downloading addon. This may take a while." Importance="high" />
<DownloadFile DestinationFolder=".tmp/" DestinationFileName="$(ZipAddonName)" SourceUrl="$(AddonUrl)" />
<RemoveDir Directories="addons" />
<Unzip SourceFiles=".tmp/$(ZipAddonName)" DestinationFolder="addons" OverwriteReadOnlyFiles="true" />
<WriteLinesToFile File="addons/gde_gozen/version.txt" Lines="$(AddonBuildVersion)" Overwrite="true" />
<RemoveDir Directories=".tmp" />
<Error
Text="Addon downloaded. Please restart your godot editor and re-run the build now that the addon is present."
Condition="Exists('addons/gde_gozen')"
/>
</Target>
</Project>
61 changes: 41 additions & 20 deletions prefabs/map_button_square.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[ext_resource type="Texture2D" uid="uid://cacq7g5ijo7sy" path="res://user/skins/default/ui/play/favorite.png" id="2_ywqiq"]
[ext_resource type="Texture2D" uid="uid://bp468b5qqj4l1" path="res://user/skins/default/ui/play/grid_cover_background.png" id="3_ii2dr"]
[ext_resource type="Theme" uid="uid://dhuhu3mmaew1a" path="res://themes/theme.tres" id="3_xysv8"]
[ext_resource type="Texture2D" uid="uid://degvlg4p0if70" path="res://user/skins/default/ui/buttons/add_video.png" id="6_ii2dr"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ywqiq"]
bg_color = Color(1, 1, 1, 1)
Expand Down Expand Up @@ -115,23 +116,6 @@ grow_horizontal = 2
grow_vertical = 2
expand_mode = 1

[node name="Favorited" type="TextureRect" parent="Holder" unique_id=2076074980]
visible = false
texture_filter = 6
custom_minimum_size = Vector2(16, 16)
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
anchor_right = 1.0
offset_left = -18.0
offset_top = 2.0
offset_right = -2.0
offset_bottom = 18.0
grow_horizontal = 0
pivot_offset = Vector2(8, 8)
texture = ExtResource("2_ywqiq")
expand_mode = 1

[node name="Separator2" type="ColorRect" parent="Holder" unique_id=972899073]
layout_mode = 1
anchors_preset = -1
Expand Down Expand Up @@ -189,16 +173,15 @@ anchors_preset = -1
anchor_top = 0.657
anchor_right = 0.721
anchor_bottom = 0.88900006
offset_left = 39.0
offset_left = 15.0
offset_top = 3.0199966
offset_right = 0.05999756
offset_right = -23.940002
offset_bottom = -8.460007
grow_horizontal = 2
grow_vertical = 0
theme = ExtResource("3_xysv8")
text = "0:00"
label_settings = SubResource("LabelSettings_hc3kw")
horizontal_alignment = 1
vertical_alignment = 1
autowrap_mode = 3
clip_text = true
Expand Down Expand Up @@ -249,3 +232,41 @@ offset_right = 15.703194
offset_bottom = -6.6200027
rotation = 1.5707964
color = Color(1, 1, 1, 0.23529412)

[node name="IconContainer" type="HBoxContainer" parent="Holder" unique_id=2048061899]
layout_mode = 1
anchors_preset = -1
anchor_left = 0.93600005
anchor_top = 0.693
anchor_right = 0.93600005
anchor_bottom = 0.693
offset_left = -34.04001
offset_top = -0.020004272
offset_right = -0.040008545
offset_bottom = 15.979996
grow_horizontal = 0
theme_override_constants/separation = 2
alignment = 2

[node name="Video" type="TextureRect" parent="Holder/IconContainer" unique_id=542011967]
visible = false
texture_filter = 6
custom_minimum_size = Vector2(16, 16)
layout_mode = 2
texture = ExtResource("6_ii2dr")
expand_mode = 1

[node name="FavoriteParent" type="Control" parent="Holder/IconContainer" unique_id=1380362991]
visible = false
custom_minimum_size = Vector2(16, 16)
layout_mode = 2

[node name="Favorited" type="TextureRect" parent="Holder/IconContainer/FavoriteParent" unique_id=2116415263]
texture_filter = 6
custom_minimum_size = Vector2(16, 16)
layout_mode = 0
offset_right = 16.0
offset_bottom = 16.0
pivot_offset_ratio = Vector2(0.5, 0.5)
texture = ExtResource("2_ywqiq")
expand_mode = 1
55 changes: 37 additions & 18 deletions prefabs/map_button_wide.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[ext_resource type="Shader" uid="uid://b38n4irr1f443" path="res://user/skins/default/ui/play/map_button_cover.gdshader" id="3_d10q8"]
[ext_resource type="Texture2D" uid="uid://cacq7g5ijo7sy" path="res://user/skins/default/ui/play/favorite.png" id="4_ew23d"]
[ext_resource type="Theme" uid="uid://dhuhu3mmaew1a" path="res://themes/theme.tres" id="5_mpifo"]
[ext_resource type="Texture2D" uid="uid://degvlg4p0if70" path="res://user/skins/default/ui/buttons/add_video.png" id="6_84wsl"]
[ext_resource type="Shader" uid="uid://d0g8fej0676c" path="res://scripts/shaders/linear_alpha_gradient.gdshader" id="6_frxlp"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_4823j"]
Expand Down Expand Up @@ -49,8 +50,8 @@ shader = ExtResource("6_frxlp")

[node name="MapButtonWide" type="Control" unique_id=807495564]
self_modulate = Color(0, 0, 0, 0.8784314)
clip_contents = true
custom_minimum_size = Vector2(0, 90)
clip_contents = true
layout_mode = 3
anchors_preset = 10
anchor_right = 1.0
Expand Down Expand Up @@ -99,23 +100,6 @@ grow_vertical = 2
expand_mode = 2
stretch_mode = 6

[node name="Favorited" type="TextureRect" parent="Holder" unique_id=922682128]
visible = false
texture_filter = 6
custom_minimum_size = Vector2(24, 24)
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
anchor_right = 1.0
offset_left = -32.0
offset_top = 8.0
offset_right = -8.0
offset_bottom = 32.0
grow_horizontal = 0
pivot_offset = Vector2(12, 12)
texture = ExtResource("4_ew23d")
expand_mode = 1

[node name="Title" type="Label" parent="Holder" unique_id=704763863]
layout_mode = 1
anchors_preset = -1
Expand Down Expand Up @@ -177,3 +161,38 @@ focus_mode = 0
mouse_filter = 1
mouse_default_cursor_shape = 2
flat = true

[node name="IconContainer" type="HBoxContainer" parent="Holder" unique_id=1116304380]
layout_mode = 1
anchors_preset = 1
anchor_left = 1.0
anchor_right = 1.0
offset_left = -32.0
offset_top = 8.0
offset_right = -8.0
offset_bottom = 32.0
grow_horizontal = 0
theme_override_constants/separation = 8

[node name="Video" type="TextureRect" parent="Holder/IconContainer" unique_id=1926918097]
visible = false
texture_filter = 6
custom_minimum_size = Vector2(24, 24)
layout_mode = 2
texture = ExtResource("6_84wsl")
expand_mode = 1

[node name="FavoriteParent" type="Control" parent="Holder/IconContainer" unique_id=1211224476]
visible = false
custom_minimum_size = Vector2(24, 24)
layout_mode = 2

[node name="Favorited" type="TextureRect" parent="Holder/IconContainer/FavoriteParent" unique_id=922682128]
texture_filter = 6
custom_minimum_size = Vector2(24, 24)
layout_mode = 0
offset_right = 24.0
offset_bottom = 24.0
pivot_offset_ratio = Vector2(0.5, 0.5)
texture = ExtResource("4_ew23d")
expand_mode = 1
7 changes: 2 additions & 5 deletions prefabs/map_info_container.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ outline_color = Color(0, 0, 0, 1)
shadow_size = 4
shadow_color = Color(0, 0, 0, 1)

[node name="MapInfoContainer" type="Panel" unique_id=150923669 node_paths=PackedStringArray("info", "dim", "coverBackground", "cover", "mainLabel", "extraLabel", "artistLink", "exportButton", "favoriteButton", "videoButton", "videoDialog", "copyButton", "copyDialog", "deleteButton", "actions", "preview", "speedHolder", "speedPresets", "playHolder", "startButton", "leaderboard", "lbScrollContainer", "lbContainer", "lbExpand", "lbHide")]
[node name="MapInfoContainer" type="Panel" unique_id=150923669 node_paths=PackedStringArray("info", "dim", "coverBackground", "cover", "mainLabel", "extraLabel", "artistLink", "exportButton", "favoriteButton", "videoButton", "copyButton", "copyDialog", "deleteButton", "actions", "preview", "speedHolder", "speedPresets", "playHolder", "startButton", "leaderboard", "lbScrollContainer", "lbContainer", "lbExpand", "lbHide")]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
Expand All @@ -190,7 +190,6 @@ artistLink = NodePath("Info/Control/Background/ArtistLink")
exportButton = NodePath("Info/Control/infoControl/infoSubholder/Buttons/Export")
favoriteButton = NodePath("Info/Control/infoControl/infoSubholder/Buttons/Favorite")
videoButton = NodePath("Info/Control/infoControl/infoSubholder/Buttons/Video")
videoDialog = NodePath("Info/Control/infoControl/infoSubholder/Buttons/Video/VideoDialog")
copyButton = NodePath("Info/Control/infoControl/infoSubholder/Buttons/Copy")
copyDialog = NodePath("Info/Control/infoControl/infoSubholder/Buttons/Copy/CopyDialog")
deleteButton = NodePath("Info/Control/infoControl/infoSubholder/Buttons/Delete")
Expand Down Expand Up @@ -417,15 +416,13 @@ icon = ExtResource("5_1m5pv")
icon_alignment = 1

[node name="Video" type="Button" parent="Info/Control/infoControl/infoSubholder/Buttons" unique_id=1985048325]
visible = false
layout_mode = 2
tooltip_text = "Add Video"
tooltip_text = "Disable Video Background"
focus_mode = 0
mouse_default_cursor_shape = 2
theme = ExtResource("4_4d08m")
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_constants/icon_max_width = 24
disabled = true
icon = ExtResource("6_g02bu")
icon_alignment = 1

Expand Down
4 changes: 2 additions & 2 deletions prefabs/spaces/grid.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene format=3 uid="uid://dtkff13bgd1u4"]

[ext_resource type="Script" uid="uid://bxx72dwqlrh2o" path="res://scripts/spaces/Grid.cs" id="1_wac2s"]
[ext_resource type="Texture2D" uid="uid://cnqebcj2iorfr" path="res://textures/spaces/grid/grid_tile.png" id="2_83vuq"]
[ext_resource type="Texture2D" uid="uid://cnqebcj2iorfr" path="res://textures/spaces/grid/grid_tile.png" id="2_wac2s"]

[sub_resource type="Environment" id="Environment_ge866"]
ambient_light_source = 1
Expand All @@ -16,7 +16,7 @@ fog_depth_end = 60.0

[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_n0yhb"]
shading_mode = 0
albedo_texture = ExtResource("2_83vuq")
albedo_texture = ExtResource("2_wac2s")
uv1_scale = Vector3(34, 34, 34)
texture_filter = 5
billboard_keep_scale = true
Expand Down
2 changes: 1 addition & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ project/assembly_name="Rhythia"

[editor_plugins]

enabled=PackedStringArray()
enabled=PackedStringArray("res://addons/gde_gozen/plugin.cfg")

[file_customization]

Expand Down
4 changes: 1 addition & 3 deletions scenes/game.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ texture_filter = 1
texture_repeat = false

[sub_resource type="QuadMesh" id="QuadMesh_3p7x2"]
size = Vector2(258.3, 210)

[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_d5aou"]

Expand Down Expand Up @@ -718,8 +717,7 @@ fov = 70.0
size = 5.0

[node name="Video" type="MeshInstance3D" parent="Runner" unique_id=1036410191]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.479675, -0.459572, -99.9929)
visible = false
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -100)
material_override = SubResource("StandardMaterial3D_rj3ky")
transparency = 1.0
cast_shadow = 0
Expand Down
Loading
Loading