Merge remote-tracking branch 'origin/master' into update_asset

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-01-15 09:35:49 -05:00

parent 0ace1d1e8c f4d8c107e0

commit 44b337fde0

27 changed files with 216 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/cn/os_ash/ASH_CHECK.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.4 KiB

BIN

assets/cn/os_ash/ASH_ENTRANCE.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

assets/cn/os_ash/ASH_QUIT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

assets/cn/os_ash/ASH_START.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

assets/cn/os_ash/BATTLE_STATUS.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.9 KiB

BIN

assets/cn/os_ash/BEACON_LIST.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

assets/cn/os_ash/BEACON_MY.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

assets/cn/os_ash/BEACON_NEXT.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

assets/cn/os_ash/BEACON_REMAIN.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/cn/os_ash/BEACON_TIER.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.7 KiB

BIN

assets/cn/ui/CAMPAIGN_MENU_GOTO_OS.BUTTON.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 102 KiB

BIN

assets/cn/ui/CAMPAIGN_MENU_GOTO_OS.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

assets/cn/ui/OS_CHECK.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.3 KiB