diff options
| -rw-r--r-- | Djup.Native/Djup.Native.csproj | 2 | ||||
| -rwxr-xr-x | Djup.Native/patch-deps.sh | 2 | ||||
| -rw-r--r-- | client/Djup.csproj | 6 | ||||
| -rw-r--r-- | client/Game.cs.uid | 1 | ||||
| -rw-r--r-- | client/Player.cs.uid | 1 | ||||
| -rw-r--r-- | client/World.cs.uid | 1 | ||||
| -rw-r--r-- | client/game.tscn | 2 | ||||
| -rw-r--r-- | client/player.tscn | 2 | ||||
| -rw-r--r-- | client/project.godot | 6 | ||||
| -rw-r--r-- | client/world.tscn | 2 |
10 files changed, 15 insertions, 10 deletions
diff --git a/Djup.Native/Djup.Native.csproj b/Djup.Native/Djup.Native.csproj index 107e293..f3c2781 100644 --- a/Djup.Native/Djup.Native.csproj +++ b/Djup.Native/Djup.Native.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net8.0</TargetFramework> + <TargetFramework>net10.0</TargetFramework> <ImplicitUsings>enable</ImplicitUsings> <Nullable>enable</Nullable> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> diff --git a/Djup.Native/patch-deps.sh b/Djup.Native/patch-deps.sh index d1f3bbf..8015323 100755 --- a/Djup.Native/patch-deps.sh +++ b/Djup.Native/patch-deps.sh @@ -1,4 +1,4 @@ #!/bin/sh depsjson="$(find "$1" -name '*.deps.json')" -patched="$(jq '.targets.".NETCoreApp,Version=v8.0"."Djup.Native/1.0.0" += {"runtimeTargets": {"runtimes/linux-x64/native/libdjup.so": {"rid": "linux-x64", "assetType": "native"} }}' "$depsjson")" +patched="$(jq '.targets.".NETCoreApp,Version=v10.0"."Djup.Native/1.0.0" += {"runtimeTargets": {"runtimes/linux-x64/native/libdjup.so": {"rid": "linux-x64", "assetType": "native"} }}' "$depsjson")" echo -n "$patched" > "$depsjson" diff --git a/client/Djup.csproj b/client/Djup.csproj index 0e34542..de4ca2f 100644 --- a/client/Djup.csproj +++ b/client/Djup.csproj @@ -1,8 +1,6 @@ -<Project Sdk="Godot.NET.Sdk/4.3.0"> +<Project Sdk="Godot.NET.Sdk/4.6.1"> <PropertyGroup> - <TargetFramework>net8.0</TargetFramework> - <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework> - <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework> + <TargetFramework>net10.0</TargetFramework> <EnableDynamicLoading>true</EnableDynamicLoading> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> diff --git a/client/Game.cs.uid b/client/Game.cs.uid new file mode 100644 index 0000000..09994b1 --- /dev/null +++ b/client/Game.cs.uid @@ -0,0 +1 @@ +uid://bacc4njrygwie diff --git a/client/Player.cs.uid b/client/Player.cs.uid new file mode 100644 index 0000000..336ca89 --- /dev/null +++ b/client/Player.cs.uid @@ -0,0 +1 @@ +uid://83q1e5vk2swk diff --git a/client/World.cs.uid b/client/World.cs.uid new file mode 100644 index 0000000..01d051f --- /dev/null +++ b/client/World.cs.uid @@ -0,0 +1 @@ +uid://cj1l4s5bq73bd diff --git a/client/game.tscn b/client/game.tscn index 4ec7809..576d002 100644 --- a/client/game.tscn +++ b/client/game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://w0k2j13hm04i"] +[gd_scene format=3 uid="uid://w0k2j13hm04i"] [ext_resource type="Script" path="res://Game.cs" id="1_t8lam"] [ext_resource type="PackedScene" uid="uid://drdk1by1fun2q" path="res://world.tscn" id="2_tm4sj"] diff --git a/client/player.tscn b/client/player.tscn index b1f9f5f..ef3913c 100644 --- a/client/player.tscn +++ b/client/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://b0f23dtef1o4h"] +[gd_scene format=3 uid="uid://b0f23dtef1o4h"] [ext_resource type="Script" path="res://Player.cs" id="1_bjul0"] diff --git a/client/project.godot b/client/project.godot index 403aac4..d5cf98a 100644 --- a/client/project.godot +++ b/client/project.godot @@ -8,11 +8,15 @@ config_version=5 +[animation] + +compatibility/default_parent_skeleton_in_mesh_instance_3d=true + [application] config/name="Djup" run/main_scene="res://game.tscn" -config/features=PackedStringArray("4.3", "C#", "Forward Plus") +config/features=PackedStringArray("4.6", "C#", "Forward Plus") config/icon="res://icon.svg" [display] diff --git a/client/world.tscn b/client/world.tscn index 0055d3b..972f028 100644 --- a/client/world.tscn +++ b/client/world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://drdk1by1fun2q"] +[gd_scene format=3 uid="uid://drdk1by1fun2q"] [ext_resource type="Script" path="res://World.cs" id="1_7wii1"] |