summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorJoel Stålnacke <joel@saker.fi>2026-03-19 21:14:02 +0200
committerJoel Stålnacke <joel@saker.fi>2026-03-19 21:14:02 +0200
commitc8ec21382633851dfb25922f7c15610818865b29 (patch)
treef47d70329d8c8827d1fa0456e901d4d2550e3f97 /client
parent69dcaa0610e54468bdcf4b1dae43de623939b2ab (diff)
Update to .NET 10 and Godot 4.6testing
Diffstat (limited to 'client')
-rw-r--r--client/Djup.csproj6
-rw-r--r--client/Game.cs.uid1
-rw-r--r--client/Player.cs.uid1
-rw-r--r--client/World.cs.uid1
-rw-r--r--client/game.tscn2
-rw-r--r--client/player.tscn2
-rw-r--r--client/project.godot6
-rw-r--r--client/world.tscn2
8 files changed, 13 insertions, 8 deletions
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"]