LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 12:49:25 +08:00
Code Activity
7,955 Commits 12 Branches 0 Tags
4486c8cff60c95ef3d3f85da3bc65d4a337eb8a4
Commit Graph

340 Commits

Author SHA1 Message Date
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +08:00
LmeSzinc
c928654a36 Del: Remove nemu_ipc controls cuz bad swipes on slow PCs 2024-04-13 23:33:49 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
 2024-04-10 12:22:40 +08:00
ygrzxc
7d574dde8b Add: Change the designated vanguard combination (#3520) 
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
 2024-04-08 22:49:30 +08:00
LmeSzinc
78adcbbc7d Opt: No android versions selecting in benchmark 2024-04-08 04:11:50 +08:00
LmeSzinc
2e81cb7dc1 Add: Click method nemu_ipc 2024-04-08 03:14:33 +08:00
LmeSzinc
501d0e6a7f Add: ScreenshotMethod option nemu_ipc 2024-03-28 19:17:16 +08:00
LmeSzinc
6987d60c96 Add: Alas.EmulatorInfo settings 2024-03-28 12:44:42 +08:00
Zuosizhu
edccf21374 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 22:10:18 +08:00
guoh064
e148c9f2ae Upd: Shipyard argument (PR4 and DR3) 2024-01-31 22:06:56 +08:00
Zuosizhu
ac2b891229 Merge branch 'LmeSzinc:master' into 20230309 2023-12-23 09:15:12 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
75a58f5640 Opt: [ALAS] Turn type lock to type state 2023-10-28 22:03:47 +08:00
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
LmeSzinc
4e6f51ed7c Sync: [SRC] Emulator settings 2023-09-10 15:04:32 +08:00
LmeSzinc
1ae706f40f Merge branch 'master' into feature 2023-09-08 01:27:28 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/webui/app.py
 2023-09-02 17:47:24 +08:00
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-01 17:58:39 +08:00
guoh064
37e852aadc Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
LmeSzinc
f80bd61562 Merge branch 'master' into feature 
# Conflicts:
#	module/config/i18n/zh-TW.json
 2023-08-28 18:12:08 +08:00
Zuosizhu
f55daeaf45 Opt: users are allowed not to push lua before script runs in case of unsuccessful pushes. 2023-08-27 22:14:28 +08:00
Tipsy Fisher
6fca29e79c Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-21 00:07:41 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
SarContDeli
048268b406 Add: Consume spilled Coins 2023-07-18 23:20:50 +08:00
LmeSzinc
88ce9fab44 Merge branch 'master' into feature 2023-07-16 17:47:14 +08:00
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
Tipsy Fisher
a962b13343 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-14 10:59:13 +08:00
LmeSzinc
8ca8d81814 Add: PR6 gui settings 2023-07-13 22:59:12 +08:00
yypsybs
c0b9045909 Add: minigame 2023-07-04 10:06:44 +08:00
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
Fisher Tipsy
ab0c8d0b85 Add: Allow auto attack dossier (#2579) 2023-06-08 22:28:44 +08:00
Zuosizhu
1b2e230274 Merge branch 'LmeSzinc:master' into 20230309 2023-06-08 21:43:02 +08:00
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +08:00
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +08:00
LmeSzinc
294f72023b Merge branch 'master' into feature 2023-06-01 22:26:40 +08:00
LmeSzinc
1841dafb8f Add: [CN] channel server 'com.bilibili.blhx.lenovo' (#2642) 2023-05-30 23:44:00 +08:00
Zuosizhu
0aeed89b72 Merge branch 'LmeSzinc:master' into 20230309 2023-05-30 12:31:00 +08:00
Chill Magic
49377d51eb Add 'com.bilibili.blhx.bilibiliMove' (#2649) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-05-29 20:22:05 +08:00
Zuosizhu
bd04ff6708 Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-27 23:48:02 +08:00
LmeSzinc
8ceb15dafc Add: [CN] Channel server com.bilibili.blhx.dl 2023-05-27 22:46:30 +08:00
LmeSzinc
ea9b198205 Merge branch 'master' into feature 2023-04-28 01:15:50 +08:00
Zuosizhu
d2e395dc3a Fix: All 2023 to 2020 in datetime 2023-04-28 01:06:46 +08:00
Zuosizhu
18b824d3ba Merge branch 'LmeSzinc:master' into 20230309 2023-04-27 15:24:49 +08:00
Horizon101011
3b0cffa420 Upd: ServerChecker support for new servers (#2523) 2023-04-27 12:25:58 +08:00
LmeSzinc
dbd2c7d80b Upd: Use emulator official names and update translations 2023-04-25 23:03:23 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
 2023-04-12 15:25:30 +08:00