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

Browse Source

...

This commit is contained in:

nEEtdo0d

2020-12-29 19:09:14 -05:00

parent 5f78d71e0d c44780bdda

commit 88a8333103

36 changed files with 249 additions and 39 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/en/retire/DOCK_FILTER_CONFIRM.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_EXTRA_ENHANCEABLE_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_EXTRA_ENHANCEABLE_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_EXTRA_NO_LIMIT_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_EXTRA_NO_LIMIT_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_FACTION_ALL_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_FACTION_ALL_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_ALL_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_ALL_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_BB_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_BB_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_CA_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_CA_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_CL_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_CL_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_CV_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_CV_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_DD_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_DD_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_OTHERS_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_OTHERS_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_REPAIR_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_REPAIR_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_SS_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_INDEX_SS_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_RARITY_ALL_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_RARITY_ALL_ON.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_SORT_LVL_OFF.png

Binary file not shown.

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

BIN

assets/en/retire/FILTER_SORT_LVL_ON.png

Binary file not shown.

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