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

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-07-23 10:19:27 -04:00

parent 9cb12f8a36 2e74d619a2

commit 5bd518cbc1

45 changed files with 591 additions and 72 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/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: 6.0 KiB

BIN

assets/cn/guild/EXP_INFO_CF.png

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_AzusaMiura.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_ChihayaKisaragi.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_HarukaAmami.gif Normal file

Binary file not shown.

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

BIN

assets/cn/template/TEMPLATE_SIREN_IoriMinase.gif Normal file

Binary file not shown.

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

BIN

assets/en/exercise/QUIT_RECONFIRM.png

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_AzusaMiura.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_ChihayaKisaragi.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_HarukaAmami.gif Normal file

Binary file not shown.

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

BIN

assets/en/template/TEMPLATE_SIREN_IoriMinase.gif Normal file

Binary file not shown.

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

BIN

assets/en/ui/MEOWFFICER_CHECK.png

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_AzusaMiura.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_ChihayaKisaragi.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_HarukaAmami.gif Normal file

Binary file not shown.

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

BIN

assets/jp/template/TEMPLATE_SIREN_IoriMinase.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_AzusaMiura.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_ChihayaKisaragi.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_HarukaAmami.gif Normal file

Binary file not shown.

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

BIN

assets/tw/template/TEMPLATE_SIREN_IoriMinase.gif Normal file

Binary file not shown.

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