From 25de3bf08e704d936e5b3c67b1bb6bfa8a400cba Mon Sep 17 00:00:00 2001 From: null Date: Sat, 18 Apr 2026 17:56:24 -0500 Subject: [PATCH] Updated to Godot 4.6 and added .gitattributes file --- .gitattributes | 42 +++++++++++++++++++ .../simplegrasstextured/default_mesh.tres | 2 +- game/assets/models/human.blend.import | 1 + game/project.godot | 2 +- 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c68a711 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,42 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.cs text diff=csharp +*.gd text +*.tscn text +*.tres text +*.json text +*.md text +*.xml text +*.yml text +*.yaml text +*.csproj text +*.sln text + +# Declare files that will always have CRLF line endings on checkout. +*.bat text eol=crlf +*.ps1 text eol=crlf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.ico binary +*.mov binary +*.mp4 binary +*.mp3 binary +*.wav binary +*.ogg binary +*.ttf binary +*.otf binary +*.woff binary +*.woff2 binary +*.eot binary +*.pdf binary +*.zip binary +*.7z binary +*.import binary +*.uid binary diff --git a/game/addons/simplegrasstextured/default_mesh.tres b/game/addons/simplegrasstextured/default_mesh.tres index 0ccc4b4..c52f3aa 100644 --- a/game/addons/simplegrasstextured/default_mesh.tres +++ b/game/addons/simplegrasstextured/default_mesh.tres @@ -12,4 +12,4 @@ _surfaces = [{ "vertex_count": 8, "vertex_data": PackedByteArray("AAAAvwAAgD8AAAAAAAAAPwAAAAAAAAAAAAAAvwAAAAAAAAAAAAAAPwAAgD8AAAAAAAAAAAAAgD8AAAC/AAAAAAAAAAAAAAA/AAAAAAAAAAAAAAC/AAAAAAAAgD8AAAA//3//f////7//f/9/////v/9//3////+//3//f////78AAP9//3//vwAA/3//f/+/AAD/f/9//78AAP9//3//vw==") }] -metadata/GodotVersion = "4.5-stable (official)" +metadata/GodotVersion = "4.6.2-stable (official)" diff --git a/game/assets/models/human.blend.import b/game/assets/models/human.blend.import index d05a2b2..e2b998a 100644 --- a/game/assets/models/human.blend.import +++ b/game/assets/models/human.blend.import @@ -48,6 +48,7 @@ blender/meshes/colors=false blender/meshes/uvs=true blender/meshes/normals=true blender/meshes/export_geometry_nodes_instances=false +blender/meshes/gpu_instances=false blender/meshes/tangents=true blender/meshes/skins=2 blender/meshes/export_bones_deforming_mesh_only=false diff --git a/game/project.godot b/game/project.godot index b307eb3..f079af3 100644 --- a/game/project.godot +++ b/game/project.godot @@ -40,7 +40,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true config/name="Promiscuity" run/main_scene="uid://b4k81taauef4q" -config/features=PackedStringArray("4.5", "Forward Plus") +config/features=PackedStringArray("4.6", "Forward Plus") config/icon="res://icon.svg" [audio] -- 2.39.5