Compare commits

...

2 Commits

Author SHA1 Message Date
020ede82b6 Merge pull request 'Updated to Godot 4.6 and added .gitattributes file' (#11) from update_4.6 into main
All checks were successful
Deploy Promiscuity Auth API / deploy (push) Successful in 52s
Deploy Promiscuity Character API / deploy (push) Successful in 47s
Deploy Promiscuity Crafting API / deploy (push) Successful in 47s
Deploy Promiscuity Inventory API / deploy (push) Successful in 47s
Deploy Promiscuity Locations API / deploy (push) Successful in 50s
Deploy Promiscuity Mail API / deploy (push) Successful in 49s
Deploy Promiscuity World API / deploy (push) Successful in 47s
k8s smoke test / test (push) Successful in 9s
Reviewed-on: #11
2026-04-18 17:57:34 -05:00
25de3bf08e Updated to Godot 4.6 and added .gitattributes file 2026-04-18 17:56:24 -05:00
4 changed files with 45 additions and 2 deletions

42
.gitattributes vendored Normal file
View File

@ -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

View File

@ -12,4 +12,4 @@ _surfaces = [{
"vertex_count": 8, "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==") "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)"

View File

@ -48,6 +48,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true blender/meshes/uvs=true
blender/meshes/normals=true blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true blender/meshes/tangents=true
blender/meshes/skins=2 blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false blender/meshes/export_bones_deforming_mesh_only=false

View File

@ -40,7 +40,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
config/name="Promiscuity" config/name="Promiscuity"
run/main_scene="uid://b4k81taauef4q" run/main_scene="uid://b4k81taauef4q"
config/features=PackedStringArray("4.5", "Forward Plus") config/features=PackedStringArray("4.6", "Forward Plus")
config/icon="res://icon.svg" config/icon="res://icon.svg"
[audio] [audio]