Merge pull request 'feat/1-marketing_assets_refresh' (#2) from feat/1-marketing_assets_refresh into 1.20
Reviewed-on: #2
This commit is contained in:
4
.gitattributes
vendored
4
.gitattributes
vendored
@ -1,8 +1,8 @@
|
||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.kra filter=lfs diff=lfs merge=lfs -text
|
||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
*.mtl filter=lfs diff=lfs merge=lfs -text
|
||||
*.bbmodel filter=lfs diff=lfs merge=lfs -text
|
||||
*.kra filter=lfs diff=lfs merge=lfs -text
|
||||
*.ogg filter=lfs diff=lfs merge=lfs -text
|
||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,7 @@
|
||||
### Assets
|
||||
*.blend?
|
||||
*.kra~
|
||||
|
||||
### Java template
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
BIN
assets/images/blender/login_protection.blend
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/login_protection.blend
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world-Alpha.png
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world-Alpha.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world-RGB.png
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world-RGB.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world-RGBA.png
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world-RGBA.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world.mtl
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world.mtl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world.obj
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world.obj
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/banner-vignette.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/banner-vignette.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/banner.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/banner.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/card-vignette.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/card-vignette.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/card.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/card.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/logo-vignette.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/logo-vignette.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/logo.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/logo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/shield.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/shield.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/banner.jpg
(Stored with Git LFS)
Normal file
BIN
assets/images/web/banner.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/banner.kra
(Stored with Git LFS)
Normal file
BIN
assets/images/web/banner.kra
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/card.jpg
(Stored with Git LFS)
Normal file
BIN
assets/images/web/card.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/card.kra
(Stored with Git LFS)
Normal file
BIN
assets/images/web/card.kra
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/logo.jpg
(Stored with Git LFS)
Normal file
BIN
assets/images/web/logo.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/logo.kra
(Stored with Git LFS)
Normal file
BIN
assets/images/web/logo.kra
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/shield/shield.bbmodel
(Stored with Git LFS)
Normal file
BIN
assets/items/shield/shield.bbmodel
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/shield/shield.mtl
(Stored with Git LFS)
Normal file
BIN
assets/items/shield/shield.mtl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/shield/shield.obj
(Stored with Git LFS)
Normal file
BIN
assets/items/shield/shield.obj
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/shield/shield.png
(Stored with Git LFS)
Normal file
BIN
assets/items/shield/shield.png
(Stored with Git LFS)
Normal file
Binary file not shown.
Reference in New Issue
Block a user