Commit Graph

Select branches

Hide Pull Requests

15-1

dev

event_update

island

island_project

logger_unlock_use

master

war_archives_update

Mono Color

• 162a3b236d Merge pull request #1374 from LmeSzinc/dev nEEtdo0d 2022-07-19 10:17:33 -04:00
• 93b2fb9178 Fix: [EN] post update RESEARCH_QUEUE_ADD text change (#1373) nEEtdo0d 2022-07-19 10:14:47 -04:00
• 0b5b6f5da8 Merge pull request #1360 from LmeSzinc/dev LmeSzinc 2022-07-18 12:47:14 +08:00
• 26a370b32e Merge pull request #1352 from freesrz93/dev LmeSzinc 2022-07-18 12:35:24 +08:00
• 77cc057603 Add: [EN] research queue support TEMPLATE_* assets Fix: [EN] enlarge search area for status; EN assets on the bigger side nEEtdo0d 2022-07-18 00:18:18 -04:00
• cac3119514 Add: [EN] config decorator queue_status_grids nEEtdo0d 2022-07-18 00:16:34 -04:00
• 56d5bc2426 Merge pull request #1359 from LmeSzinc/bug_fix LmeSzinc 2022-07-18 03:12:12 +08:00
• fc8bd62de9 Upd: [JP] Use enlarged guild items same as CN LmeSzinc 2022-07-18 02:57:48 +08:00
• bc15cd4e25 Upd: [JP] BUY_CONFIRM LmeSzinc 2022-07-18 02:56:36 +08:00
• 98546e02f5 Fix: Wrong get_queue_slot() condition LmeSzinc 2022-07-18 01:58:52 +08:00
• 439f247c6a Fix: Redundant record before research refresh LmeSzinc 2022-07-18 01:48:51 +08:00
• 9d9753b9b0 Upd: [CN] RESEARCH_UNAVAILABLE LmeSzinc 2022-07-18 01:40:42 +08:00
• 1be86abd8b Upd: Copy SHIPYARD_SERIES_SELECT_CHECK to all servers LmeSzinc 2022-07-18 01:11:40 +08:00
• 46609c5557 Fix: Better research_queue_add() LmeSzinc 2022-07-17 23:46:41 +08:00
• 6f57b6020a Merge pull request #1355 from ddmugicha/master LmeSzinc 2022-07-18 00:03:43 +08:00
• b705fad494 Fix: [JP] BEACON_EMPTY Cola 2022-07-17 23:49:00 +08:00
• ae1f4b2c6c Fix: Move RESEARCH_GOTO_QUEUE because status icons can't be clicked LmeSzinc 2022-07-17 23:07:15 +08:00
• d99b70d4f5 Add: Handle the 6th research project LmeSzinc 2022-07-17 22:58:29 +08:00
• e05a9f3de1 Merge pull request #1349 from freesrz93/bug_fix LmeSzinc 2022-07-17 16:12:12 +08:00
• 9faa3c9269 Add: Use build tickets for event pool freesrz93 2022-07-17 16:01:59 +08:00
• 46cfe79c47 Upd: [CN] BUILD_CUBE_COUNT freesrz93 2022-07-17 12:00:03 +08:00
• c7eeaf8661 Fix: research_fill_queue() return None LmeSzinc 2022-07-17 11:45:16 +08:00
• 544fe252ed Upd: [EN] research queue support assets; QUEUE_REMAIN slight upper position; others text or font changes nEEtdo0d 2022-07-16 18:03:10 -04:00
• bdf98f7453 Fix: Record saved when no research reward claimed LmeSzinc 2022-07-17 03:23:41 +08:00
• f0a2d7c02d Opt: Reduce swipes when getting only 2 rows of items LmeSzinc 2022-07-17 03:03:33 +08:00
• 91c39c8515 Add: Research queue support LmeSzinc 2022-07-17 02:56:08 +08:00
• c84051b936 Opt: Disable Restart.Scheduler.Enable LmeSzinc 2022-07-17 02:00:25 +08:00
• 4c1afd5ea4 Add: Adding projects into research queue LmeSzinc 2022-07-17 01:17:27 +08:00
• dcfd30e44b Add: Start research and add it into queue LmeSzinc 2022-07-16 19:13:58 +08:00
• 69851e5718 Add: PR5 filter presets LmeSzinc 2022-07-16 18:54:50 +08:00
• ccf1827995 Upd: Update assets for PR5 LmeSzinc 2022-07-16 18:26:56 +08:00
• 6b29794a10 Merge pull request #1347 from LmeSzinc/bug_fix LmeSzinc 2022-07-17 01:29:45 +08:00
• e98e9d42ef Merge branch 'master' into bug_fix LmeSzinc 2022-07-17 01:26:33 +08:00
• f7d50a5306 Fix: Shinano event may be detected as raid LmeSzinc 2022-07-16 01:32:42 +08:00
• 2c37a263fa Merge branch 'master' into bug_fix LmeSzinc 2022-07-17 01:19:21 +08:00
• 00d7a720d6 Merge pull request #1346 from chpkq/bug_fix LmeSzinc 2022-07-17 01:06:25 +08:00
• 0ce3916f5d Fix: [TW] BEACON_ENTER, BEACON_EMPTY chpkq 2022-07-17 01:05:02 +08:00
• ec22f748ff Opt: Catch possible exception in config update 18870 2022-07-17 00:38:19 +08:00
• d70697e303 Upd: [EN] war archives search templates nEEtdo0d 2022-07-16 12:28:17 -04:00
• 3fee4a8f44 Merge pull request #1344 from railzy/master LmeSzinc 2022-07-17 00:18:19 +08:00
• a78713f6e6 Upd: [JP] BEACON_ENTER railzy 2022-07-17 00:15:04 +08:00
• ac93ac9487 Fix: potato pc may spam click ash exit and end up in ASH_SHOWDOWN nEEtdo0d 2022-07-16 11:52:29 -04:00
• 05af963397 Upd: [EN] EQUIP* assets; augment module update shifted UI nEEtdo0d 2022-07-16 11:45:23 -04:00
• 3f899fa0ce Fix: Shinano event may be detected as raid LmeSzinc 2022-07-16 01:32:42 +08:00
• 5eceb6623d Del: Remove aScreenCap support over http, just no plan LmeSzinc 2022-07-16 00:33:14 +08:00
• 341545e8d9 Merge branch 'phone_cloud' into dev LmeSzinc 2022-07-16 00:24:53 +08:00
• 0180e6e286 Merge branch 'master' into dev LmeSzinc 2022-07-16 00:24:38 +08:00
• 65ea5a65cd Merge pull request #1341 from LmeSzinc/bug_fix LmeSzinc 2022-07-16 00:16:13 +08:00
• 22ac87d9ae Fix: Don't check GET_SHIP before logged in (#1325) LmeSzinc 2022-07-16 00:13:55 +08:00
• 7327a62485 Fix: [TW] Update MAP_ENSURE_EDGE_INSIGHT_CORNER (#1338) LmeSzinc 2022-07-15 23:51:22 +08:00
• 596dccb0ba Fix: Map data in TS1 HTS1 LmeSzinc 2022-07-15 23:25:40 +08:00
• 3ce625aec5 Opt: Change SSHUser requested by server 18870 2022-07-15 23:05:00 +08:00
• 84d34701ee Fix: Caught by siren when passing though portals LmeSzinc 2022-07-15 22:25:08 +08:00
• ffed947dd2 Upd: [TW] BEACON_EMPTY abd BEACON_ENTER (#1335) LmeSzinc 2022-07-15 21:11:07 +08:00
• 87a4905a67 Upd: [JP] ASH_SHOWDOWN (#1335) LmeSzinc 2022-07-15 21:08:38 +08:00
• 02e1aaade6 Fix: PR5 support for series select grid Fix: [EN] SHIPYARD_SERIES_SELECT_CHECK nEEtdo0d 2022-07-15 06:59:55 -04:00
• 16526bfae9 Fix: Failed to enter SP LmeSzinc 2022-07-15 12:57:06 +08:00
• 1df9993238 Merge branch 'master' into phone_cloud LmeSzinc 2022-07-15 08:26:52 +08:00
• 76a7eb4d08 Fix: [TW] Universe in Unison map files update LmeSzinc 2022-07-15 03:16:25 +08:00
• d46a60215f Merge pull request #1333 from LmeSzinc/bug_fix LmeSzinc 2022-07-15 02:08:34 +08:00
• 9958c96107 Upd: BEACON_REMAIN for all servers LmeSzinc 2022-07-15 02:03:14 +08:00
• 06735df6e7 Fix: Perspective parameters in Dreamwakers Butterfly LmeSzinc 2022-07-15 01:59:39 +08:00
• 206b546eb1 Opt: Auto convert chapter A/B/C/D to T/HT LmeSzinc 2022-07-15 01:51:04 +08:00
• 37220a7104 Upd: [EN] BEACON_ENTER LmeSzinc 2022-07-15 01:10:26 +08:00
• c1c58b114e Merge pull request #1332 from LmeSzinc/dev LmeSzinc 2022-07-15 00:48:50 +08:00
• 22385235f0 Upd: [CN] BEACON_EMPTY LmeSzinc 2022-07-15 00:39:42 +08:00
• 3e9187e770 Upd: [EN] ASH_SHOWDOWN LmeSzinc 2022-07-15 00:16:58 +08:00
• 4bad04932c Revert "Opt: Faster map preparation" LmeSzinc 2022-07-14 23:48:51 +08:00
• c132e67d0b Fix: STAGE_INCREASE in Dreamwakers Butterfly LmeSzinc 2022-07-14 23:39:07 +08:00
• b9bd5f0ab8 Upd: Update project data of PR5 LmeSzinc 2022-07-14 22:38:32 +08:00
• 35985f4cb4 Add: Event entrance of Dreamwakers Butterfly Rerun LmeSzinc 2022-07-14 22:01:21 +08:00
• 2fc5b85e67 Merge branch 'master' into dev LmeSzinc 2022-07-14 21:58:50 +08:00
• 077a0a3cba Merge pull request #1327 from LmeSzinc/bug_fix LmeSzinc 2022-07-14 21:55:07 +08:00
• 7f81c7e642 Merge pull request #1323 from Zorachristine/master LmeSzinc 2022-07-14 21:53:27 +08:00
• 88af4cf33a Fix: Larger BEACON_ENTER search range LmeSzinc 2022-07-14 21:52:02 +08:00
• fe0e7072e6 Fix: Redirected to ASH_SELECT after ash battle LmeSzinc 2022-07-14 21:23:41 +08:00
• aaf21f13a7 Merge pull request #1324 from LmeSzinc/bug_fix LmeSzinc 2022-07-14 19:35:51 +08:00
• 1e11665ce6 Fix: Handle additional transaction page ASH_SELECT LmeSzinc 2022-07-14 19:34:39 +08:00
• 1205b716c2 Upd: OS_CHECK for all servers LmeSzinc 2022-07-14 18:53:11 +08:00
• 440f917466 Fix: Delay task Shipyard before PR5 support on each server LmeSzinc 2022-07-14 18:48:02 +08:00
• 76dd443e19 Add: [TW] Universe in Unison Zorachristine 2022-07-14 18:31:26 +08:00
• b22bdbe64a Merge pull request #1322 from LmeSzinc/bug_fix LmeSzinc 2022-07-14 09:52:30 +08:00
• 0af3593fd3 Squash commits Horizon101011 2022-06-11 11:55:38 +08:00
• bb683cf21e Dev: Update research_extractor, should be ready for PR5 LmeSzinc 2022-07-14 01:48:53 +08:00
• 88ab1e06c3 Fix: Delay task research before PR5 support on each server LmeSzinc 2022-07-14 00:57:00 +08:00
• 95f5404c66 Merge branch 'master' into phone_cloud LmeSzinc 2022-07-13 23:25:46 +08:00
• c19290fd56 Fix: [EN] Zone name with passage LmeSzinc 2022-07-13 23:02:11 +08:00
• 626eb118d2 Merge pull request #1320 from LmeSzinc/bug_fix LmeSzinc 2022-07-13 00:57:27 +08:00
• bc88e56897 Fix: image_left_strip() returns an empty image because cropping outside LmeSzinc 2022-07-13 00:51:20 +08:00
• 0fc155b87d Upd: [JP] OCR_MEOWFFICER LmeSzinc 2022-07-13 00:16:39 +08:00
• e1f1768779 Fix: UI haven't fully loaded after get_current_zone_from_globe() LmeSzinc 2022-07-12 23:58:10 +08:00
• dbef8fb79c Fix: [EN] Zone name with passage LmeSzinc 2022-07-12 18:50:07 +08:00
• 7b7bcbeee4 Revert "Fix: [JP] Temp fix for game bug on research remain tab (#1227)" LmeSzinc 2022-07-12 18:47:34 +08:00
• c4c8a934c9 Merge pull request #1317 from LmeSzinc/bug_fix LmeSzinc 2022-07-09 22:44:52 +08:00
• 2be9380b2f Fix: [JP] Raid assets are not in 1280x720 LmeSzinc 2022-07-09 22:33:28 +08:00
• 15061059ed Fix: [EN] Zone name Gibraltar LmeSzinc 2022-07-09 22:18:48 +08:00
• 5c93906502 Upd: [TW] EXP_INFO_CF (fixed #1310) LmeSzinc 2022-07-09 21:49:36 +08:00
• 2ff85ccf43 Dep: Remove atomicwrites dependency, copy-paste it into ALAS LmeSzinc 2022-07-09 20:55:09 +08:00
• b86572156f Merge pull request #1314 from jie17/fix-book-filter LmeSzinc 2022-07-09 20:35:41 +08:00
• 7a4b283893 Fix: add T4 to book filter Jie Lu 2022-07-09 19:24:10 +09:00