LA-DI-DA
|
dc69ce0d79
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
# module/map/assets.py
|
2023-10-22 12:07:37 +08:00 |
|
Zuosizhu
|
12e8a83005
|
Opt: Allow to set opsifleet in opsistronghold
|
2023-10-20 09:06:27 +08:00 |
|
LA-DI-DA
|
0f600f7b52
|
Add: timeout setting of changing ship's type and attribute
|
2023-10-19 16:20:30 +08:00 |
|
LA-DI-DA
|
bcd8dbc1ce
|
Revert "Add: user setting of scrolling dock and scrolling fleet"
This reverts commit 3f3da4ff85.
|
2023-10-19 13:42:06 +08:00 |
|
LA-DI-DA
|
8322140284
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
# module/gg_handler/gg_handler.py
|
2023-10-15 22:08:23 +08:00 |
|
LA-DI-DA
|
3f3da4ff85
|
Add: user setting of scrolling dock and scrolling fleet
|
2023-10-13 11:46:10 +08:00 |
|
LA-DI-DA
|
4caa2e2aec
|
Add: timeout setting of enabling gg
|
2023-10-12 22:35:54 +08:00 |
|
LA-DI-DA
|
afa68adf00
|
Add: change ship's attribute
|
2023-10-11 11:19:21 +08:00 |
|
LA-DI-DA
|
e3db31de2e
|
Merge branch 'zuosizhu-alas/20230309' into smallkai-dev
|
2023-09-30 16:50:09 +08:00 |
|
LA-DI-DA
|
b077bf9719
|
Add: change ship type for GemsFarming when set C or D map
|
2023-09-30 16:50:01 +08:00 |
|
Zuosizhu
|
4d4d2377dc
|
Merge branch 'master_lme'
# Conflicts:
# module/device/method/droidcast.py
|
2023-09-28 18:09:13 +08:00 |
|
LA-DI-DA
|
354e252c5f
|
Fix: arg
|
2023-09-24 00:18:15 +08:00 |
|
LA-DI-DA
|
09f4a227bb
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
# module/config/argument/task.yaml
|
2023-09-23 22:30:37 +08:00 |
|
LA-DI-DA
|
1bdb8c842a
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
# module/config/argument/args.json
|
2023-09-15 11:17:08 +08:00 |
|
Zuosizhu
|
dfa815645d
|
Merge branch 'master_lme'
# Conflicts:
# module/campaign/campaign_status.py
# module/config/argument/args.json
|
2023-09-15 08:26:53 +08:00 |
|
Tipsy Fisher
|
c2551f5c8e
|
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr
|
2023-09-15 01:07:00 +08:00 |
|
Ian Lee
|
5474628561
|
Upd:[TW] Event:Violet Tempest Blooming Lycoris (#3118)
|
2023-09-14 22:43:35 +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
|
08a6d4611c
|
Fix: Event schedule
|
2023-09-09 19:49:09 +08:00 |
|
LmeSzinc
|
1ae706f40f
|
Merge branch 'master' into feature
|
2023-09-08 01:27:28 +08:00 |
|
LA_DI_DA
|
8368cce3fb
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
# module/config/argument/args.json
# module/config/argument/argument.yaml
|
2023-09-03 19:13:52 +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 |
|
LA_DI_DA
|
174ea3530b
|
Add: more option for auto restart when alas get a error
|
2023-08-27 14:53:24 +08:00 |
|
LA-DI-DA
|
5711665c38
|
Del: useless small game
|
2023-08-18 20:34:54 +08:00 |
|
LA-DI-DA
|
303c0629ae
|
Add buy game coin
|
2023-07-24 00:17:44 +08:00 |
|
LA-DI-DA
|
f9fd4b41e4
|
Rewrite small game and shit
|
2023-07-23 16:06:49 +08:00 |
|
LA-DI-DA
|
b032b8e52b
|
Add shabi small game
|
2023-07-23 01:39:32 +08:00 |
|
LA-DI-DA
|
46f85afe26
|
Add something special
|
2023-07-21 21:48:43 +08:00 |
|
LA-DI-DA
|
d6abebc108
|
Add something special
|
2023-07-21 21:14:10 +08:00 |
|
LA-DI-DA
|
877660eb1b
|
Merge branch 'zuosizhu-alas/20230309' into smallkai
|
2023-07-21 18:58: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 |
|
LA-DI-DA
|
d392dadf51
|
Add something special
|
2023-07-20 22:37:00 +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
|
28cae91564
|
Opt: minigame
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
|
2023-07-11 18:00:03 +08:00 |
|
yypsybs
|
c0b9045909
|
Add: minigame
|
2023-07-04 10:06:44 +08:00 |
|
LmeSzinc
|
093a6efba0
|
Merge branch 'dev' into feature
# Conflicts:
# module/config/argument/task.yaml
|
2023-06-17 22:19:05 +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 |
|
LmeSzinc
|
bfc020621e
|
Del: Remove task SOS
|
2023-06-08 23:25:37 +08:00 |
|
Fisher Tipsy
|
ab0c8d0b85
|
Add: Allow auto attack dossier (#2579)
|
2023-06-08 22:28:44 +08:00 |
|