LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 21:49:29 +08:00
Code Activity
7,843 Commits 12 Branches 0 Tags
9c0d07ae66bdfd7bb59f7ad47ca62a74b80fd2dc
Commit Graph

7843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LA-DI-DA
9c0d07ae66 Add(tmp): Tempesta and the Fountain of Youth 2023-10-27 15:54:14 +08:00
LA-DI-DA
527d067e3f Fix: unstoppable loop of entering strategic search setting page when opsi_hazard1_leveling 2023-10-25 00:27:30 +08:00
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
9e31b5eb43 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 22:44:25 +08:00
Zuosizhu
12e8a83005 Opt: Allow to set opsifleet in opsistronghold 2023-10-20 09:06:27 +08:00
LmeSzinc
d878f53eb7 Merge pull request #3207 from LmeSzinc/dev 
Bug fix
 2023-10-20 01:13:54 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +08:00
LmeSzinc
c5efe8e380 Upd: [EN] AUTO_SEARCH_SET_* 2023-10-20 01:09:01 +08:00
LmeSzinc
d2302836ec Upd: [EN] Fleet preparation 2023-10-20 01:02:47 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00
LmeSzinc
b8f89def7d Fix: Submarine hard satisfied button 2023-10-20 00:40:05 +08:00
LmeSzinc
0c93da2373 Upd: Sync FLEET_PREPARATION_CHECK 2023-10-20 00:03:28 +08:00
LmeSzinc
bfea966cb8 Upd: [JP] AUTO_SEARCH_SET_* 2023-10-20 00:03:28 +08:00
LmeSzinc
cc60e701fc Upd: [JP] Fleet preparation 2023-10-20 00:03:25 +08:00
LA-DI-DA
5819212f96 Fix: lack of FLEET_ENTER_FLAGSHIP_HARD_* and FLEET_ENTER_HARD_* 2023-10-19 23:28:38 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +08:00
LA-DI-DA
78fc586094 Revert "Fix(tmp): ui drift of map preparation" 
This reverts commit bfe3240c44.
 2023-10-19 23:00:27 +08:00
LmeSzinc
5d4178a875 Merge pull request #3205 from LmeSzinc/dev 
Bug fix
 2023-10-19 22:56:31 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LA-DI-DA
bfe3240c44 Fix(tmp): ui drift of map preparation 2023-10-19 22:47:36 +08:00
LmeSzinc
ec7facb7c1 Upd: Strategy open&close&switch 2023-10-19 22:42:53 +08:00
LmeSzinc
ce13aaa8b7 Upd: [CN] _fleet_sidebar 2023-10-19 22:30:06 +08:00
LmeSzinc
51d4efd4a6 Upd: [CN] AUTO_SEARCH_SET_* 2023-10-19 22:02:53 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LA-DI-DA
02a804ccf1 Upd: ShipFucker.lua 2023-10-19 16:51:51 +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
fdf049a179 Revert "Add: scroll dock to load all ship's data for changing attribute" 
This reverts commit 293060445d.
 2023-10-19 13:42:22 +08:00
LA-DI-DA
8391f0cee3 Revert "Fix: inappropriate scroll dock" 
This reverts commit 4febb71500.
 2023-10-19 13:42:18 +08:00
LA-DI-DA
9ed0ed6986 Revert "Add: scroll fleet to load all fleet data" 
This reverts commit 842fba0391.
 2023-10-19 13:42:14 +08:00
LA-DI-DA
4842bf8992 Revert "Add: meta panel page" 
This reverts commit 30cbc7fadc.
 2023-10-19 13:42:09 +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
Yingdong Yang
dffa87d5df Fix: tactical failed when the ship's all skills are leveled max (#3201) 2023-10-19 02:15:49 +08:00
LmeSzinc
5e6ec95b37 Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT 2023-10-17 18:27:14 +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
LmeSzinc
7d122a7b2e Merge pull request #3196 from LmeSzinc/dev 
Bug fix
 2023-10-14 23:05:44 +08:00
LmeSzinc
4f110c047b Opt: Sort events in args.json and i18n 2023-10-14 22:58:57 +08:00
LmeSzinc
cc777e71cc Fix: Missing iris pattern in shop regex (#3075) 2023-10-14 22:32:01 +08:00
LmeSzinc
f5aa5b2d09 Fix: [TW] Shop nav without core limited (#3152) 2023-10-14 22:22:23 +08:00
guoh064
c7d1b2ca7e Opt: Roadblocks in campaign_2_4 (#3195) 2023-10-14 22:06:22 +08:00
LmeSzinc
1c06c5e2b0 Fix: [EN] Missing letter "N" in NA Ocean * zones 2023-10-14 21:54:12 +08:00
LmeSzinc
44197dba56 Upd: [EN] RETIRE_COIN (#3124) 2023-10-14 21:45:49 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
Ian Lee
e8b96eb55b Upd:[TW] Event:Inverted Orthant Rerun (#3192) 2023-10-14 20:33:32 +08:00
Zuosizhu
b6aec9a5b1 Merge pull request #7 from 0O0o0oOoO00/more-timeout-for-gg 
Add: timeout setting of enabling gg
 2023-10-14 20:24:36 +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
30cbc7fadc Add: meta panel page 2023-10-13 10:47:21 +08:00
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +08:00
LA-DI-DA
842fba0391 Add: scroll fleet to load all fleet data 2023-10-12 21:53:46 +08:00
LA-DI-DA
82aba4b8a8 Adj: timeout of enabling gg 2023-10-12 21:53:07 +08:00
LA-DI-DA
4febb71500 Fix: inappropriate scroll dock 2023-10-12 20:32:20 +08:00