LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 01:59:25 +08:00
Code Activity
Files
772bf15f62ed86c74da56ebb3d7af7ff22e3cb5c
Alas/module
History
LmeSzinc 772bf15f62 Merge branch 'master' into dev 
# Conflicts:
#	module/ui/assets.py
2021-08-07 14:32:31 +08:00
..
base
Merge branch 'master' into dev
2021-08-07 14:32:31 +08:00
build
Add: build module
2021-07-10 23:24:48 -04:00
campaign
Fix: Conflicts among branches
2021-07-24 17:53:45 +08:00
combat
Merge branch 'gems_farming' into dev
2021-07-24 17:33:58 +08:00
config
Merge branch 'master' into dev
2021-08-07 14:32:31 +08:00
daemon
Fix: [TW] Dorm_Feed_Cancel&Ambush asset
2021-07-21 11:07:33 +08:00
daily
Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now
2021-06-20 16:39:14 +08:00
deploy
…
device
Fix: Raise error if clicking between 2 buttons
2021-07-16 21:33:33 +08:00
equipment
Fix: Guild side bar and equipment side bar
2021-07-25 01:21:24 +08:00
event
Fix: Daily event SP is influenced by ENABLE_FLEET_REVERSE_IN_HARD in settings
2021-04-25 16:57:01 +08:00
exercise
Merge branch 'gems_farming' into dev
2021-07-24 17:33:58 +08:00
guild
Merge branch 'master' into dev
2021-08-07 14:32:31 +08:00
handler
Merge branch 'master' into dev
2021-07-24 20:45:50 +08:00
hard
Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now
2021-06-20 16:39:14 +08:00
map
Add: Azur Anthem Event maps
2021-07-23 18:26:24 +08:00
map_detection
Merge branch 'master' into dev
2021-07-25 21:24:30 +08:00
ocr
Fix: Failed to get zone name after oil buy count OCR
2021-04-25 16:53:44 +08:00
os
Fix: [JP] ZONE_SWITCH text asset
2021-07-20 14:27:09 +08:00
os_ash
Fix: [EN] ASH_ENTRANCE asset update
2021-06-10 23:53:24 -04:00
os_combat
Fix: forgot self
2021-04-24 12:06:36 -04:00
os_handler
Merge branch 'gems_farming' into dev
2021-07-24 17:33:58 +08:00
raid
Fix: [TW] Dorm_Feed_Cancel&Ambush asset
2021-07-21 11:07:33 +08:00
research
Opt: Return objects instead of index in Filter.apply()
2021-08-07 14:29:34 +08:00
retire
Merge branch 'gems_farming' into dev
2021-07-24 17:33:58 +08:00
reward
Merge branch 'master' into dev
2021-08-07 14:32:31 +08:00
shop
Fix: Conflicts among branches
2021-07-24 17:53:45 +08:00
sos
…
statistics
Merge branch 'master' into dev
2021-08-07 14:32:31 +08:00
template
Add: Siren templates in Azur Anthem SP4
2021-07-23 21:01:37 +08:00
ui
Merge branch 'master' into dev
2021-08-07 14:32:31 +08:00
war_archives
Opt: Upped swipe distance, removed unused assets and packages
2021-03-14 00:02:41 -05:00
exception.py
Fix: fixed guild logistics refresh bug
2021-02-19 20:09:11 -03:00
logger.py
Opt: Set name of logger, avoid using root logger
2021-04-05 21:12:28 +08:00
update.py
…