Commit Graph

Select branches

Hide Pull Requests

15-1

dev

event_update

island

island_project

logger_unlock_use

master

war_archives_update

Mono Color

• 235c88df96 Fix: base case conditions, lost in merge transit nEEtdo0d 2021-08-06 12:00:13 -04:00
• 10c14e2160 Fix: Resolve merge conflict, buttons() to buttons nEEtdo0d 2021-08-05 23:24:42 -04:00
• 060bae3d18 Fix: shop/shop_reward due to refactor, base case correction in shipyard/ui nEEtdo0d 2021-08-05 23:20:33 -04:00
• c6a53d8dc0 Upd: Refactor module build to module gacha nEEtdo0d 2021-08-05 23:19:23 -04:00
• 9b6a997de4 Merge remote-tracking branch 'origin/reward_shop_rebirth' into shop_and_shipyard_dev nEEtdo0d 2021-08-01 20:33:48 -04:00
• 9b94daa68c Fix: split usage of _shipyard_calculate for either information or payment, correct 'start' local variable for 'remain' > 0 nEEtdo0d 2021-08-01 20:29:53 -04:00
• dc8a2862e3 Fix: module shop missing dict items, module build assets, and etc. nEEtdo0d 2021-07-31 23:28:40 -04:00
• 9f284d66ea Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into shop_and_shipyard_dev nEEtdo0d 2021-07-31 23:16:39 -04:00
• 29ef242183 Fix: equipment and guild module imports nEEtdo0d 2021-07-31 23:13:09 -04:00
• 7ef32b794a Add: [EN] gui interface for module shipyard, shipyard handling into module reward nEEtdo0d 2021-07-31 22:42:08 -04:00
• af63450d01 Add: shipyard module to buy discounted pr1 bps nEEtdo0d 2021-07-31 22:33:39 -04:00
• a53da1664b Add: [EN] module shipyard assets nEEtdo0d 2021-07-31 22:29:03 -04:00
• 21558679aa Add: [EN] dictionary entries for module shop nEEtdo0d 2021-07-31 22:26:20 -04:00
• a4382e76ee Add: [EN] module build assets nEEtdo0d 2021-07-31 22:23:04 -04:00
• b28a1fc5d2 Add: research series 4 assets and dict updates for module shop nEEtdo0d 2021-07-31 22:19:17 -04:00
• f17d6cc221 Merge remote-tracking branch 'origin/master' into reward_shop_rebirth nEEtdo0d 2021-07-31 22:13:23 -04:00
• 71669f5dcf Merge pull request #554 from cola228/master LmeSzinc 2021-07-29 23:27:31 +08:00
• 109d41e15b Fix: [TW] Research_* asset Cola 2021-07-29 22:57:52 +08:00
• 8069e4b50a Merge pull request #552 from Zorachristine/master LmeSzinc 2021-07-29 22:07:57 +08:00
• bfb655fc88 Add: [TW] Aurora Noctis Zorachristine 2021-07-28 17:45:57 +08:00
• c87ab49326 Merge pull request #549 from railzy/asset LmeSzinc 2021-07-26 17:47:16 +08:00
• 943dc8bb2e Fix: [JP] MEOWFFICER_INFO & guild boss assets Ray 2021-07-26 16:01:25 +08:00
• f30b3676d9 Fix: Guild side bar and equipment side bar Reverted to the original ones, they are different from page_build nEEtdo0d 2021-07-25 19:36:56 -04:00
• f6cf43960d Merge remote-tracking branch 'origin/master' into reward_shop_rebirth nEEtdo0d 2021-07-25 14:34:36 -04:00
• 22e8b73570 Merge branch 'master' into dev LmeSzinc 2021-07-25 21:24:30 +08:00
• 8f80ee34bd Opt: Low cost farming in Azur Anthem LmeSzinc 2021-07-25 20:31:59 +08:00
• 5e5a7f4ed1 Add: Gems farming entrance in GUI LmeSzinc 2021-07-25 20:08:16 +08:00
• 5aa75a95a9 Fix: Guild side bar and equipment side bar LmeSzinc 2021-07-25 01:17:53 +08:00
• b373a38a85 Upd: [CN] Meowfficer fort assets LmeSzinc 2021-07-24 21:03:38 +08:00
• a0a9de5ecf Merge branch 'master' into dev LmeSzinc 2021-07-24 20:45:50 +08:00
• 4f9458261d Upd: [CN] BOOK_CHECK_PREP (#538) LmeSzinc 2021-07-24 18:22:04 +08:00
• 63de5be652 Fix: Conflicts among branches LmeSzinc 2021-07-24 17:47:34 +08:00
• e918a5db97 Merge branch 'gems_farming' into dev LmeSzinc 2021-07-24 17:33:58 +08:00
• 83b2b49cd6 Merge pull request #544 from nEEtdo0d/comf_fort LmeSzinc 2021-07-24 17:28:24 +08:00
• 2685f3ab07 Merge branch 'dev' into comf_fort LmeSzinc 2021-07-24 17:28:15 +08:00
• e45cd767fd Merge pull request #527 from nEEtdo0d/reward_shop_rebirth LmeSzinc 2021-07-24 17:24:42 +08:00
• 706ffc8a75 Fix: Wrong fleet to change flagship in gems farming LmeSzinc 2021-07-24 17:22:04 +08:00
• b0d1ef5697 Fix: Siren templates in Azur Anthem SP LmeSzinc 2021-07-23 23:50:32 +08:00
• e416b92f7a Fix: Resolve merge conflict ui/assets.py nEEtdo0d 2021-07-23 10:21:26 -04:00
• 5bd518cbc1 Merge remote-tracking branch 'origin/master' into comf_fort nEEtdo0d 2021-07-23 10:19:27 -04:00
• 2e74d619a2 Merge pull request #539 from nEEtdo0d/quick_fix LmeSzinc 2021-07-23 21:26:38 +08:00
• 5b7a31b462 Add: Siren templates in Azur Anthem SP4 LmeSzinc 2021-07-23 21:01:37 +08:00
• 7ec9e0d88f Add: Siren templates in Azur Anthem SP3 LmeSzinc 2021-07-23 20:15:05 +08:00
• 6d06346210 Add: Azur Anthem Event maps LmeSzinc 2021-07-23 18:26:24 +08:00
• 7a56028cfb Add: Event entrance of Azur Anthem (The Idol Master Collaboration) LmeSzinc 2021-07-23 16:39:56 +08:00
• ecf1a7bdf9 Fix: Daily commissions in The Idol Master Event, according to DOA Event LmeSzinc 2021-07-23 16:34:51 +08:00
• 4fbfdc7ba2 Revert "Opt: Remove code for DOA commissions to avoid errors in the future" LmeSzinc 2021-07-23 16:17:09 +08:00
• 9abe459fdc Fix: Lock new ships in auto search combat LmeSzinc 2021-07-23 16:03:52 +08:00
• 3c7a58c7df Dev: Update research project data extractor and its generated data LmeSzinc 2021-07-23 16:01:36 +08:00
• ad6a2447ae Del: Comment guild mission auto choose LmeSzinc 2021-07-23 15:59:17 +08:00
• 5c93d0f9ce Fix: Guild operation BOSS 1/1 detection LmeSzinc 2021-07-23 15:51:21 +08:00
• 70a327158f Merge pull request #548 from nEEtdo0d/exercise_asset LmeSzinc 2021-07-23 15:50:30 +08:00
• 9cb12f8a36 Fix: merge conflict reward/assets.py nEEtdo0d 2021-07-22 18:41:57 -04:00
• 95e983bffb Fix: [EN] QUIT_RECONFIRM down scaled after update nEEtdo0d 2021-07-22 15:33:07 -04:00
• e61a2f1627 Merge branch 'LmeSzinc:gems_farming' into gems_farming Cyumxi 2021-07-22 20:18:53 +08:00
• 5564c3e88f Fix: Move AUTO_SEARCH_OS_MAP_OPTION click to the bottom LmeSzinc 2021-07-21 18:57:45 +08:00
• ceab3837f4 Opt: Protect azurstat_id in settings LmeSzinc 2021-07-21 18:41:28 +08:00
• 5974984a30 Opt: ItemGrid.predict_tag() returns None by default to avoid empty string in database LmeSzinc 2021-07-21 18:31:49 +08:00
• 03ed40a1b9 Merge pull request #546 from cola228/master LmeSzinc 2021-07-21 17:22:41 +08:00
• 6d30da59f6 Fix: [TW] Dorm_Feed_Cancel&Ambush asset Cola 2021-07-21 11:07:33 +08:00
• c5fb8ba140 Upd: func signature predict updated, adapt shop modules respectively nEEtdo0d 2021-07-20 22:23:13 -04:00
• 4b223ef239 Merge remote-tracking branch 'origin/master' into reward_shop_rebirth nEEtdo0d 2021-07-20 22:21:14 -04:00
• 5d4cbe031e Add: Item tag detection LmeSzinc 2021-07-20 21:27:59 +08:00
• 70ae82e48e Merge pull request #545 from railzy/zone_switch LmeSzinc 2021-07-20 17:40:20 +08:00
• 663d8b2198 Dev: Fix ITEM_GRIDS_3 LmeSzinc 2021-07-20 17:23:07 +08:00
• ef97217f16 Fix: [JP] ZONE_SWITCH text asset Ray 2021-07-20 14:27:09 +08:00
• 9725d22892 Opt: Abstract get_research_finished LmeSzinc 2021-07-20 07:32:45 +08:00
• b77135b9d6 Fix: proper end condition to avoid premature exits nEEtdo0d 2021-07-19 10:59:19 -04:00
• 1d58bd48f2 Opt: Revise some research ocr results manually LmeSzinc 2021-07-19 21:15:57 +08:00
• aa89d4f54b Merge remote-tracking branch 'origin/master' into comf_fort nEEtdo0d 2021-07-18 20:03:50 -04:00
• b0d82f2bc7 Merge remote-tracking branch 'origin/master' into quick_fix nEEtdo0d 2021-07-18 20:02:38 -04:00
• 43018db4ea Add: [CN, JP, TW] counterpart assets, config, and gui updates nEEtdo0d 2021-07-18 19:54:20 -04:00
• 50e5ec32a6 Fix: Default value for do_fort_chores_meowfficer nEEtdo0d 2021-07-18 19:52:27 -04:00
• 719756f457 Add: [EN] comf-fort operations to meow_run and related configurations nEEtdo0d 2021-07-18 19:44:35 -04:00
• 4fc8136050 Add: handle meowfficer fort chores nEEtdo0d 2021-07-18 19:27:47 -04:00
• 75cd81e7a1 Upd: commented with explanation nEEtdo0d 2021-07-18 10:07:44 -04:00
• 0477870c41 Fix: Resolve merge conflict ui/ui.py and ui/assets.py nEEtdo0d 2021-07-18 10:05:21 -04:00
• c459a014db Merge branch 'master' into gems_farming LmeSzinc 2021-07-18 20:16:44 +08:00
• 96e388d7ab Fix: Research series detection, because IV was downscaled LmeSzinc 2021-07-18 17:43:18 +08:00
• e2ab0b4a0d Fix: [EN] change to different asset for MEOWFFICER_INFO delayed appearance nEEtdo0d 2021-07-17 21:18:43 -04:00
• ef4761c603 Merge pull request #537 from nEEtdo0d/quick_fix LmeSzinc 2021-07-17 16:24:52 +08:00
• 990dc89d33 Fix: [EN] ZONE_SWITCH icon to text asset nEEtdo0d 2021-07-16 15:05:52 -04:00
• 0b1b700b99 Fix: Rework research receive to avoid unknown stuck LmeSzinc 2021-07-17 00:40:11 +08:00
• 7884f9463f Opt: Research S4 preset filter according to statistics LmeSzinc 2021-07-16 22:31:37 +08:00
• f67a199bd1 Fix: OS zone switch detection LmeSzinc 2021-07-16 22:10:39 +08:00
• b3f42bfd7e Upd: [CN] SHIPYARD_CHECK LmeSzinc 2021-07-16 21:41:43 +08:00
• ddb67208a7 Fix: [CN] User Agreement detection LmeSzinc 2021-07-16 21:35:11 +08:00
• f1f190a2ad Fix: Raise error if clicking between 2 buttons LmeSzinc 2021-07-16 21:33:33 +08:00
• 2900852dd5 Fix: Reset dock filter if failed to retire any ships LmeSzinc 2021-07-16 21:10:31 +08:00
• 09b8d55f15 Doc: Manual installation in CN (#482) LmeSzinc 2021-07-16 21:01:07 +08:00
• 444eb56be1 Merge pull request #531 from nEEtdo0d/quick_fix LmeSzinc 2021-07-16 19:26:52 +08:00
• 5b94962f73 Merge pull request #530 from railzy/assets LmeSzinc 2021-07-16 18:22:25 +08:00
• 17a23ded5e Merge pull request #536 from nEEtdo0d/en_research_ensure LmeSzinc 2021-07-16 18:21:56 +08:00
• 77e0f859db Merge pull request #533 from railzy/raid_daily LmeSzinc 2021-07-16 18:21:26 +08:00
• 4fcb3cc250 Upd: [EN] page_research transitions same as others, now has unique titles across all reshmenu pages after last update nEEtdo0d 2021-07-15 21:58:21 -04:00
• 7f6fcaf508 Fix: offset adjust due to no event shops active nEEtdo0d 2021-07-15 10:00:51 -04:00
• 5546039e80 Upd: blueprint marcopolo asset Ray 2021-07-14 15:10:54 +08:00
• 5b7b2500bd Fix: [JP] guild_boss_avaliable asset Ray 2021-07-13 16:00:12 +08:00
• bcb06487fd Fix: use raid_daily_name (not raid_name) in Daily Ray 2021-07-13 15:02:48 +08:00
• b28027f135 Fix: [EN] use normal appear for innate interval option nEEtdo0d 2021-07-12 22:25:23 -04:00