Commit Graph

379 Commits

Author SHA1 Message Date
Erik
56d2df66b9
Merge branch 'dev' into master 2020-06-16 13:36:05 -03:00
Erik
159304cdd0
Merge pull request #24 from LmeSzinc/master
Add: aScreenCap support
2020-06-16 13:32:50 -03:00
LmeSzinc
80951f864f Fix: Wrong event run folder 2020-06-16 20:49:29 +08:00
LmeSzinc
1064ca7dd7 Doc: Update future_plan.md 2020-06-16 20:18:30 +08:00
LmeSzinc
20567ceba5 Merge remote-tracking branch 'origin/master' 2020-06-16 18:34:26 +08:00
LmeSzinc
9a1f4c607e
Merge pull request #38 from whoamikyo/master
Add: Added some icons to GUI
2020-06-16 18:34:11 +08:00
LmeSzinc
383ff448ad Doc: aScreenCap benchmarks
- Fix emulator test config
- Add instruction when no suitable aScreenCap lib
2020-06-16 18:28:24 +08:00
Erik
8dbbee7cb7
Merge pull request #23 from whoamikyo/master
Asset: [EN] Updated MAP_ENEMY_SEARCHING
2020-06-16 07:12:25 -03:00
whoamikyo
501aaceed4 Update campaign_7_2_mystery_farming.py 2020-06-16 06:53:54 -03:00
whoamikyo
6d85adc89e Delete version.txt 2020-06-16 06:52:16 -03:00
whoamikyo
23aa33ce23 Asset: [EN] Updated MAP_ENEMY_SEARCHING 2020-06-16 06:51:34 -03:00
LmeSzinc
51f39be0ff Fix: [CN] LOGIN_CONFIRM different in different device
- Improve log appearance of login
2020-06-16 17:26:34 +08:00
Erik
185b85a808
Merge pull request #22 from whoamikyo/master
Mirroring master
2020-06-16 01:12:16 -03:00
whoamikyo
26a321a916 initial commit 2020-06-16 00:30:50 -03:00
whoamikyo
d2d64ee487 Add: Added some icons to GUI
Assets: [EN] updated some templates assets using relative_crop.py
Campaign: Added 12-4 support
Fix: Added camera_data_spawn_point on 7-2 mystery to avoid dont detected a fleet when camera focus on H1
2020-06-16 00:04:16 -03:00
LmeSzinc
d0867262e2 Optimize: Reuse device instance in the same function
- Speed up retire confirm
- Set default server to CN
- Improve log appearance of aScreenCap init
2020-06-16 08:55:44 +08:00
LmeSzinc
2e26d0a1e1 Add: [CN] Main chapter mode settings in GUI 2020-06-16 07:49:15 +08:00
whoamikyo
1ea28dfc86 Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript 2020-06-15 20:48:45 -03:00
whoamikyo
7326d6b2e0 Update: [EN] change in some terms to facilitate understanding. 2020-06-15 20:48:16 -03:00
Erik
20258ce2d5
Merge pull request #21 from LmeSzinc/master
Fix: All BATTLE_STATUS and EXP_INFO of all server
2020-06-15 20:46:27 -03:00
LmeSzinc
97b85160cd Add: aScreenCap support
- Optimize adb command call
2020-06-16 07:39:51 +08:00
LmeSzinc
1e55c25f49 Fix: All BATTLE_STATUS and EXP_INFO of all server 2020-06-16 02:47:28 +08:00
whoamikyo
8dfaf6f67d Create version.txt 2020-06-15 13:03:09 -03:00
LmeSzinc
8b27fe0a83 Doc: missing image of development.md 2020-06-15 21:20:02 +08:00
LmeSzinc
5f0f964d5f Fix: [EN] Parameters of event Skybound Oratorio 2020-06-15 21:19:06 +08:00
whoamikyo
6b86dd6440 Doc: Added readme for docs 2020-06-15 06:21:28 -03:00
whoamikyo
00a5f19c98 Doc: Add Getting Started 2020-06-15 06:15:55 -03:00
LmeSzinc
f5fc44fc70
Merge pull request #37 from nEEtdo0d/master
Add exercise mode "easiest"
2020-06-15 00:41:24 +08:00
nEEtdo0d
8c68ae9d28 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2020-06-14 12:28:44 -04:00
nEEtdo0d
8cb55f699d Add new exercise option "easiest" and alternative priority calculation for this specific mode. May alter at a later date but for time being the behavior seems to be consistent in prioritizing the lowest average level based on all 6 ship slots (filled or empty) and lowest average overall power based on number of actual ships (only filled) in the team. 2020-06-14 12:27:13 -04:00
LmeSzinc
316f88b964
Merge pull request #36 from whoamikyo/master
Doc: Quick guide updated with EasyALAS_CLICK_INSTALL guide
2020-06-15 00:23:42 +08:00
whoamikyo
d23ed54e2b Doc: Quick guide updated with EasyALAS_CLICK_INSTALL guide 2020-06-14 13:13:10 -03:00
whoamikyo
ec17a93cc9 Update EasyALAS_CLICK_INSTALL.bat 2020-06-14 12:37:54 -03:00
LmeSzinc
0b7efe5b3a
Merge pull request #35 from whoamikyo/master
Add: One click install
2020-06-14 23:28:36 +08:00
whoamikyo
31dab2ba18 Add: Click install
- Now its possible install ALAS and dependencies with one click, just download the file EasyALAS_CLICK_INSTALL.bat and run as administrator and the magic will happen.
2020-06-14 12:26:49 -03:00
whoamikyo
5434209893 Fix: Fix default PACKAGE_NAME
- this was causing error when triggered app restart
2020-06-13 20:38:35 -03:00
Erik
c7a04213f7
Merge pull request #20 from LmeSzinc/master
Add: [JP] add jp assets
2020-06-13 16:38:13 -03:00
LmeSzinc
b82f9cd576
Merge pull request #33 from MarioGilera/master
Revam of event_20200611_en maps
2020-06-14 03:34:35 +08:00
MarioGilera
6a62e54a25 Revam of event_20200611_en maps 2020-06-13 21:29:31 +02:00
LmeSzinc
0450cbdf80 Fix: The info_bar blocks the ammo icon when reversing fleet 2020-06-14 02:28:52 +08:00
LmeSzinc
1f25760945 Doc: README.md for jp support 2020-06-14 02:07:29 +08:00
LmeSzinc
b82a9022e8
Merge pull request #32 from ferina8-14/master
[JP] Added assets for JP server
2020-06-14 01:57:09 +08:00
ferina8-14
dea0a02245 Merge remote-tracking branch 'upstream/master' 2020-06-14 02:30:12 +09:00
LmeSzinc
6e31892d86 Dev: relative_crop 2020-06-13 19:26:09 +08:00
ferina8-14
0a1b1ea121 Add: [JP] add jp assets 2020-06-13 03:41:21 +09:00
ferina8-14
47adffd1a0 Merge branch 'master' into try_jp
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
2020-06-13 03:29:35 +09:00
ferina8-14
4fd1b7999a Add: [JP] add event 20200603 for jp server 2020-06-13 02:55:07 +09:00
ferina8-14
0b94fade90 Add: [JP] add jp assets, ui module 2020-06-13 02:54:19 +09:00
ferina8-14
a628c5b02b Add: [JP] add jp assets, template module 2020-06-13 02:53:45 +09:00
ferina8-14
9714b6bb1e Add: [JP] add jp assets, reward module 2020-06-13 02:53:29 +09:00