Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 16:45:23 +00:00
Code Issues Projects Releases Wiki Activity
1,044 Commits 7 Branches 22 Tags 133 MiB
28f4f73dbe
Commit Graph

1044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
HotaruYS
9a0a15a462 Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
Yazawazi
5d1f49579b feature(task): Implement pause, resume and cancel 
Use as `pauseTask(taskName)`. They return boolean values to tell the developer if a timed task can be paused/resumed/cancelled properly.
A little bit of testing shows that pausing and then resuming may execute the task multiple times.
 2022-05-08 06:28:13 -07:00
Akka
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Akka
9ad44f5c10 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-08 06:06:32 -07:00
Melledy
55389d3a5c Optimize invoke packet handling 2022-05-08 06:05:50 -07:00
Melledy
2dfdc62743 Implement energy balls (orbs) 2022-05-08 06:05:50 -07:00
Melledy
897f082b12 Implement AbilityManager 2022-05-08 06:05:50 -07:00
Akka
219a850818 Merge remote-tracking branch 'origin/development' into tower 2022-05-08 20:56:50 +08:00
Akka
65861c3c22 Merge pull request #7 from Grasscutters/development 
Development
 2022-05-08 20:54:42 +08:00
Michaellan
176f3e91f1 fill description 2022-05-08 05:51:13 -07:00
HotaruYS
beea95fdae Improve logging pattern by including caller class name 2022-05-08 14:30:48 +02:00
gentlespoon
d78348522e Update StaminaManager 2022-05-08 04:39:25 -07:00
gentlespoon
a09723f07d Fix: timer is already cancelled. 2022-05-08 04:39:25 -07:00
HotaruYS
7c35c51a6a Override server logging level with environment variable (#653) 
Use `LOG_LEVEL` environment variable to override logging level for `emu.grasscutter` (which also contains all loggers under it). This might help with debugging various issues reported by users. Previously, the only way to override these levels would be to use `-Dlogback.configurationFile`
 2022-05-08 03:48:06 -07:00
Akka
d468edcfc1 merge 2022-05-08 17:19:17 +08:00
Akka
4b6842f006 Persist Tower Data && Set The Tower Schedule 2022-05-08 17:11:02 +08:00
方块君
3a5503de72 Using annotation key translation 2022-05-08 01:47:26 -07:00
方块君
ef3579da82 add Command description 2022-05-08 01:47:26 -07:00
方块君
a46d58e5f6 Add command description multilingual 2022-05-08 01:47:26 -07:00
Magix
257a92f3ef Update build.yml 2022-05-08 01:45:39 -07:00
芊枫
4c911d6f55 Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
d7a82e1c9f Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
21cd002fbd Fix typo && update zh-CN.json 2022-05-07 23:14:56 -07:00
Mateoust
06564da009 fix issues 646 2022-05-07 23:13:45 -07:00
gentlespoon
94a6a79b4a Fix null reference on stamina timer when paused player disconnects. 2022-05-07 23:13:35 -07:00
KingRainbow44
c9e8d6cad7 Add a plugin schema 2022-05-07 23:12:19 -07:00
Magix
2677ef146b Update build.yml 2022-05-07 23:10:27 -07:00
KingRainbow44
549471b76e Fix language fallback'ing 2022-05-07 23:44:35 -04:00
Zakhil
50307ea3a9 Added polish locale (#655) 2022-05-07 18:19:24 -07:00
Akka
eb94adb296 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -07:00
gentlespoon
29f9d6506a Make stamina consumption classes public so others can use. 2022-05-07 18:18:20 -07:00
gentlespoon
836e0150b5 Stop stamina consumption on game pause 2022-05-07 18:18:20 -07:00
gentlespoon
8e99cb4f35 More reliable stamina calculation 
by separately handling immediate one-time cost and cost over time.
 2022-05-07 18:18:20 -07:00
Kimi
43c27c4679 Update zh-TW.json 2022-05-07 15:49:22 -07:00
Kimi
88bc5c4c54 another translation patches because i fucked it up 
i hate myself
 2022-05-07 15:49:22 -07:00
Magix
01b190bced UPGRADE TO 1.1.0 POG 
Merge `development` into `stable`
 2022-05-07 18:18:18 -04:00
Magix
1beddf16c1 Update build.gradle (in prep for 1.1.0) 2022-05-07 18:17:32 -04:00
KingRainbow44
57cc111350 Simplify the language fallback system 2022-05-07 18:12:53 -04:00
Magix
730c993873 Merge pull request #628 from exzork/development 
PluginManager: Use the same class loader and add getPlugin method
 2022-05-07 17:58:42 -04:00
Magix
84c1cd7aa7 Update PluginManager.java 2022-05-07 17:58:18 -04:00
HotaruYS
ab5131e9fd Respect FrontHTTPS when creating URI for gacha record 2022-05-07 14:54:15 -07:00
Piotr Blecharski
747d6e91f6 Deleted .DS_Store 2022-05-07 14:45:42 -07:00
Piotr Blecharski
34228dc9cd Command list with descriptions in handbook 2022-05-07 14:45:42 -07:00
zhaodice
e85eb2f48a fix issue 635 
fix #635
 2022-05-07 14:42:25 -07:00
zhaodice
7e5696211c fix issues 629 
fix #629
 2022-05-07 14:39:34 -07:00
Kimi
14da6214d3 Traditional Chinese | Translation Patches 
yeah i fucked up that one line of translation oops
also added two lines of translation too
 2022-05-07 14:37:48 -07:00
Akka
39e8f810d2 Merge pull request #5 from Grasscutters/development 
Development
 2022-05-07 21:49:22 +08:00
Akka
6148ee8742 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 21:47:13 +08:00
muhammadeko
f8bc471d4d PluginManager: Use the same class loader and add getPlugin method 2022-05-07 19:48:51 +07:00
kaitl
dc3c744778 Update zh-CN.json 2022-05-07 00:47:38 -07:00