Fix: Resolve to allow upstream pull

Browse Source

...

This commit is contained in:

nEEtdo0d

2021-10-10 23:34:02 -04:00

parent 2524df3cf5 c68f9c1ccd

commit 5cb9ee1895

419 changed files with 38969 additions and 11678 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/tw/reward/COMMISSION_NOTICE_AT_CAMPAIGN.png → assets/tw/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png

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

0

assets/tw/reward/COMMISSION_ADVICE.png → assets/tw/commission/COMMISSION_ADVICE.png

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

0

assets/tw/reward/COMMISSION_DAILY.png → assets/tw/commission/COMMISSION_DAILY.png

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

0

assets/tw/reward/COMMISSION_HAS_PENDING.png → assets/tw/commission/COMMISSION_HAS_PENDING.png

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

0

assets/tw/reward/COMMISSION_SCROLL_AREA.png → assets/tw/commission/COMMISSION_SCROLL_AREA.png

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

0

assets/tw/reward/COMMISSION_START.png → assets/tw/commission/COMMISSION_START.png

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

0

assets/tw/reward/COMMISSION_URGENT.png → assets/tw/commission/COMMISSION_URGENT.png

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

0

assets/tw/reward/EXP_INFO_S_REWARD.png → assets/tw/commission/EXP_INFO_S_REWARD.png

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

0

assets/tw/reward/REWARD_1.png → assets/tw/commission/REWARD_1.png

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

0

assets/tw/reward/REWARD_SAVE_CLICK.png → assets/tw/commission/REWARD_SAVE_CLICK.png

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

0

assets/tw/reward/DORM_FEED_CHECK.png → assets/tw/dorm/DORM_FEED_CHECK.png

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

0

assets/tw/reward/DORM_FEED_ENTER.png → assets/tw/dorm/DORM_FEED_ENTER.png

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

0

assets/tw/reward/DORM_RED_DOT.png → assets/tw/dorm/DORM_RED_DOT.png

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

0

assets/tw/reward/OCR_DORM_FILL.png → assets/tw/dorm/OCR_DORM_FILL.png

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

0

assets/tw/reward/MEOWFFICER_BUY.png → assets/tw/meowfficer/MEOWFFICER_BUY.png

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

0

assets/tw/reward/MEOWFFICER_BUY_ENTER.png → assets/tw/meowfficer/MEOWFFICER_BUY_ENTER.png

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

0

assets/tw/reward/MEOWFFICER_BUY_NEXT.png → assets/tw/meowfficer/MEOWFFICER_BUY_NEXT.png

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

0

assets/tw/reward/MEOWFFICER_BUY_PREV.png → assets/tw/meowfficer/MEOWFFICER_BUY_PREV.png

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

0

assets/tw/reward/MEOWFFICER_BUY_SKIP.png → assets/tw/meowfficer/MEOWFFICER_BUY_SKIP.png

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

0

assets/tw/reward/MEOWFFICER_CONFIRM.png → assets/tw/meowfficer/MEOWFFICER_CONFIRM.png

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

0

assets/tw/reward/MEOWFFICER_FORT_CHECK.png → assets/tw/meowfficer/MEOWFFICER_FORT_CHECK.png

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

0

assets/tw/reward/MEOWFFICER_FORT_CHORE.BUTTON.png → assets/tw/meowfficer/MEOWFFICER_FORT_CHORE.BUTTON.png

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

0

assets/tw/reward/MEOWFFICER_FORT_CHORE.png → assets/tw/meowfficer/MEOWFFICER_FORT_CHORE.png

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

0

assets/tw/reward/MEOWFFICER_FORT_ENTER.png → assets/tw/meowfficer/MEOWFFICER_FORT_ENTER.png

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

0

assets/tw/reward/MEOWFFICER_FORT_GET_XP_1.png → assets/tw/meowfficer/MEOWFFICER_FORT_GET_XP_1.png

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

0

assets/tw/reward/MEOWFFICER_FORT_GET_XP_2.png → assets/tw/meowfficer/MEOWFFICER_FORT_GET_XP_2.png

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

0

assets/tw/reward/MEOWFFICER_FORT_RED_DOT.png → assets/tw/meowfficer/MEOWFFICER_FORT_RED_DOT.png

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

0

assets/tw/reward/MEOWFFICER_STATUS.png → assets/tw/meowfficer/MEOWFFICER_STATUS.png

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

0

assets/tw/reward/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png → assets/tw/meowfficer/MEOWFFICER_TRAIN_CLICK_SAFE_AREA.png

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

0

assets/tw/reward/MEOWFFICER_TRAIN_COMPLETE.png → assets/tw/meowfficer/MEOWFFICER_TRAIN_COMPLETE.png

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

0

assets/tw/reward/MEOWFFICER_TRAIN_ENTER.png → assets/tw/meowfficer/MEOWFFICER_TRAIN_ENTER.png

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

0

assets/tw/reward/MEOWFFICER_TRAIN_FILL_QUEUE.png → assets/tw/meowfficer/MEOWFFICER_TRAIN_FILL_QUEUE.png

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

0

assets/tw/reward/MEOWFFICER_TRAIN_FINISH_ALL.png → assets/tw/meowfficer/MEOWFFICER_TRAIN_FINISH_ALL.png

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

0

assets/tw/reward/MEOWFFICER_TRAIN_START.png → assets/tw/meowfficer/MEOWFFICER_TRAIN_START.png

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

0

assets/tw/reward/OCR_MEOWFFICER.png → assets/tw/meowfficer/OCR_MEOWFFICER.png

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

0

assets/tw/reward/OCR_MEOWFFICER_CAPACITY.png → assets/tw/meowfficer/OCR_MEOWFFICER_CAPACITY.png

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

0

assets/tw/reward/OCR_MEOWFFICER_CHOOSE.png → assets/tw/meowfficer/OCR_MEOWFFICER_CHOOSE.png

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

0

assets/tw/reward/OCR_MEOWFFICER_COINS.png → assets/tw/meowfficer/OCR_MEOWFFICER_COINS.png

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

BIN

assets/tw/reward/REWARD_3.png → assets/tw/research/DURATION_REMAIN.png

Binary file not shown.

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

BIN

assets/tw/reward/COMMISSION_STOP_SCROLLING.png

Binary file not shown.

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

0

assets/tw/reward/REWARD_2.png → assets/tw/tactical/REWARD_2.png

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

0

assets/tw/reward/TACTICAL_CLASS_CANCEL.png → assets/tw/tactical/TACTICAL_CLASS_CANCEL.png

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

0

assets/tw/reward/TACTICAL_CLASS_START.png → assets/tw/tactical/TACTICAL_CLASS_START.png

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

BIN

assets/tw/ui/CAMPAIGN_GOTO_EVENT.png

Binary file not shown.

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