mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'add-lfs-asset-storage-system' into 'master'
Added LFS config, removed modules Closes #71 See merge request veloren/veloren!103 Former-commit-id: d8e2e0dc15a4d16d433f76c814ee02aeb4957e76
This commit is contained in:
commit
01b993bab1
5
.gitattributes
vendored
Normal file
5
.gitattributes
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.vox filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.wav filter=lfs diff=lfs merge=lfs -text
|
||||
*.ogg filter=lfs diff=lfs merge=lfs -text
|
@ -29,8 +29,6 @@ before_script:
|
||||
echo "THIS SEEMS TO BE A MERGE PIPELINE FROM ${SOURCE_PROJECT}/${SOURCE_BRANCH}";
|
||||
git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}";
|
||||
fi;
|
||||
- git submodule sync --recursive
|
||||
- git submodule update --init --recursive --depth 20
|
||||
- git status
|
||||
- if [ -d target ]; then
|
||||
ls -la target;
|
||||
|
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -1,4 +0,0 @@
|
||||
[submodule "assets/voxygen"]
|
||||
path = assets/voxygen
|
||||
url = ../../veloren/fresh-assets/voxygen.git
|
||||
shallow = true
|
@ -1 +0,0 @@
|
||||
Subproject commit bcf9a93d2061c981fa9ecb13e2f8a8d51524d045
|
BIN
assets/voxygen/background/bg_creation.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/background/bg_creation.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/background/bg_main.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/background/bg_main.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/background/bg_selection.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/background/bg_selection.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_down_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/chat_arrow_up_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/left.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/left.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/left_inactive.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/left_inactive.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/left_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/left_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/left_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/left_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/right.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/right.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/right_inactive.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/right_inactive.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/right_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/right_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow/right_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow/right_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow_down.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow_down.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow_down_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow_down_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/arrow_down_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/arrow_down_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/closed.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/closed.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/closed.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/closed.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/closed_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/closed_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/closed_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/closed_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/closed_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/closed_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/closed_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/closed_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/open.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/open.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/open.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/open.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/open_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/open_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/open_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/open_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/open_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/open_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/bag/open_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/bag/open_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/blue_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/blue_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/blue_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/blue_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/border.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/border.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/border_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/border_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/border_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/border_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/border_pressed.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/border_pressed.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark_red.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark_red.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark_red_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark_red_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_dark_red_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_dark_red_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_login.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_login.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_login_hover.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_login_hover.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_login_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_login_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_closed.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_closed.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_closed_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_closed_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_closed_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_closed_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_open.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_open.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_open_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_open_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_mmap_open_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_mmap_open_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_red.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_red.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_red_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_red_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/button_red_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/button_red_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/character.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/character.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/character_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/character_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/character_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/character_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/no.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/no.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/no.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/no.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/no_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/no_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/no_mo.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/no_mo.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/yes.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/yes.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/yes.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/yes.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/yes_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/yes_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/check/yes_mo.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/check/yes_mo.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/frame/closed.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/frame/closed.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/frame/closed_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/frame/closed_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/frame/closed_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/frame/closed_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/frame/open.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/frame/open.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/frame/open_mo.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/frame/open_mo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/frame/open_press.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/frame/open_press.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/input.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/input.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_slot.png
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_slot.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/inv_slot.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/inv_slot.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/map.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/map.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/map_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/map_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/map_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/map_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/qlog.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/qlog.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/qlog_hover.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/qlog_hover.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/element/buttons/qlog_press.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/element/buttons/qlog_press.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user