Fix: Resolve merge conflicts with page.py, new page page_guild

Browse Source

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

# Conflicts:
#	module/ui/page.py

...

This commit is contained in:

nEEtdo0d

2021-01-01 10:51:52 -05:00

parent e9e1dc2503 298b6941f3

commit c398d7422e

34 changed files with 304 additions and 264 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/tw/campaign/SWITCH_1_HARD.png

Binary file not shown.

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

BIN

assets/tw/campaign/SWITCH_1_NORMAL.png

Binary file not shown.

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

BIN

assets/tw/sos/OCR_SIGNAL.png Normal file

Binary file not shown.

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

BIN

assets/tw/sos/SIGNAL_SEARCH.png Normal file

Binary file not shown.

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

BIN

assets/tw/sos/SIGNAL_SEARCHING.png Normal file

Binary file not shown.

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

BIN

assets/tw/sos/SIGNAL_SEARCH_ENTER.png Normal file

Binary file not shown.

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

BIN

assets/tw/sos/SIGNAL_SEARCH_GOTO.png Normal file

Binary file not shown.

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

BIN

assets/tw/sos/SIGNAL_SEARCH_QUIT.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/CAMPAIGN_MENU_CHECK.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/CAMPAIGN_MENU_GOTO_CAMPAIGN.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/CAMPAIGN_MENU_GOTO_DAILY.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

assets/tw/ui/CAMPAIGN_MENU_GOTO_EVENT.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/CAMPAIGN_MENU_GOTO_EXERCISE.png Normal file

Binary file not shown.

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

BIN

assets/tw/ui/CAMPAIGN_MENU_GOTO_WAR_ARCHIVES.png Normal file

Binary file not shown.

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