LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 19:29:27 +08:00
Code Activity
8,038 Commits 12 Branches 0 Tags
bef5d22d1a1a79ad95cf6370688bdf4bfcda99d6
Commit Graph

415 Commits

Author SHA1 Message Date
mulaikurisu
4f60d70f9b Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:27:04 +08:00
Zuosizhu
356496af2c Merge branch 'LmeSzinc:master' into 20230309 2024-01-24 00:47:13 +08:00
LmeSzinc
290456637c Fix: Allow enter map with is_combat_loading 2024-01-12 18:40:47 +08:00
LA-DI-DA
0252b8bcc0 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-12 10:31:19 +08:00
Zuosizhu
79956f8b66 Merge branch 'master_lme' 2024-01-11 16:59:27 +08:00
LmeSzinc
c3c4c03a5b Fix: Handle perspective error caused by GET_MISSION 2024-01-11 10:54:58 +08:00
LA-DI-DA
c921b04fe0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2024-01-02 23:06:15 +08:00
Zuosizhu
252c021a49 Fix: Handle retirement when changing ships in hard mode. Handle no flagships after retirement. 2023-12-25 01:10:30 +08:00
Zuosizhu
50aef0ec0f Fix: Same ships are black when changing hard mode flagships 2023-12-24 18:57:53 +08:00
LA-DI-DA
03f56ac4f0 Merge branch 'zuosizhu-alas/master' 2023-11-10 16:54:55 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
hephooey
99a4478563 [TW]: Update WITHDRAW and IN_MAP assets (#3276) 2023-11-10 10:53:29 +08:00
LA-DI-DA
153dbdd79e Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
 2023-10-27 19:28:33 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
LmeSzinc
fb3d736bbb Fix: [JP] SUBMARINE_BAR 2023-10-22 21:51:52 +08:00
hephooey
12c3dfd159 [tw] Update WITHDRAW asset (#3217) 2023-10-22 16:14:17 +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
appleapple802
c5bd99ff4c Upd: [TW] map and handler assets 2023-10-21 12:34:05 +08:00
Zuosizhu
9e31b5eb43 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 22:44:25 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +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
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
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
ce13aaa8b7 Upd: [CN] _fleet_sidebar 2023-10-19 22:30:06 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
e41658ad43 Fix: Accidentally entered daily when entering map 2023-10-07 09:26:50 +08:00
LA-DI-DA
79e449a258 Add: handle retirement when map preparation after clicking MAP_PREPARATION 2023-09-16 12:28:28 +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
LmeSzinc
14c92519f8 Upd: [JP] FLEET_PREPARATION 2023-09-14 23:40:09 +08:00
Zuosizhu
ec48411c88 Merge branch 'LmeSzinc:master' into 20230309 2023-08-23 19:04:03 +08:00
LmeSzinc
46d07d1f45 Fix: Reset arrive timers after handle_map_cat_attack() 2023-08-20 00:15:33 +08:00
Zuosizhu
6550a56b2b Merge branch 'master_lme' 
# Conflicts:
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-08-19 09:23:28 +08:00
LmeSzinc
acfb08526d Fix: Lost siren tracking at J5 in B2D2 2023-08-19 01:01:22 +08:00
Zuosizhu
72730a4147 Merge branch 'LmeSzinc:master' into 20230309 2023-08-08 20:40:20 +08:00
LmeSzinc
b68a711d39 Fix: Handle map detection error caused by OPSI_MISSION_CHECK 2023-08-05 18:11:51 +08:00
Zuosizhu
c22157a548 Merge branch 'LmeSzinc:master' into 20230309 2023-08-04 00:20:16 +08:00
LmeSzinc
d389f75c5f Add: handle_map_walk_speedup() 2023-08-03 22:59:37 +08:00
Zuosizhu
1e1661f4bb Merge branch 'LmeSzinc:master' into 20230309 2023-07-29 22:04:54 +08:00
LmeSzinc
f948fd502f Fix: Handle empty HP when using emergency repair (#2925) 2023-07-25 12:48:47 +08:00
LmeSzinc
881007979a Fix: Handle GET_ADAPTABILITY in map detection (#2915) 2023-07-25 12:36:53 +08:00
Zuosizhu
8927df9389 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 10:03:50 +08:00
LmeSzinc
6f3d46d617 Fix: Rewrite fortress_data 2023-07-21 03:37:54 +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