diff --git a/addons/ffmpeg/LICENSE-ffmpeg.txt.uid b/addons/ffmpeg/LICENSE-ffmpeg.txt.uid new file mode 100644 index 00000000..86d2764c --- /dev/null +++ b/addons/ffmpeg/LICENSE-ffmpeg.txt.uid @@ -0,0 +1 @@ +uid://b3ustrqft4n31 diff --git a/addons/ffmpeg/ffmpeg.gdextension b/addons/ffmpeg/ffmpeg.gdextension index a1f0d09d..51e28f5d 100644 --- a/addons/ffmpeg/ffmpeg.gdextension +++ b/addons/ffmpeg/ffmpeg.gdextension @@ -9,6 +9,9 @@ windows.release.x86_64 = "res://addons/ffmpeg/win64/libgdffmpeg.windows.template linux.debug.x86_64 = "res://addons/ffmpeg/linux64/libgdffmpeg.linux.template_debug.x86_64.so" linux.release.x86_64 = "res://addons/ffmpeg/linux64/libgdffmpeg.linux.template_release.x86_64.so" +macos.debug = "res://addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework" +macos.release = "res://addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework" + [dependencies] windows.x86_64 = @@ -25,4 +28,14 @@ linux.x86_64 = "res://addons/ffmpeg/linux64/libavformat.so.60": "", "res://addons/ffmpeg/linux64/libavutil.so.58": "", "res://addons/ffmpeg/linux64/libswresample.so.4": "", - "res://addons/ffmpeg/linux64/libswscale.so.7": ""} \ No newline at end of file + "res://addons/ffmpeg/linux64/libswscale.so.7": ""} + +macos = + { + "res://addons/ffmpeg/macos/libavcodec.dylib": "", + "res://addons/ffmpeg/macos/libavfilter.dylib": "", + "res://addons/ffmpeg/macos/libavformat.dylib": "", + "res://addons/ffmpeg/macos/libavutil.dylib": "", + "res://addons/ffmpeg/macos/libswresample.dylib": "", + "res://addons/ffmpeg/macos/libswscale.dylib": "" + } \ No newline at end of file diff --git a/addons/ffmpeg/macos/libavcodec.dylib b/addons/ffmpeg/macos/libavcodec.dylib new file mode 100755 index 00000000..0bb5a28f Binary files /dev/null and b/addons/ffmpeg/macos/libavcodec.dylib differ diff --git a/addons/ffmpeg/macos/libavfilter.dylib b/addons/ffmpeg/macos/libavfilter.dylib new file mode 100755 index 00000000..e65ab4d1 Binary files /dev/null and b/addons/ffmpeg/macos/libavfilter.dylib differ diff --git a/addons/ffmpeg/macos/libavformat.dylib b/addons/ffmpeg/macos/libavformat.dylib new file mode 100755 index 00000000..8601af75 Binary files /dev/null and b/addons/ffmpeg/macos/libavformat.dylib differ diff --git a/addons/ffmpeg/macos/libavutil.dylib b/addons/ffmpeg/macos/libavutil.dylib new file mode 100755 index 00000000..ab12430c Binary files /dev/null and b/addons/ffmpeg/macos/libavutil.dylib differ diff --git a/addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework/Resources/Info.plist b/addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework/Resources/Info.plist new file mode 100644 index 00000000..33ca1cbd --- /dev/null +++ b/addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework/Resources/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleExecutable + libgdffmpeg_advanced.macos.template_release + CFBundleIdentifier + org.godotengine.ffmpeg + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + FFmpeg for Godot + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 1.0.0 + LSMinimumSystemVersion + 10.14 + + diff --git a/addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework/libgdffmpeg_advanced.macos.template_release b/addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework/libgdffmpeg_advanced.macos.template_release new file mode 100755 index 00000000..20f54ee7 Binary files /dev/null and b/addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework/libgdffmpeg_advanced.macos.template_release differ diff --git a/addons/ffmpeg/macos/libswresample.dylib b/addons/ffmpeg/macos/libswresample.dylib new file mode 100755 index 00000000..682b8f67 Binary files /dev/null and b/addons/ffmpeg/macos/libswresample.dylib differ diff --git a/addons/ffmpeg/macos/libswscale.dylib b/addons/ffmpeg/macos/libswscale.dylib new file mode 100755 index 00000000..9941fb5c Binary files /dev/null and b/addons/ffmpeg/macos/libswscale.dylib differ diff --git a/project.godot b/project.godot index ed95b796..db73cc33 100644 --- a/project.godot +++ b/project.godot @@ -85,7 +85,6 @@ common/physics_ticks_per_second=120 [rendering] +textures/vram_compression/import_etc2_astc=true textures/lossless_compression/force_png=true -anti_aliasing/quality/msaa_2d=1 environment/defaults/default_clear_color=Color(0.0885599, 0.08855992, 0.08855987, 1) -anti_aliasing/quality/screen_space_aa=1 diff --git a/scenes/game.tscn b/scenes/game.tscn index 3154770a..ddddd109 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -21,6 +21,7 @@ [ext_resource type="FontFile" uid="uid://cmjos3o0k2f6t" path="res://fonts/Comfortaa-Medium.ttf" id="11_o37lt"] [ext_resource type="Texture2D" uid="uid://80bitp5weqrb" path="res://user/skins/default/game/panel_left_background.png" id="11_sdncv"] [ext_resource type="FontFile" uid="uid://b6hgjef6s6oly" path="res://fonts/Comfortaa-Bold.ttf" id="12_axsek"] +[ext_resource type="Texture2D" uid="uid://cxl0501pqg6dk" path="res://user/skins/default/game/grid_guides.png" id="12_pr1ej"] [ext_resource type="Texture2D" uid="uid://diba7c3s8as4s" path="res://user/skins/default/game/panel_right_background.png" id="12_whe6p"] [ext_resource type="Texture2D" uid="uid://dw2gxd3m24h4m" path="res://user/skins/default/game/hits.png" id="13_6rhgc"] [ext_resource type="Script" uid="uid://c3gf0hgrqqqx5" path="res://scripts/game/ui/PanelRight.cs" id="13_sww3w"] @@ -83,6 +84,17 @@ transform_format = 1 use_colors = true mesh = SubResource("QuadMesh_5p2n8") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_05nbr"] +resource_name = "Material" +transparency = 1 +shading_mode = 0 +albedo_texture = ExtResource("12_pr1ej") +texture_repeat = false + +[sub_resource type="QuadMesh" id="QuadMesh_0sl42"] +material = SubResource("StandardMaterial3D_05nbr") +size = Vector2(4, 4) + [sub_resource type="ViewportTexture" id="ViewportTexture_pl11u"] viewport_path = NodePath("Runner/HUD/Health/HealthViewport") @@ -306,6 +318,12 @@ skeleton = NodePath("../../../..") material_override = SubResource("StandardMaterial3D_ssr8x") multimesh = SubResource("MultiMesh_e28va") +[node name="GridGuides" type="MeshInstance3D" parent="Runner/HUD/Grid" unique_id=2145859938] +transform = Transform3D(1.01, 0, 0, 0, 1.01, 0, 0, 0, 1.01, 0, 0, -0.2) +visible = false +mesh = SubResource("QuadMesh_0sl42") +skeleton = NodePath("../../../..") + [node name="Health" type="MeshInstance3D" parent="Runner/HUD" unique_id=449857227] transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, -6.3, -10) cast_shadow = 0 diff --git a/scenes/main_menu.tscn b/scenes/main_menu.tscn index 8801bb64..34288707 100644 --- a/scenes/main_menu.tscn +++ b/scenes/main_menu.tscn @@ -1617,8 +1617,9 @@ anchor_left = 0.5 anchor_right = 0.75 anchor_bottom = 1.0 offset_left = 150.0 -offset_top = 200.0 -offset_bottom = -200.0 +offset_top = 160.0 +offset_right = 230.0 +offset_bottom = -160.0 grow_vertical = 2 mouse_filter = 2 theme_override_styles/panel = SubResource("StyleBoxEmpty_qw82i") @@ -1725,10 +1726,35 @@ fit_content = true horizontal_alignment = 1 [node name="noobour" type="RichTextLabel" parent="Menus/Extras/Credits/ScrollContainer/VBoxContainer" unique_id=1684835200] +modulate = Color(0.05882353, 0.5058824, 0.7176471, 1) layout_mode = 2 bbcode_enabled = true text = "[font_size=20]noobour -[color=0f81b7][font_size=16]Contributor" +[color=ffffffbb][font_size=16]Contributor" +fit_content = true +horizontal_alignment = 1 + +[node name="jonyro" type="RichTextLabel" parent="Menus/Extras/Credits/ScrollContainer/VBoxContainer" unique_id=478363351] +modulate = Color(0.9607843, 0.60784316, 0.6784314, 1) +layout_mode = 2 +bbcode_enabled = true +text = "[font_size=20][u]jonyro / jrolly +[color=ffffffbb][font_size=16]\"Redshift\" (Menu theme) artist" +fit_content = true +horizontal_alignment = 1 + +[node name="Button" type="Button" parent="Menus/Extras/Credits/ScrollContainer/VBoxContainer/jonyro" unique_id=1840543780] +show_behind_parent = true +clip_contents = true +layout_mode = 0 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_right = 33.0 +offset_bottom = 12.0 +mouse_filter = 1 +flat = true +script = ExtResource("44_ybca7") +Link = "https://soundcloud.com/jonyro" [node name="Outline" type="Panel" parent="Menus/Extras/Credits" unique_id=239136532] material = SubResource("ShaderMaterial_yxnar") @@ -2107,6 +2133,7 @@ mouse_filter = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_sgh51") [node name="Transition" type="ColorRect" parent="." unique_id=86050768] +visible = false self_modulate = Color(1, 1, 1, 0) z_index = 2 anchors_preset = 15 diff --git a/scripts/database/settings/SettingsProfile.cs b/scripts/database/settings/SettingsProfile.cs index dd085036..920acfe6 100644 --- a/scripts/database/settings/SettingsProfile.cs +++ b/scripts/database/settings/SettingsProfile.cs @@ -109,9 +109,9 @@ public partial class SettingsProfile public SettingsItem MenuSpace { get; private set; } /// - /// Overrides the skin's background space for the game - /// - [Order] + /// Overrides the skin's background space for the game + /// + [Order] public SettingsItem GameSpace { get; private set; } /// @@ -139,9 +139,9 @@ public partial class SettingsProfile public SettingsItem NoteOpacityExponent { get; private set; } /// - /// Overrides the skin's note mesh - /// - [Order] + /// Overrides the skin's note mesh + /// + [Order] public SettingsItem NoteMesh { get; private set; } /// @@ -150,6 +150,7 @@ public partial class SettingsProfile [Order] public SettingsItem NoteSize { get; private set; } + /// /// Adjusts the cursor scale /// @@ -204,6 +205,12 @@ public partial class SettingsProfile [Order] public SettingsItem VideoRenderScale { get; private set; } + /// + /// Toggles Grid Guides + /// + [Order] + public SettingsItem GridGuides { get; private set; } + /// /// Toggles a minimal HUD /// @@ -362,9 +369,9 @@ public partial class SettingsProfile [Order] /// - /// Restarts settings to the game's defaults - /// - public SettingsItem ResetToDefaults { get; private set; } + /// Restarts settings to the game's defaults + /// + public SettingsItem ResetToDefaults { get; private set; } #endregion @@ -669,6 +676,14 @@ public SettingsProfile() } }; + GridGuides = new(true) + { + Id = "GridGuides", + Title = "Grid Guides", + Description = "Enables grid guides", + Section = SettingsSection.Visual, + }; + CursorScale = new(1) { Id = "CursorScale", diff --git a/scripts/game/ui/Grid.cs b/scripts/game/ui/Grid.cs index 08045f46..55c1abaa 100644 --- a/scripts/game/ui/Grid.cs +++ b/scripts/game/ui/Grid.cs @@ -6,6 +6,7 @@ public partial class Grid : MeshInstance3D, IUIComponent [Export] public Runner Runner { get; set; } public MeshInstance3D Cursor { get; set; } public MultiMeshInstance3D CursorTrail { get; set; } + public MeshInstance3D GridGuides { get; set; } private static readonly PackedScene hit_feedback = GD.Load("res://prefabs/hit_popup.tscn"); private static readonly PackedScene miss_feedback = GD.Load("res://prefabs/miss_icon.tscn"); @@ -20,6 +21,11 @@ public override void _ExitTree() public void Init() { + GridGuides ??= GetNode("GridGuides"); + + GridGuides.Visible = Runner.Attempt.Settings.GridGuides; + (GridGuides.GetActiveMaterial(0) as StandardMaterial3D).AlbedoTexture = SkinManager.Instance.Skin.GridGuidesImage; + Cursor ??= GetNode("Cursor"); (Cursor.Mesh as QuadMesh).Size = new Vector2((float)(Constants.CURSOR_SIZE * Runner.Attempt.Settings.CursorScale), (float)(Constants.CURSOR_SIZE * Runner.Attempt.Settings.CursorScale)); @@ -103,4 +109,3 @@ private void updateGridPosition(Vector2 position) } } - diff --git a/scripts/skinning/SkinManager.cs b/scripts/skinning/SkinManager.cs index feb49145..42dea292 100644 --- a/scripts/skinning/SkinManager.cs +++ b/scripts/skinning/SkinManager.cs @@ -59,6 +59,7 @@ public static void Load() skin.CursorImage = loadTexture("game/cursor.png"); skin.GridImage = loadTexture("game/grid.png"); + skin.GridGuidesImage = loadTexture("game/grid_guides.png"); skin.PanelLeftBackgroundImage = loadTexture("game/panel_left_background.png"); skin.PanelRightBackgroundImage = loadTexture("game/panel_right_background.png"); skin.HealthImage = loadTexture("game/health.png"); diff --git a/scripts/skinning/SkinProfile.cs b/scripts/skinning/SkinProfile.cs index 8f16b0bb..180fb2f3 100644 --- a/scripts/skinning/SkinProfile.cs +++ b/scripts/skinning/SkinProfile.cs @@ -1,4 +1,4 @@ -using Godot; +using Godot; [GlobalClass] public partial class SkinProfile : RefCounted @@ -9,6 +9,8 @@ public partial class SkinProfile : RefCounted public ImageTexture GridImage { get; set; } = new(); + public ImageTexture GridGuidesImage { get; set; } = new(); + public ImageTexture PanelLeftBackgroundImage { get; set; } = new(); public ImageTexture PanelRightBackgroundImage { get; set; } = new(); diff --git a/scripts/spaces/TriTunnel.cs b/scripts/spaces/TriTunnel.cs index ba0d618d..5435f2fb 100644 --- a/scripts/spaces/TriTunnel.cs +++ b/scripts/spaces/TriTunnel.cs @@ -8,7 +8,7 @@ public partial class TriTunnel : BaseSpace private MeshInstance3D tunnel; private StandardMaterial3D tunnelTexture; private Vector3 tunnelPosReset; - private Color tunnelColorReset = new(255, 255, 255); + private Color tunnelColor; private const float tunnel_loop_end = 148f; public override void _Ready() @@ -19,6 +19,7 @@ public override void _Ready() tunnel = GetNode("Tunnel"); tunnelPosReset = tunnel.Position; tunnelTexture = tunnel.MaterialOverride as StandardMaterial3D; + tunnelColor = tunnelTexture.AlbedoColor; } public override void _Process(double delta) @@ -36,6 +37,6 @@ public override void _Process(double delta) } // Hit VFX - tunnelTexture.AlbedoColor = settings.SpaceHitEffects ? NoteHitColor : tunnelColorReset; + tunnelTexture.AlbedoColor = settings.SpaceHitEffects ? NoteHitColor : tunnelColor; } } diff --git a/textures/RhythiaSquircle.png.import b/textures/RhythiaSquircle.png.import index 233adcba..3d87a17b 100644 --- a/textures/RhythiaSquircle.png.import +++ b/textures/RhythiaSquircle.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://baivqqkfll133" path.s3tc="res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.s3tc.ctex" +path.etc2="res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/RhythiaSquircle.png" -dest_files=["res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.s3tc.ctex"] +dest_files=["res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.s3tc.ctex", "res://.godot/imported/RhythiaSquircle.png-e7ded38c293210304c1c51a7437c5e35.etc2.ctex"] [params] diff --git a/textures/empty.png.import b/textures/empty.png.import index 03b0fc0e..5177c83f 100644 --- a/textures/empty.png.import +++ b/textures/empty.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://c4u5y3e8yamuk" path.s3tc="res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.s3tc.ctex" +path.etc2="res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/empty.png" -dest_files=["res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.s3tc.ctex"] +dest_files=["res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.s3tc.ctex", "res://.godot/imported/empty.png-4550676ddda09419c6eb3446d3130830.etc2.ctex"] [params] diff --git a/textures/galaxy_rainbow.png.import b/textures/galaxy_rainbow.png.import index 14749ac6..deeb0f43 100644 --- a/textures/galaxy_rainbow.png.import +++ b/textures/galaxy_rainbow.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://d4n3duxjt288o" path.s3tc="res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.s3tc.ctex" +path.etc2="res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/galaxy_rainbow.png" -dest_files=["res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.s3tc.ctex"] +dest_files=["res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.s3tc.ctex", "res://.godot/imported/galaxy_rainbow.png-5150f0d13d80cbbaa64705ec8f0a135d.etc2.ctex"] [params] diff --git a/textures/galaxy_skybox.png.import b/textures/galaxy_skybox.png.import index 18eeb089..85e98dca 100644 --- a/textures/galaxy_skybox.png.import +++ b/textures/galaxy_skybox.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://drj0rof0q81b5" path.s3tc="res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.s3tc.ctex" +path.etc2="res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/galaxy_skybox.png" -dest_files=["res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.s3tc.ctex"] +dest_files=["res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.s3tc.ctex", "res://.godot/imported/galaxy_skybox.png-e42e640ad898a2573fdbfa805414f352.etc2.ctex"] [params] diff --git a/textures/grid_tile.png.import b/textures/grid_tile.png.import index 8249aa4f..0721501b 100644 --- a/textures/grid_tile.png.import +++ b/textures/grid_tile.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://cnqebcj2iorfr" path.s3tc="res://.godot/imported/grid_tile.png-94aab6786e791c103f5baede0e941dba.s3tc.ctex" +path.etc2="res://.godot/imported/grid_tile.png-94aab6786e791c103f5baede0e941dba.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/grid_tile.png" -dest_files=["res://.godot/imported/grid_tile.png-94aab6786e791c103f5baede0e941dba.s3tc.ctex"] +dest_files=["res://.godot/imported/grid_tile.png-94aab6786e791c103f5baede0e941dba.s3tc.ctex", "res://.godot/imported/grid_tile.png-94aab6786e791c103f5baede0e941dba.etc2.ctex"] [params] diff --git a/textures/p.png.import b/textures/p.png.import index 1023cc29..3a73e321 100644 --- a/textures/p.png.import +++ b/textures/p.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://dqr46iek4sfxo" path.s3tc="res://.godot/imported/p.png-2b0ca2781c06c5295258baad07f02232.s3tc.ctex" +path.etc2="res://.godot/imported/p.png-2b0ca2781c06c5295258baad07f02232.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/p.png" -dest_files=["res://.godot/imported/p.png-2b0ca2781c06c5295258baad07f02232.s3tc.ctex"] +dest_files=["res://.godot/imported/p.png-2b0ca2781c06c5295258baad07f02232.s3tc.ctex", "res://.godot/imported/p.png-2b0ca2781c06c5295258baad07f02232.etc2.ctex"] [params] diff --git a/textures/squircle_blank.png.import b/textures/squircle_blank.png.import index a5926ea1..5fb2a6c9 100644 --- a/textures/squircle_blank.png.import +++ b/textures/squircle_blank.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://c5df01qkhxros" path.s3tc="res://.godot/imported/squircle_blank.png-56066c369baf0fb23e738c301878c14b.s3tc.ctex" +path.etc2="res://.godot/imported/squircle_blank.png-56066c369baf0fb23e738c301878c14b.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/squircle_blank.png" -dest_files=["res://.godot/imported/squircle_blank.png-56066c369baf0fb23e738c301878c14b.s3tc.ctex"] +dest_files=["res://.godot/imported/squircle_blank.png-56066c369baf0fb23e738c301878c14b.s3tc.ctex", "res://.godot/imported/squircle_blank.png-56066c369baf0fb23e738c301878c14b.etc2.ctex"] [params] diff --git a/textures/squircle_bloom.png.import b/textures/squircle_bloom.png.import index c6c09155..b84941e2 100644 --- a/textures/squircle_bloom.png.import +++ b/textures/squircle_bloom.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://cafgf44rluox6" path.s3tc="res://.godot/imported/squircle_bloom.png-d2aef008e3b8fadc5bf53248732f9770.s3tc.ctex" +path.etc2="res://.godot/imported/squircle_bloom.png-d2aef008e3b8fadc5bf53248732f9770.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/squircle_bloom.png" -dest_files=["res://.godot/imported/squircle_bloom.png-d2aef008e3b8fadc5bf53248732f9770.s3tc.ctex"] +dest_files=["res://.godot/imported/squircle_bloom.png-d2aef008e3b8fadc5bf53248732f9770.s3tc.ctex", "res://.godot/imported/squircle_bloom.png-d2aef008e3b8fadc5bf53248732f9770.etc2.ctex"] [params] diff --git a/textures/tunnel_neonroad.png.import b/textures/tunnel_neonroad.png.import index 5e113759..bff75421 100644 --- a/textures/tunnel_neonroad.png.import +++ b/textures/tunnel_neonroad.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://frwrbwqgan5x" path.s3tc="res://.godot/imported/tunnel_neonroad.png-d20bc35a74f7193fbf270b8bead3a317.s3tc.ctex" +path.etc2="res://.godot/imported/tunnel_neonroad.png-d20bc35a74f7193fbf270b8bead3a317.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/tunnel_neonroad.png" -dest_files=["res://.godot/imported/tunnel_neonroad.png-d20bc35a74f7193fbf270b8bead3a317.s3tc.ctex"] +dest_files=["res://.godot/imported/tunnel_neonroad.png-d20bc35a74f7193fbf270b8bead3a317.s3tc.ctex", "res://.godot/imported/tunnel_neonroad.png-d20bc35a74f7193fbf270b8bead3a317.etc2.ctex"] [params] diff --git a/textures/tunnel_ring_b.png.import b/textures/tunnel_ring_b.png.import index ee479f44..433df406 100644 --- a/textures/tunnel_ring_b.png.import +++ b/textures/tunnel_ring_b.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://rvoiaddddovf" path.s3tc="res://.godot/imported/tunnel_ring_b.png-1c35dfc6f563f961d39e6af154dd0376.s3tc.ctex" +path.etc2="res://.godot/imported/tunnel_ring_b.png-1c35dfc6f563f961d39e6af154dd0376.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/tunnel_ring_b.png" -dest_files=["res://.godot/imported/tunnel_ring_b.png-1c35dfc6f563f961d39e6af154dd0376.s3tc.ctex"] +dest_files=["res://.godot/imported/tunnel_ring_b.png-1c35dfc6f563f961d39e6af154dd0376.s3tc.ctex", "res://.godot/imported/tunnel_ring_b.png-1c35dfc6f563f961d39e6af154dd0376.etc2.ctex"] [params] diff --git a/textures/tunnel_space_a.png.import b/textures/tunnel_space_a.png.import index 1e91ccd2..e25d6650 100644 --- a/textures/tunnel_space_a.png.import +++ b/textures/tunnel_space_a.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://dj66qsxt3lvm5" path.s3tc="res://.godot/imported/tunnel_space_a.png-c019dce8ef63e414d647fd95a98a56e7.s3tc.ctex" +path.etc2="res://.godot/imported/tunnel_space_a.png-c019dce8ef63e414d647fd95a98a56e7.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://textures/tunnel_space_a.png" -dest_files=["res://.godot/imported/tunnel_space_a.png-c019dce8ef63e414d647fd95a98a56e7.s3tc.ctex"] +dest_files=["res://.godot/imported/tunnel_space_a.png-c019dce8ef63e414d647fd95a98a56e7.s3tc.ctex", "res://.godot/imported/tunnel_space_a.png-c019dce8ef63e414d647fd95a98a56e7.etc2.ctex"] [params] diff --git a/user/skins/default/game/cursor.png.import b/user/skins/default/game/cursor.png.import index 7b98688b..7d3616f1 100644 --- a/user/skins/default/game/cursor.png.import +++ b/user/skins/default/game/cursor.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://3e1tjlr4m0wt" path.s3tc="res://.godot/imported/cursor.png-cf9624786284c61ac8ae54ca14020559.s3tc.ctex" +path.etc2="res://.godot/imported/cursor.png-cf9624786284c61ac8ae54ca14020559.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://user/skins/default/game/cursor.png" -dest_files=["res://.godot/imported/cursor.png-cf9624786284c61ac8ae54ca14020559.s3tc.ctex"] +dest_files=["res://.godot/imported/cursor.png-cf9624786284c61ac8ae54ca14020559.s3tc.ctex", "res://.godot/imported/cursor.png-cf9624786284c61ac8ae54ca14020559.etc2.ctex"] [params] diff --git a/user/skins/default/game/grid.png.import b/user/skins/default/game/grid.png.import index ec17ffa9..2b32700b 100644 --- a/user/skins/default/game/grid.png.import +++ b/user/skins/default/game/grid.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://b3g4aw54n6bow" path.s3tc="res://.godot/imported/grid.png-3efd333aa2086443c404b7b11f4a1736.s3tc.ctex" +path.etc2="res://.godot/imported/grid.png-3efd333aa2086443c404b7b11f4a1736.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://user/skins/default/game/grid.png" -dest_files=["res://.godot/imported/grid.png-3efd333aa2086443c404b7b11f4a1736.s3tc.ctex"] +dest_files=["res://.godot/imported/grid.png-3efd333aa2086443c404b7b11f4a1736.s3tc.ctex", "res://.godot/imported/grid.png-3efd333aa2086443c404b7b11f4a1736.etc2.ctex"] [params] diff --git a/user/skins/default/game/grid_guides.png b/user/skins/default/game/grid_guides.png new file mode 100644 index 00000000..6a818d05 Binary files /dev/null and b/user/skins/default/game/grid_guides.png differ diff --git a/user/skins/default/game/grid_guides.png.import b/user/skins/default/game/grid_guides.png.import new file mode 100644 index 00000000..007aa9ff --- /dev/null +++ b/user/skins/default/game/grid_guides.png.import @@ -0,0 +1,42 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxl0501pqg6dk" +path.s3tc="res://.godot/imported/grid_guides.png-bf7128d5e8176789cb3f95022a243e8b.s3tc.ctex" +path.etc2="res://.godot/imported/grid_guides.png-bf7128d5e8176789cb3f95022a243e8b.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://user/skins/default/game/grid_guides.png" +dest_files=["res://.godot/imported/grid_guides.png-bf7128d5e8176789cb3f95022a243e8b.s3tc.ctex", "res://.godot/imported/grid_guides.png-bf7128d5e8176789cb3f95022a243e8b.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/user/skins/default/game/health.png.import b/user/skins/default/game/health.png.import index 98ce0fc7..941324af 100644 --- a/user/skins/default/game/health.png.import +++ b/user/skins/default/game/health.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://4x2vfpyjkri6" path.s3tc="res://.godot/imported/health.png-f20bb402b3d036a3774af52b1a2fc98d.s3tc.ctex" +path.etc2="res://.godot/imported/health.png-f20bb402b3d036a3774af52b1a2fc98d.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://user/skins/default/game/health.png" -dest_files=["res://.godot/imported/health.png-f20bb402b3d036a3774af52b1a2fc98d.s3tc.ctex"] +dest_files=["res://.godot/imported/health.png-f20bb402b3d036a3774af52b1a2fc98d.s3tc.ctex", "res://.godot/imported/health.png-f20bb402b3d036a3774af52b1a2fc98d.etc2.ctex"] [params] diff --git a/user/skins/default/game/hits.png.import b/user/skins/default/game/hits.png.import index dc116501..a8597ea8 100644 --- a/user/skins/default/game/hits.png.import +++ b/user/skins/default/game/hits.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://dw2gxd3m24h4m" path.s3tc="res://.godot/imported/hits.png-9787a9f8d73df02ab1e0953fa77b9a7b.s3tc.ctex" +path.etc2="res://.godot/imported/hits.png-9787a9f8d73df02ab1e0953fa77b9a7b.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://user/skins/default/game/hits.png" -dest_files=["res://.godot/imported/hits.png-9787a9f8d73df02ab1e0953fa77b9a7b.s3tc.ctex"] +dest_files=["res://.godot/imported/hits.png-9787a9f8d73df02ab1e0953fa77b9a7b.s3tc.ctex", "res://.godot/imported/hits.png-9787a9f8d73df02ab1e0953fa77b9a7b.etc2.ctex"] [params] diff --git a/user/skins/default/game/miss_feedback.png.import b/user/skins/default/game/miss_feedback.png.import index d1c1d762..bba7a0b8 100644 --- a/user/skins/default/game/miss_feedback.png.import +++ b/user/skins/default/game/miss_feedback.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://bh68kecn6dn1c" path.s3tc="res://.godot/imported/miss_feedback.png-f749b90e50f474257c76230765b4e05c.s3tc.ctex" +path.etc2="res://.godot/imported/miss_feedback.png-f749b90e50f474257c76230765b4e05c.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://user/skins/default/game/miss_feedback.png" -dest_files=["res://.godot/imported/miss_feedback.png-f749b90e50f474257c76230765b4e05c.s3tc.ctex"] +dest_files=["res://.godot/imported/miss_feedback.png-f749b90e50f474257c76230765b4e05c.s3tc.ctex", "res://.godot/imported/miss_feedback.png-f749b90e50f474257c76230765b4e05c.etc2.ctex"] [params] diff --git a/user/skins/default/game/misses.png.import b/user/skins/default/game/misses.png.import index 6b940ded..e9cff79b 100644 --- a/user/skins/default/game/misses.png.import +++ b/user/skins/default/game/misses.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://c3x2cp3tx4vqt" path.s3tc="res://.godot/imported/misses.png-11a0a2ee1174bec878540dd7e3815cdb.s3tc.ctex" +path.etc2="res://.godot/imported/misses.png-11a0a2ee1174bec878540dd7e3815cdb.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://user/skins/default/game/misses.png" -dest_files=["res://.godot/imported/misses.png-11a0a2ee1174bec878540dd7e3815cdb.s3tc.ctex"] +dest_files=["res://.godot/imported/misses.png-11a0a2ee1174bec878540dd7e3815cdb.s3tc.ctex", "res://.godot/imported/misses.png-11a0a2ee1174bec878540dd7e3815cdb.etc2.ctex"] [params] diff --git a/user/skins/default/menu.mp3 b/user/skins/default/menu.mp3 index a5b50d17..f3ab0949 100644 Binary files a/user/skins/default/menu.mp3 and b/user/skins/default/menu.mp3 differ diff --git a/user/skins/default/menu.mp3.import b/user/skins/default/menu.mp3.import index d4ebcf2b..5711eea8 100644 --- a/user/skins/default/menu.mp3.import +++ b/user/skins/default/menu.mp3.import @@ -2,7 +2,7 @@ importer="mp3" type="AudioStreamMP3" -uid="uid://clsspjk4xdg3t" +uid="uid://bdujc776g6vg0" path="res://.godot/imported/menu.mp3-6464f7e421fc1b163d703d2d678f5f82.mp3str" [deps] diff --git a/user/skins/default/modifiers/nofail.png.import b/user/skins/default/modifiers/nofail.png.import index 8db44acb..509d4955 100644 --- a/user/skins/default/modifiers/nofail.png.import +++ b/user/skins/default/modifiers/nofail.png.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://b0k0ltu15bart" path.s3tc="res://.godot/imported/nofail.png-41ae6f785118cf09cdb55eae4ced59b7.s3tc.ctex" +path.etc2="res://.godot/imported/nofail.png-41ae6f785118cf09cdb55eae4ced59b7.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://user/skins/default/modifiers/nofail.png" -dest_files=["res://.godot/imported/nofail.png-41ae6f785118cf09cdb55eae4ced59b7.s3tc.ctex"] +dest_files=["res://.godot/imported/nofail.png-41ae6f785118cf09cdb55eae4ced59b7.s3tc.ctex", "res://.godot/imported/nofail.png-41ae6f785118cf09cdb55eae4ced59b7.etc2.ctex"] [params] diff --git a/user/skins/default/ui/menu.mp3 b/user/skins/default/ui/menu.mp3 new file mode 100644 index 00000000..f3ab0949 Binary files /dev/null and b/user/skins/default/ui/menu.mp3 differ diff --git a/user/skins/default/ui/menu.mp3.import b/user/skins/default/ui/menu.mp3.import new file mode 100644 index 00000000..bfabde6f --- /dev/null +++ b/user/skins/default/ui/menu.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://j88couhqjplh" +path="res://.godot/imported/menu.mp3-cfbb685d0300aef5df284fad65abf827.mp3str" + +[deps] + +source_file="res://user/skins/default/ui/menu.mp3" +dest_files=["res://.godot/imported/menu.mp3-cfbb685d0300aef5df284fad65abf827.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4