Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

2023-08-18 23:15:53 -06:00 · 2023-08-18 23:15:53 -06:00 · f4d371afca
parent dd0fc32866 253fca1070
commit f4d371afca
6 changed files with 17 additions and 20 deletions
--- a/blends/island.blend
+++ b/blends/island.blend
--- a/blends/island.blend1
+++ b/blends/island.blend1
--- a/godot/.gitattributes
+++ b/godot/.gitattributes
@ -1,15 +1,15 @@
 # Normalize EOL for all files that Git considers text files.
 * text=auto eol=lf
-*.glb filter=lfs diff=lfs merge=lfs -text lockable
-*.png filter=lfs diff=lfs merge=lfs -text lockable
-*.jpeg filter=lfs diff=lfs merge=lfs -text lockable
-*.jpg filter=lfs diff=lfs merge=lfs -text lockable
-*.material filter=lfs diff=lfs merge=lfs -text lockable
-*.mdd filter=lfs diff=lfs merge=lfs -text lockable
-*.abc filter=lfs diff=lfs merge=lfs -text lockable
-*.ogg filter=lfs diff=lfs merge=lfs -text lockable
-*.mp3 filter=lfs diff=lfs merge=lfs -text lockable
-*.mp4 filter=lfs diff=lfs merge=lfs -text lockable
-*.blend filter=lfs diff=lfs merge=lfs -text lockable
-*.zip filter=lfs diff=lfs merge=lfs -text lockable
-*.pc2 filter=lfs diff=lfs merge=lfs -text lockable
+*.glb filter=lfs diff=lfs merge=lfs -text 
+*.png filter=lfs diff=lfs merge=lfs -text 
+*.jpeg filter=lfs diff=lfs merge=lfs -text 
+*.jpg filter=lfs diff=lfs merge=lfs -text 
+*.material filter=lfs diff=lfs merge=lfs -text 
+*.mdd filter=lfs diff=lfs merge=lfs -text 
+*.abc filter=lfs diff=lfs merge=lfs -text 
+*.ogg filter=lfs diff=lfs merge=lfs -text 
+*.mp3 filter=lfs diff=lfs merge=lfs -text 
+*.mp4 filter=lfs diff=lfs merge=lfs -text 
+*.blend filter=lfs diff=lfs merge=lfs -text 
+*.zip filter=lfs diff=lfs merge=lfs -text 
+*.pc2 filter=lfs diff=lfs merge=lfs -text 
--- a/godot/Models/island.glb
+++ b/godot/Models/island.glb
--- a/godot/Models/ocean.glb
+++ b/godot/Models/ocean.glb
--- a/godot/island.blend
+++ b/godot/island.blend