LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 23:59:30 +08:00
Code Activity
Files
4caa2e2aec2ffd1c37253fbcddf4c6bdbfca7120
Alas/assets/en
History
Zuosizhu 4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
2023-09-28 18:09:13 +08:00
..
campaign
Merge branch 'master_lme'
2023-08-19 09:23:28 +08:00
coalition
Upd: [EN][JP] COALITION_REWARD_CONFIRM
2023-03-24 14:08:05 +08:00
combat
Upd: [EN] PAUSE and PAUSE_DOUBLE_CHECK
2023-09-01 02:16:05 +08:00
commission
Fix: [EN] Fix commission "flashing bug"
2022-04-14 13:22:25 -03:00
daily
Add: Emergency module development daily
2023-03-17 00:34:02 +08:00
dorm
Upd: [EN] DORM_FURNITURE_CONFIRM, ACTION_POINT_REMAIN_OS
2023-02-26 14:45:24 -05:00
equipment
Upd: [EN] EQUIP_CONFIRM in equipment module
2022-12-12 18:00:44 +08:00
event
Upd: [EN] remove alpha channel in assets
2022-04-12 22:59:48 -04:00
exercise
Upd: EXP_INFO_* and the exercise one
2023-05-25 21:45:19 +08:00
freebies
Upd: [EN] Another MAIL_EMPTY
2023-01-01 17:04:39 +08:00
gacha
Fix: Error caused by empty build queue (#2816)
2023-06-30 15:32:41 +08:00
guild
Upd: [EN][JP] BATTLE_STATUS_CF, EXP_INFO_CF
2023-06-10 01:39:23 +08:00
handler
Fix: [EN] Update AUTO_SEARCH_MENU_*.BUTTON.png
2023-09-22 02:28:01 +08:00
hard
…
map
Upd: [EN][JP] FLEET_*_ADVICE
2023-03-11 01:58:39 +08:00
meowfficer
Fix: MEOWFFICER_FEED_CANCEL click fails (#2428)
2023-03-31 00:20:20 +08:00
meta_reward
Del: unused DOSSIER_REWARD_NOTICE.png
2023-09-09 08:53:51 +08:00
minigame
Opt: Choose minigame by scroll
2023-08-08 00:03:41 +08:00
os
Fix: [EN] Update FLEET_* in OpSi
2022-12-16 21:42:36 +08:00
os_ash
Upd: [EN] various assets for server; war_archive, os_ash, template, and handler
2023-06-30 18:00:33 -04:00
os_combat
Upd: [EN] remove alpha channel in assets
2022-04-12 22:59:48 -04:00
os_handler
Upd: [EN] MISSION_OVERVIEW_CHECK
2023-03-17 00:49:43 +08:00
raid
Fix: add RAID_REWARDS.png to fix raid reward problem (#2829)
2023-07-02 15:38:44 +08:00
research
Fix: get_research_series() (#2975)
2023-08-06 17:40:43 +08:00
retire
Upd: [EN] DOCK_SELECTED
2023-06-08 23:54:48 +08:00
reward
Mov: reward mail support to separate module
2022-10-16 01:01:15 -04:00
shipyard
Upd: [EN] shipyard fate assets
2023-01-22 22:33:57 -05:00
shop
fix: shop confirm amount buttom (#3001)
2023-08-11 19:05:52 +08:00
sos
Fix: [EN] Confirm button in SOS signal search list
2022-12-07 01:38:57 +08:00
statistics
Fix: [EN] redo statistics assets; not all black except for target
2021-12-03 17:05:41 -05:00
storage
updata EN box button (fix#3015) (#3017)
2023-08-15 18:40:55 +08:00
tactical
Fix: [EN] Unable to detect META skill list
2022-09-25 02:39:45 +08:00
template
Merge pull request #2996 from guoh064/meta_reward
2023-09-25 18:29:46 +08:00
ui
Merge branch 'master' into dev-minigame-for-pr
2023-09-11 10:29:52 +08:00
war_archives
Upd: [EN] various assets for server; war_archive, os_ash, template, and handler
2023-06-30 18:00:33 -04:00