diff --git a/.env b/.env index 987e56b..d7b4e6a 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ # Godot -GODOT_VERSION=4.2.2-stable +GODOT_VERSION=4.3-stable # Game diff --git a/CHANGELOG.md b/CHANGELOG.md index f0ef687..2bb60e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Dependencies - Bump `extractions/setup-just` from 1 to 2 ([#56](https://github.com/MechanicalFlower/Marble/pull/56)) - Bump `dawidd6/action-download-artifact` from 3 to 6 ([#65](https://github.com/MechanicalFlower/Marble/pull/65), [#68](https://github.com/MechanicalFlower/Marble/pull/68), [#70](https://github.com/MechanicalFlower/Marble/pull/70)) +- Bump `godot` from 4.2 to 4.3 ([#76](https://github.com/MechanicalFlower/Marble/pull/76)) ## [1.6.1] ### Added diff --git a/README.md b/README.md index 2b0c47e..f9bae5f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # ⚽ Marble -![Godot Badge](https://img.shields.io/badge/godot-4.2-blue?logo=Godot-Engine&logoColor=white) +![Godot Badge](https://img.shields.io/badge/godot-4.3-blue?logo=Godot-Engine&logoColor=white) ![license](https://img.shields.io/badge/license-MIT-green?logo=open-source-initiative&logoColor=white) ![reuse](./.reuse/REUSE-compliant.svg) diff --git a/assets/textures/marble/marble_albedo.jpg.import b/assets/textures/marble/marble_albedo.jpg.import index 01130ef..bc7ca16 100644 --- a/assets/textures/marble/marble_albedo.jpg.import +++ b/assets/textures/marble/marble_albedo.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://8dp5yxgnqaqv" path.s3tc="res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.s3tc.ctex" +path.etc2="res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/textures/marble/marble_albedo.jpg" -dest_files=["res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.s3tc.ctex"] +dest_files=["res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.s3tc.ctex", "res://.godot/imported/marble_albedo.jpg-8292e2c469ab97b231b5257b8930c8e2.etc2.ctex"] [params] diff --git a/assets/textures/marble/marble_normal.jpg.import b/assets/textures/marble/marble_normal.jpg.import index 2e79a70..3eb7fa0 100644 --- a/assets/textures/marble/marble_normal.jpg.import +++ b/assets/textures/marble/marble_normal.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://60dl3bvlmlx" path.s3tc="res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.s3tc.ctex" +path.etc2="res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/textures/marble/marble_normal.jpg" -dest_files=["res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.s3tc.ctex"] +dest_files=["res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.s3tc.ctex", "res://.godot/imported/marble_normal.jpg-7d65e629b43f63826c5b74f05a987e78.etc2.ctex"] [params] diff --git a/assets/textures/marble/marble_oughness.jpg.import b/assets/textures/marble/marble_oughness.jpg.import index 5860382..8aa3f51 100644 --- a/assets/textures/marble/marble_oughness.jpg.import +++ b/assets/textures/marble/marble_oughness.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://bcwf8u32r3bwe" path.s3tc="res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.s3tc.ctex" +path.etc2="res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/textures/marble/marble_oughness.jpg" -dest_files=["res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.s3tc.ctex"] +dest_files=["res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.s3tc.ctex", "res://.godot/imported/marble_oughness.jpg-2aa7ae20a77cf29d0f9e0d8fa733ad85.etc2.ctex"] [params] diff --git a/assets/textures/wood.jpg.import b/assets/textures/wood.jpg.import index 14ddb53..de52cfd 100644 --- a/assets/textures/wood.jpg.import +++ b/assets/textures/wood.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://7jjt3qf5qe5" path.s3tc="res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.s3tc.ctex" +path.etc2="res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://assets/textures/wood.jpg" -dest_files=["res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.s3tc.ctex"] +dest_files=["res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.s3tc.ctex", "res://.godot/imported/wood.jpg-897dc28bf1d4f7dbf1db92bcbec9e6da.etc2.ctex"] [params] diff --git a/export_presets.cfg b/export_presets.cfg index 66becb4..dffa323 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -35,8 +35,8 @@ application/modify_resources=true application/icon="" application/console_wrapper_icon="" application/icon_interpolation=4 -application/file_version="1.6.1.20240225" -application/product_version="1.6.1.20240225" +application/file_version="1.6.1.20240817" +application/product_version="1.6.1.20240817" application/company_name="Mechanical Flower" application/product_name="Marble" application/file_description="" diff --git a/plug.gd b/plug.gd index 5221b24..7c62cf3 100644 --- a/plug.gd +++ b/plug.gd @@ -10,7 +10,3 @@ func _plugging(): "KoBeWi/Godot-Universal-Fade", {"commit": "f091514bba652880f81c5bc8809e0ee4498988ea", "renovate-branch": "master"} ) - plug( - "nisovin/godot-coi-serviceworker", - {"commit": "de1be2989eda4c7d77a08b8c56cd94c769181c4e", "renovate-branch": "main"} - ) diff --git a/project.godot b/project.godot index 3e2622e..bdbc03c 100644 --- a/project.godot +++ b/project.godot @@ -18,7 +18,7 @@ config/name="Marble" config/version="1.6.1" run/main_scene="res://scenes/main.tscn" config/project_settings_override="override.cfg" -config/features=PackedStringArray("4.2") +config/features=PackedStringArray("4.3") run/max_fps=60 config/icon="res://assets/icon.png" @@ -40,8 +40,8 @@ source/commit="41b766d42997fc9af1af4cb8680329bf02d0833f" [custom_options] -build_info/commit="8b5eab3456e7d73e84274c37eb9fd5ca14825420" -build_info/date="2024/02/11" +build_info/commit="996e6018e05b70ef54ee9990d8b600588ed2ff3a" +build_info/date="2024/08/17" [display] @@ -51,7 +51,7 @@ window/size/height=720 [editor_plugins] -enabled=PackedStringArray("res://addons/coi_serviceworker/plugin.cfg", "res://addons/debug_menu/plugin.cfg", "res://addons/export-build-info/plugin.cfg") +enabled=PackedStringArray("res://addons/debug_menu/plugin.cfg", "res://addons/export-build-info/plugin.cfg") [filesystem] @@ -89,6 +89,7 @@ common/enable_pause_aware_picking=true [rendering] occlusion_culling/bvh_build_quality=1 +textures/vram_compression/import_etc2_astc=true camera/depth_of_field/depth_of_field_bokeh_shape=0 environment/ssao/quality=0 environment/ssil/quality=0 diff --git a/public/packaging/snap/snapcraft.yaml b/public/packaging/snap/snapcraft.yaml index 3be51e7..c8c0c30 100644 --- a/public/packaging/snap/snapcraft.yaml +++ b/public/packaging/snap/snapcraft.yaml @@ -18,6 +18,7 @@ apps: plugs: - pulseaudio - opengl + - wayland - x11 desktop: org.mechanicalflower.Marble.desktop environment: diff --git a/scenes/marble.tscn b/scenes/marble.tscn index 215bdb5..2f45693 100644 --- a/scenes/marble.tscn +++ b/scenes/marble.tscn @@ -18,8 +18,8 @@ radius = 0.3 [node name="Marble" type="RigidBody3D" groups=["marbles"]] collision_layer = 4 -max_contacts_reported = 10000 contact_monitor = true +max_contacts_reported = 10000 script = ExtResource("1") [node name="Ball" type="MeshInstance3D" parent="."]