533 Commits

Author	SHA1	Message	Date
ZuoSiZhu	39c18d8103	Merge remote-tracking branch 'lme/master' into dev ... # Conflicts: # deploy/AidLux/0.92/requirements.txt # module/campaign/campaign_event.py # module/os/map.py # module/os_ash/ash.py # module/webui/config.py	2025-02-28 11:01:23 +08:00
LmeSzinc	9e74c43c93	Fix: [ALAS] Don't redirect 5555 to MuMu serials on MAC as BlueStacks Air would use it	2025-02-28 02:05:06 +08:00
LmeSzinc	6c081fd855	Fix: [ALAS] Missing import due to in-file running	2025-02-23 03:23:14 +08:00
LA_DI_DA	5deca96c05	add: builder of AzurLaneConfig and Device	2025-02-14 14:15:57 +08:00
LmeSzinc	2d9556d21b	Fix: [ALAS] Emulator tree-killed when Alas gets killed	2025-02-12 01:41:03 +08:00
LmeSzinc	3dc3e7682b	Fix: [ALAS] netcat loopback address on BlueStacks Air	2025-02-01 00:14:12 +08:00
xhqss	2ddc7fff1c	Merge branch 'master_lme' ... # Conflicts: # module/campaign/gems_farming.py # module/config/config_manual.py # module/handler/assets.py # module/retire/retirement.py # module/tactical/tactical_class.py	2025-01-16 08:52:42 +08:00
LmeSzinc	546f25d646	Chore: [ALAS] Directly mark nemuipc and ldopengl unavailable on non-Windows	2025-01-07 12:18:40 +08:00
LmeSzinc	38da2aba17	Fix: [ALAS] Patch to fix atx_agent_url on arm64-v8a	2025-01-07 11:35:20 +08:00
LmeSzinc	3d112b4c6c	Opt: [ALAS] Dynamically extends nemu_ipc timeout on retries for slow PCs	2024-12-27 23:45:00 +08:00
LmeSzinc	a6f81729e5	Refactor: [ALAS] Use trio-like thread pool in nemu_ipc instead of asyncio.run_in_executor()	2024-12-27 23:39:58 +08:00
xhqss	e7f93d8efe	Merge branch 'master_lme' ... # Conflicts: # module/equipment/equipment.py	2024-12-20 23:51:48 +08:00
LmeSzinc	a3bb25a95d	Fix: [ALAS] Fallback to auto if nemu_ipc and ldopengl are selected on non-corresponding emulators	2024-12-20 18:59:12 +08:00
LA_DI_DA	2dd2e37bef	Merge branch 'refs/heads/dev'	2024-10-27 18:32:44 +08:00
LA_DI_DA	a2e6986dcd	Merge branch 'refs/heads/LmeSzinc/master' into dev ... # Conflicts: # module/campaign/campaign_status.py # module/exercise/combat.py # module/retire/dock.py # module/retire/enhancement.py	2024-10-25 12:01:29 +08:00
LmeSzinc	1ca4f6388a	Fix: [ALAS] Missing wait after down event	2024-10-10 22:13:47 +08:00
LmeSzinc	f45c21f250	Fix: [ALAS] Skip trying ldopengl if it is not a LDPlayer	2024-09-29 12:10:33 +08:00
LmeSzinc	f95f51b165	Fix: Update ldopengl minimal version ... Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>	2024-09-23 19:05:58 +08:00
LA_DI_DA	adba220e19	Merge branch 'refs/heads/dev'	2024-09-15 18:08:11 +08:00
LA_DI_DA	15dbb46cc3	Merge branch 'refs/heads/LmeSzinc/master' into dev ... # Conflicts: # module/config/argument/args.json # module/exercise/combat.py # module/os/map.py	2024-09-15 18:06:15 +08:00
LmeSzinc	afb6015286	Opt: [ALAS] Skip trying nemu_ipc on MuMu Global	2024-09-15 02:42:12 +08:00
LmeSzinc	67ae28ac61	Fix: Get info after loading DLL, so DLL existence can act as a version check	2024-09-14 22:27:03 +08:00
LA_DI_DA	a9afa5487a	Merge branch 'refs/heads/LmeSzinc/master' into dev ... # Conflicts: # module/webui/app.py	2024-09-13 23:09:32 +08:00
xhqss	48ba0f043e	Merge branch 'master_lme' ... # Conflicts: # module/webui/app.py	2024-09-13 20:17:43 +08:00
SarContDeli	aa79cc05dd	Upd: improve ldopengl performance (#4173)	2024-09-12 22:26:17 +08:00
xhqss	9c6eee6335	Merge branch 'master_lme'	2024-09-11 20:45:36 +08:00
LmeSzinc	3d262a5703	Fix: Share screenshot_method_override across tasks	2024-09-11 19:02:03 +08:00
LmeSzinc	e1bb483aaa	Fix: [ALAS] Limit pool size when using run_in_executor()	2024-09-10 01:14:15 +08:00
LA_DI_DA	881b2e1115	Merge branch 'refs/heads/dev'	2024-08-31 11:26:22 +08:00
LA_DI_DA	02fec1598d	Merge branch 'refs/heads/LmeSzinc/master' into dev	2024-08-31 11:05:57 +08:00
SarContDeli	7c574ceaf5	Fix: ldopengl screenshot reverse color (#4136)	2024-08-31 10:59:44 +08:00
LmeSzinc	dc530e7538	Fix: [ALAS] Catch OSError when iter running emulators	2024-08-30 18:50:53 +08:00
LmeSzinc	b8c89285c1	Fix: [ALAS] Predict MuMu12 serial from instance id if it was missing in vbox file	2024-08-23 02:22:30 +08:00
LmeSzinc	f12ccb87ef	Fix: [ALAS] MuMu12 v4.0.4, default instance of which has no forward record in vbox config	2024-08-20 01:23:01 +08:00
LA_DI_DA	f490410411	Merge branch 'refs/heads/dev' ... # Conflicts: # bin/Lua/ShipChanger.lua # module/config/argument/args.json # module/device/screenshot.py	2024-08-17 22:02:06 +08:00
LA_DI_DA	89be3580ec	Merge branch 'refs/heads/LmeSzinc/master' into dev ... # Conflicts: # module/ui/page.py	2024-08-17 21:48:52 +08:00
xhqss	14d1b739f3	Fix:Missing s in the directory of customer config,json	2024-08-17 13:35:27 +08:00
LmeSzinc	c98f2dc825	Fix: Missing s in the directory of customer_config.json	2024-08-17 03:16:15 +08:00
xhqss	eb83dcb403	Merge branch 'master_lme'	2024-08-17 02:54:22 +08:00
LmeSzinc	d1b41367cb	Fix: Check app keep alive on mumu >= 4.0	2024-08-17 00:29:55 +08:00
xhqss	b7cc5db354	Merge branch 'refs/heads/master_lme'	2024-08-12 02:47:51 +08:00
LmeSzinc	14a3f57d78	Pref: [ALAS] Connect all possible serial at once	2024-08-11 00:45:07 +08:00
LmeSzinc	886736de45	Fix: [ALAS] Launch parameters on waydroid (#4000)	2024-08-11 00:45:00 +08:00
LmeSzinc	9c7f2fcb7d	Fix: [ALAS] Handle empty getprop on mumu12 >= 4.0	2024-08-10 23:56:29 +08:00
LmeSzinc	360bfa0474	Refactor: [ALAS] app_start_uiautomator2 to be the same as adb	2024-08-10 22:16:58 +08:00
LmeSzinc	342f444164	Fix: [ALAS] Catch Permission Denial on am start	2024-08-02 02:44:11 +08:00
LmeSzinc	debbbdae96	Refactor: [ALAS] Launch app with activity name	2024-08-01 23:26:56 +08:00
xhqss	fbe58bd329	Merge branch 'refs/heads/master_lme' ... # Conflicts: # module/campaign/gems_farming.py # module/device/method/adb.py # module/device/screenshot.py	2024-07-26 10:28:26 +08:00
Zuosizhu	1d85336ba4	Merge remote-tracking branch 'refs/remotes/Lme/master' into dev ... # Conflicts: # module/device/method/adb.py # module/device/screenshot.py	2024-07-26 08:04:44 +08:00
LmeSzinc	32649283ff	Opt: Lower default screenshot interval on ldopengl	2024-07-25 12:18:28 +08:00