mirror of
https://github.com/nolen777/eagle0.git
synced 2026-07-28 22:35:42 +00:00
98d70fa995
* Add hippogryph beast effect using DragonEffect flight system Reuses DragonEffect.cs (flight/ground state machine) with a custom HippogryphMapAnims controller mapping 15 animation states to the PROTOFACTOR Hippogriff asset. Includes PBR materials, 12 animation FBXes, and tuned flight parameters (scale 8, fly height 12). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Reduce hippogriff texture maxTextureSize to 512 The Addressable bundle build was failing during ArchiveAndCompress because the hippogriff textures were imported at 4096x4096 (default from the asset pack). For a map-view beast effect, 512 is plenty. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Fix texture .meta files stored as LFS pointers instead of YAML The broad directory-level LFS pattern in .gitattributes was catching .meta text files. Replace with a global *.jpg pattern (other binary formats already have global patterns) and re-add the 8 texture .meta files as regular blobs so Unity can read them on CI. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
44 lines
2.0 KiB
Plaintext
44 lines
2.0 KiB
Plaintext
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
|
*.flac filter=lfs diff=lfs merge=lfs -text
|
|
*.png filter=lfs diff=lfs merge=lfs -text
|
|
*.wav filter=lfs diff=lfs merge=lfs -text
|
|
*.tif filter=lfs diff=lfs merge=lfs -text
|
|
*.bytes filter=lfs diff=lfs merge=lfs -text
|
|
*.psd filter=lfs diff=lfs merge=lfs -text
|
|
*.psb filter=lfs diff=lfs merge=lfs -text
|
|
# PSB meta files contain bone/sprite import data and can be very large
|
|
*.psb.meta filter=lfs diff=lfs merge=lfs -text
|
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
|
# Exclude pre-existing font files that were committed as blobs (not LFS pointers)
|
|
src/main/csharp/**/GUI[[:space:]]Pro[[:space:]]Kit*/**/*.ttf !filter !diff !merge
|
|
src/main/csharp/**/Modern[[:space:]]UI[[:space:]]Pack/**/*.ttf !filter !diff !merge
|
|
*.herodata filter=lfs diff=lfs merge=lfs -text
|
|
*.ogg filter=lfs diff=lfs merge=lfs -text
|
|
*.tga filter=lfs diff=lfs merge=lfs -text
|
|
*.fbx filter=lfs diff=lfs merge=lfs -text
|
|
*.FBX filter=lfs diff=lfs merge=lfs -text
|
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
|
# Third-party asset packs: track all files via LFS (never manually edited)
|
|
src/main/csharp/**/DungeonMonsters2D/** filter=lfs diff=lfs merge=lfs -text
|
|
src/main/csharp/**/Raccoon/** filter=lfs diff=lfs merge=lfs -text
|
|
src/main/csharp/**/Polytope[[:space:]]Studio/** filter=lfs diff=lfs merge=lfs -text
|
|
src/main/csharp/**/RRFreelance-Characters/** filter=lfs diff=lfs merge=lfs -text
|
|
src/main/csharp/**/Dragon/** filter=lfs diff=lfs merge=lfs -text
|
|
*.jpg filter=lfs diff=lfs merge=lfs -text
|
|
|
|
# Unity Smart Merge - use UnityYAMLMerge for Unity files
|
|
# Requires configuring unityyamlmerge in ~/.gitconfig:
|
|
# [merge]
|
|
# tool = unityyamlmerge
|
|
# [mergetool "unityyamlmerge"]
|
|
# trustExitCode = false
|
|
# cmd = '/Applications/Unity/Hub/Editor/*/Unity.app/Contents/Tools/UnityYAMLMerge' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
|
|
*.unity merge=unityyamlmerge
|
|
*.prefab merge=unityyamlmerge
|
|
*.asset merge=unityyamlmerge
|
|
*.mat merge=unityyamlmerge
|
|
*.anim merge=unityyamlmerge
|
|
*.controller merge=unityyamlmerge
|
|
*.physicsMaterial2D merge=unityyamlmerge
|
|
*.physicMaterial merge=unityyamlmerge
|