LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 03:59:25 +08:00
Code Activity
Files
9e31b5eb4392a441f9dfc8bc4178d56f03091cd2
Alas/module
History
Zuosizhu 9e31b5eb43 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
2023-10-20 22:44:25 +08:00
..
base
Merge branch 'LmeSzinc:master' into 20230309
2023-09-22 08:15:14 +08:00
campaign
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
coalition
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
combat
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
commission
…
config
Opt: Allow to set opsifleet in opsistronghold
2023-10-20 09:06:27 +08:00
daemon
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
daily
Fix: Error caused by loop of Daily Emergency Module Development (#3096)
2023-09-08 12:08:55 +08:00
device
Merge branch 'LmeSzinc:master' into 20230309
2023-10-07 16:55:17 +08:00
dorm
Fix: Handle random ocr error from OCR_DORM_FILL
2023-08-24 12:38:43 +08:00
equipment
Merge branch 'LmeSzinc:master' into 20230309
2023-08-04 00:20:16 +08:00
event
…
exercise
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
freebies
Upd: Assets for entering supply pack
2023-07-14 00:31:52 +08:00
gacha
Merge branch 'master_lme'
2023-07-15 20:26:12 +08:00
game_setting
…
gg_handler
Add: timeout setting of enabling gg
2023-10-12 22:35:54 +08:00
guild
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
handler
Merge branch 'master_lme'
2023-10-20 22:44:25 +08:00
hard
…
log_res
…
map
Merge branch 'master_lme'
2023-10-20 22:44:25 +08:00
map_detection
…
meowfficer
Fix: Increase threshold at empty slot of meowfficer enhance (#3155)
2023-10-06 00:15:34 +08:00
meta_reward
Del: unused DOSSIER_REWARD_NOTICE.png
2023-09-09 08:53:51 +08:00
minigame
Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING
2023-09-28 16:26:20 +08:00
ocr
…
os
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
os_ash
Merge branch 'master_lme'
2023-09-28 18:09:13 +08:00
os_combat
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
os_handler
Merge branch 'LmeSzinc:master' into 20230309
2023-09-22 08:15:14 +08:00
raid
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
research
Fix: get_research_series() (#2975)
2023-08-06 17:40:43 +08:00
retire
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
reward
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
shipyard
[TW]Fix ash beacons and shipyard (#2999)
2023-08-11 19:06:10 +08:00
shop
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
sos
…
statistics
add: analysis resource collection (#3107)
2023-09-10 19:53:50 +08:00
storage
Add: Siren templates in chapter A
2023-08-18 22:29:25 +08:00
submodule
…
tactical
Fix: tactical failed when the ship's all skills are leveled max (#3201)
2023-10-19 02:15:49 +08:00
template
Merge pull request #2996 from guoh064/meta_reward
2023-09-25 18:29:46 +08:00
ui
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
war_archives
add war_archive: Inverted orthant (#3089)
2023-09-08 01:14:18 +08:00
webui
Merge branch 'LmeSzinc:master' into 20230309
2023-10-04 17:10:01 +08:00
exception.py
…
logger.py
Sync: [SRC] Sync alas changes
2023-09-10 15:04:32 +08:00
logger.pyi
…
notify.py
…
server_checker.py
…