Fixed merge errors

2026-01-19 10:41:03 -07:00
parent 9e0eed66c3
commit 985a975577
50 changed files with 1622 additions and 81 deletions
--- a/project.godot
+++ b/project.godot
@@ -10,13 +10,22 @@ config_version=5

 [application]

-config/name="FRACTUREPOINT"
-config/features=PackedStringArray("4.5", "GL Compatibility")
+config/name="fracturepoint"
+run/main_scene="uid://bn5opy6atakg"
+config/features=PackedStringArray("4.5", "C#", "GL Compatibility")
 config/icon="res://icon.svg"

+[display]
+
+window/size/viewport_width=640
+window/size/viewport_height=360
+window/size/mode=3
+window/stretch/mode="viewport"
+window/stretch/scale_mode="integer"
+
 [dotnet]

-project/assembly_name="FRACTUREPOINT"
+project/assembly_name="fracturepoint"

 [input]