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

Browse Source

...

This commit is contained in:

nEEtdo0d

2020-12-29 10:05:34 -05:00

parent fbbcff37a0 8081907729

commit a415faa8f5

15 changed files with 48 additions and 10 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

0

assets/cn/os_handler/GET_OS_STATUS.png → assets/cn/os_handler/GET_ADAPTABILITY.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

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

Binary file not shown.

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

BIN

assets/cn/ui/CAMPAIGN_MENU_GOTO_EVENT.png Normal file

Binary file not shown.

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

0

assets/en/os_handler/GET_OS_STATUS.png → assets/en/os_handler/GET_ADAPTABILITY.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 10 KiB

0

assets/jp/os_handler/GET_OS_STATUS.png → assets/jp/os_handler/GET_ADAPTABILITY.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

0

assets/tw/os_handler/GET_OS_STATUS.png → assets/tw/os_handler/GET_ADAPTABILITY.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB