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

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-07-31 22:13:23 -04:00

parent f30b3676d9 71669f5dcf

commit f17d6cc221

17 changed files with 14 additions and 12 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/jp/guild/BATTLE_STATUS_CF.png

Binary file not shown.

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

BIN

assets/jp/ui/MEOWFFICER_INFO.png

Binary file not shown.

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

BIN

assets/tw/research/RESEARCH_PENDING.png

Binary file not shown.

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

BIN

assets/tw/research/RESEARCH_START.png

Binary file not shown.

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

BIN

assets/tw/research/RESEARCH_STOP.png

Binary file not shown.

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

BIN

assets/tw/research/RESEARCH_UNAVAILABLE.png

Binary file not shown.

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

BIN

assets/tw/research/RESET_AVAILABLE.png

Binary file not shown.

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

BIN

assets/tw/ui/FLEET_CHECK.png

Binary file not shown.

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

BIN

assets/tw/ui/MAIN_GOTO_FLEET.png

Binary file not shown.

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

BIN

assets/tw/ui/RESEARCH_CHECK.png

Binary file not shown.

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

BIN

assets/tw/ui/RESHMENU_CHECK.png

Binary file not shown.

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

BIN

assets/tw/ui/RESHMENU_GOTO_RESEARCH.png

Binary file not shown.

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