Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23
This commit is contained in:
commit
f4d371afca
6 changed files with 17 additions and 20 deletions
BIN
blends/island.blend
Normal file
BIN
blends/island.blend
Normal file
Binary file not shown.
BIN
blends/island.blend1
Normal file
BIN
blends/island.blend1
Normal file
Binary file not shown.
26
godot/.gitattributes
vendored
26
godot/.gitattributes
vendored
|
@ -1,15 +1,15 @@
|
||||||
# Normalize EOL for all files that Git considers text files.
|
# Normalize EOL for all files that Git considers text files.
|
||||||
* text=auto eol=lf
|
* text=auto eol=lf
|
||||||
*.glb filter=lfs diff=lfs merge=lfs -text lockable
|
*.glb filter=lfs diff=lfs merge=lfs -text
|
||||||
*.png filter=lfs diff=lfs merge=lfs -text lockable
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
*.jpeg filter=lfs diff=lfs merge=lfs -text lockable
|
*.jpeg filter=lfs diff=lfs merge=lfs -text
|
||||||
*.jpg filter=lfs diff=lfs merge=lfs -text lockable
|
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||||
*.material filter=lfs diff=lfs merge=lfs -text lockable
|
*.material filter=lfs diff=lfs merge=lfs -text
|
||||||
*.mdd filter=lfs diff=lfs merge=lfs -text lockable
|
*.mdd filter=lfs diff=lfs merge=lfs -text
|
||||||
*.abc filter=lfs diff=lfs merge=lfs -text lockable
|
*.abc filter=lfs diff=lfs merge=lfs -text
|
||||||
*.ogg filter=lfs diff=lfs merge=lfs -text lockable
|
*.ogg filter=lfs diff=lfs merge=lfs -text
|
||||||
*.mp3 filter=lfs diff=lfs merge=lfs -text lockable
|
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||||
*.mp4 filter=lfs diff=lfs merge=lfs -text lockable
|
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
||||||
*.blend filter=lfs diff=lfs merge=lfs -text lockable
|
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||||
*.zip filter=lfs diff=lfs merge=lfs -text lockable
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
*.pc2 filter=lfs diff=lfs merge=lfs -text lockable
|
*.pc2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
|
BIN
godot/Models/island.glb
(Stored with Git LFS)
BIN
godot/Models/island.glb
(Stored with Git LFS)
Binary file not shown.
BIN
godot/Models/ocean.glb
(Stored with Git LFS)
BIN
godot/Models/ocean.glb
(Stored with Git LFS)
Binary file not shown.
BIN
godot/island.blend
(Stored with Git LFS)
BIN
godot/island.blend
(Stored with Git LFS)
Binary file not shown.
Loading…
Add table
Reference in a new issue