LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 02:59:30 +08:00
Code Activity
7,838 Commits 12 Branches 0 Tags
0c4e1228ea587149d378e87eebb2aaf393d873d3
Commit Graph

7838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LA-DI-DA
0c4e1228ea Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-15 22:11:11 +08:00
LA-DI-DA
8322140284 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/gg_handler/gg_handler.py
 2023-10-15 22:08:23 +08:00
Zuosizhu
b6aec9a5b1 Merge pull request #7 from 0O0o0oOoO00/more-timeout-for-gg 
Add: timeout setting of enabling gg
 2023-10-14 20:24:36 +08:00
LA-DI-DA
921b18edb0 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-13 11:49:38 +08:00
LA-DI-DA
3f3da4ff85 Add: user setting of scrolling dock and scrolling fleet 2023-10-13 11:46:10 +08:00
LA-DI-DA
30cbc7fadc Add: meta panel page 2023-10-13 10:47:21 +08:00
LA-DI-DA
4caa2e2aec Add: timeout setting of enabling gg 2023-10-12 22:35:54 +08:00
LA-DI-DA
02a0aa5c25 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-12 21:57:43 +08:00
LA-DI-DA
842fba0391 Add: scroll fleet to load all fleet data 2023-10-12 21:53:46 +08:00
LA-DI-DA
82aba4b8a8 Adj: timeout of enabling gg 2023-10-12 21:53:07 +08:00
LA-DI-DA
64f3711dc6 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-12 20:53:59 +08:00
LA-DI-DA
4febb71500 Fix: inappropriate scroll dock 2023-10-12 20:32:20 +08:00
LA-DI-DA
1cbc141d10 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-12 19:43:57 +08:00
LA-DI-DA
293060445d Add: scroll dock to load all ship's data for changing attribute 2023-10-12 19:43:42 +08:00
Zuosizhu
97783288c6 Merge pull request #6 from 0O0o0oOoO00/repush-lua-fix 
Fix: repush lua in linux
 2023-10-12 07:51:14 +08:00
LA-DI-DA
24ee5f5fa2 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	bin/Lua/ShipChanger.lua
#	bin/Lua/ShipFucker.lua
 2023-10-11 22:45:02 +08:00
LA-DI-DA
e9d03356b5 Upd: lua scripts 2023-10-11 22:40:49 +08:00
LA-DI-DA
68e00b272e Fix: wrong click when checking ship's experience 2023-10-11 15:03:09 +08:00
LA-DI-DA
21dc86a351 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 14:51:34 +08:00
LA-DI-DA
68b5660f13 Upd: lua scripts 2023-10-11 14:50:10 +08:00
LA-DI-DA
519b175549 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 13:45:59 +08:00
LA-DI-DA
2792c68dba Fix: lack of checking whether enable or not of ChangeShip and ChangeAttribute 2023-10-11 13:44:28 +08:00
LA-DI-DA
89632c9ee4 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 13:25:27 +08:00
LA-DI-DA
06b3251da8 Fix: push lua in ChangeShip and ChangeAttribute 2023-10-11 13:24:23 +08:00
LA-DI-DA
b1d8fdd032 Fix: repush lua 2023-10-11 11:58:33 +08:00
LA-DI-DA
1a66d96f92 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 11:23:13 +08:00
LA-DI-DA
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
Zuosizhu
2cf5f53e02 Merge branch 'LmeSzinc:master' into 20230309 2023-10-07 16:55:17 +08:00
LA-DI-DA
d336ae8e44 Fns: research farming 2023-10-06 22:12:57 +08:00
LmeSzinc
fa0182ac6a Merge pull request #3180 from LmeSzinc/dev 
Bug fix
 2023-10-06 00:26:24 +08:00
LmeSzinc
07fa439690 Fix: Increase threshold at empty slot of meowfficer enhance (#3155) 
which is just 221
 2023-10-06 00:15:34 +08:00
LA-DI-DA
788facdfd8 Add: oil limitation for ResearchFarmingSetting 2023-10-05 22:07:21 +08:00
LA-DI-DA
9b7dc96de7 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/gg_handler/change_ship.py
 2023-10-05 19:36:52 +08:00
LA-DI-DA
4791bb378d Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-05 19:33:20 +08:00
LA-DI-DA
249f1d4908 Upd: description of changing ship type 2023-10-05 19:32:04 +08:00
LA-DI-DA
96812cfbdf Fix: condition to change flagship in GemsFarming 2023-10-05 19:29:45 +08:00
LA-DI-DA
bffa0b75dc Fix: condition to enable change ship 2023-10-05 19:29:05 +08:00
LA-DI-DA
e60d01bd7d Fix: incorrect task command of research_farm in gg_handler 2023-10-05 17:19:40 +08:00
LA-DI-DA
2853b9eb57 Fix: lack override for ResearchFarm 2023-10-05 15:07:26 +08:00
LA-DI-DA
6b269de8a2 Rmv: campaign event name locked to latest 2023-10-05 15:00:33 +08:00
LA-DI-DA
6f2a3b6dcf Rmv: useless condition and describe of change ship and others login detection 2023-10-05 14:57:09 +08:00
LA-DI-DA
de2c563000 Add: research farming(half-finished) 2023-10-05 14:42:06 +08:00
Zuosizhu
934e05a87a Merge branch 'LmeSzinc:master' into 20230309 2023-10-04 17:10:01 +08:00
LA-DI-DA
b4a9bc84db Fix: lack of setting emotion for auto event 2023-10-03 22:08:52 +08:00
LA-DI-DA
bb2af0d976 Add: set first campaign name for event auto farming 2023-10-03 21:52:09 +08:00
LA-DI-DA
f08f05089c Add: select event for event auto farming 2023-10-03 21:30:32 +08:00
LA-DI-DA
02a1cfe3fa Add: event auto farming 2023-10-03 12:37:51 +08:00
LA-DI-DA
3b2e6cda71 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-01 15:30:26 +08:00
LA-DI-DA
d1f6154a31 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-10-01 15:27:45 +08:00
LA-DI-DA
3dd8c83253 Fix: exit dock when changing flagship and when GemsFarming is set to normal map 2023-10-01 14:37:39 +08:00