Feats: Grid guides, menu theme, minor settings & MacOS build changes

addons/ffmpeg/LICENSE-ffmpeg.txt.uid

@@ -0,0 +1 @@
+uid://b3ustrqft4n31

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": ""}
+    "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": ""
+    }

addons/ffmpeg/macos/libgdffmpeg.macos.template_release.framework/Resources/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>libgdffmpeg_advanced.macos.template_release</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.godotengine.ffmpeg</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>FFmpeg for Godot</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.14</string>
+</dict>
+</plist>

prefabs/spaces/relic.tscn

@@ -5,12 +5,35 @@
 
 [sub_resource type="Environment" id="87"]
 background_mode = 1
-glow_enabled = true
 glow_intensity = 0.0
 glow_bloom = 0.9
 glow_blend_mode = 0
 glow_hdr_scale = 1.5
 
+[sub_resource type="BoxMesh" id="BoxMesh_dyp4q"]
+size = Vector3(2, 2, 0)
+
+[sub_resource type="Gradient" id="Gradient_dyp4q"]
+colors = PackedColorArray(0, 0, 0, 0, 1, 1, 1, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_haq2w"]
+gradient = SubResource("Gradient_dyp4q")
+fill_from = Vector2(0.530303, 0.540404)
+fill_to = Vector2(0.5252525, 0)
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_haq2w"]
+transparency = 1
+cull_mode = 2
+albedo_texture = SubResource("GradientTexture2D_haq2w")
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ybwb5"]
+transparency = 1
+shading_mode = 0
+albedo_texture = SubResource("GradientTexture2D_haq2w")
+
+[sub_resource type="BoxMesh" id="103"]
+size = Vector3(2, 2, 0)
+
 [sub_resource type="Gradient" id="99"]
 offsets = PackedFloat32Array(0, 0.5, 1)
 colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0)
@@ -51,30 +74,6 @@ material = SubResource("109")
 radial_segments = 4
 rings = 4
 
-[sub_resource type="BoxMesh" id="BoxMesh_dyp4q"]
-size = Vector3(2, 2, 0)
-
-[sub_resource type="Gradient" id="Gradient_dyp4q"]
-colors = PackedColorArray(0, 0, 0, 0, 1, 1, 1, 1)
-
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_haq2w"]
-gradient = SubResource("Gradient_dyp4q")
-fill_from = Vector2(0.530303, 0.540404)
-fill_to = Vector2(0.5252525, 0)
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_haq2w"]
-transparency = 1
-cull_mode = 2
-albedo_texture = SubResource("GradientTexture2D_haq2w")
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ybwb5"]
-transparency = 1
-shading_mode = 0
-albedo_texture = SubResource("GradientTexture2D_haq2w")
-
-[sub_resource type="BoxMesh" id="103"]
-size = Vector3(2, 2, 0)
-
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5nlfu"]
 transparency = 1
 shading_mode = 0
@@ -210,17 +209,6 @@ script = ExtResource("1_dyp4q")
 [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=839114113]
 environment = SubResource("87")
 
-[node name="Aura" type="GPUParticles3D" parent="." unique_id=308200453]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.0570873)
-amount = 512
-lifetime = 4.0
-randomness = 0.3
-fract_delta = false
-visibility_aabb = AABB(-3.795, -2.38, -5.865, 12, 12, 12)
-trail_lifetime = 2.8699999999999997
-process_material = SubResource("101")
-draw_pass_1 = SubResource("102")
-
 [node name="Structures" type="Node3D" parent="." unique_id=1590467259]
 
 [node name="Back" type="Node3D" parent="Structures" unique_id=98665528]
@@ -389,10 +377,20 @@ mesh = SubResource("103")
 skeleton = NodePath("../../..")
 surface_material_override/0 = SubResource("StandardMaterial3D_ybwb5")
 
-[node name="Particles" type="Node3D" parent="Structures/Front" unique_id=430346035]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 30)
+[node name="Particles" type="Node3D" parent="." unique_id=430346035]
+
+[node name="Aura" type="GPUParticles3D" parent="Particles" unique_id=308200453]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.0570873)
+amount = 512
+lifetime = 4.0
+randomness = 0.3
+fract_delta = false
+visibility_aabb = AABB(-3.795, -2.38, -5.865, 12, 12, 12)
+trail_lifetime = 2.8699999999999997
+process_material = SubResource("101")
+draw_pass_1 = SubResource("102")
 
-[node name="Left" type="GPUParticles3D" parent="Structures/Front/Particles" unique_id=393957993]
+[node name="Left" type="GPUParticles3D" parent="Particles" unique_id=393957993]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -47.9036, 3.63416, -53.099064)
 material_override = SubResource("StandardMaterial3D_5nlfu")
 transparency = 0.75
@@ -403,7 +401,7 @@ randomness = 0.1
 process_material = SubResource("ParticleProcessMaterial_ywech")
 draw_pass_1 = SubResource("ArrayMesh_haq2w")
 
-[node name="Right" type="GPUParticles3D" parent="Structures/Front/Particles" unique_id=1423380688]
+[node name="Right" type="GPUParticles3D" parent="Particles" unique_id=1423380688]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50.0899, 3.63416, -54.89727)
 material_override = SubResource("StandardMaterial3D_5nlfu")
 transparency = 0.75

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

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://ccdaf14yq65jf" 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

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