Commit Graph

1147 Commits

Author SHA1 Message Date
memetrollsXD
e56cd8385a Update com.google.code.gson 2.8.8 -> 2.9.0 2022-05-08 13:11:34 -07:00
memetrollsXD
bcd8d39084 Change LICENSE to GNU Affero
With these changes, commercial use is still allowed, but are required to disclose the source, changes, and copyright. Meaning that people won't be unknowingly ripped off, and would be paying knowing that it is an open-source project with possible changes.

tl;drLegal link: https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)
2022-05-08 13:09:22 -07:00
Akka
bb864bd28b Merge branch 'tower' of https://github.com/Akka0/Grasscutter into tower 2022-05-08 22:55:37 +08:00
HotaruYS
85821eb16b
Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
Yazawazi
6ce96d1c26 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
916b7412fd Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Akka
e95431d3e7 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-08 06:06:32 -07:00
Melledy
b9fbc4975d Optimize invoke packet handling 2022-05-08 06:05:50 -07:00
Melledy
1f86e7bb17 Implement energy balls (orbs) 2022-05-08 06:05:50 -07:00
Melledy
6d1ef0d841 Implement AbilityManager 2022-05-08 06:05:50 -07:00
Akka
727d92a6bc Merge remote-tracking branch 'origin/development' into tower 2022-05-08 20:56:50 +08:00
Akka
bc7c78044b
Merge pull request #7 from Grasscutters/development
Development
2022-05-08 20:54:42 +08:00
Michaellan
342cf33661 fill description 2022-05-08 05:51:13 -07:00
HotaruYS
55b692561f
Improve logging pattern by including caller class name 2022-05-08 14:30:48 +02:00
gentlespoon
ccdfd15bb8 Update StaminaManager 2022-05-08 04:39:25 -07:00
gentlespoon
eab964de5c Fix: timer is already cancelled. 2022-05-08 04:39:25 -07:00
HotaruYS
9020ee5b2a
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
6a8cc01dc1 merge 2022-05-08 17:19:17 +08:00
Akka
8a52a041bd Persist Tower Data && Set The Tower Schedule 2022-05-08 17:11:02 +08:00
方块君
b3317bd6d7 Using annotation key translation 2022-05-08 01:47:26 -07:00
方块君
f49862145c add Command description 2022-05-08 01:47:26 -07:00
方块君
05e1e5502c Add command description multilingual 2022-05-08 01:47:26 -07:00
Magix
b69c58cab1 Update build.yml 2022-05-08 01:45:39 -07:00
芊枫
3dcf8bf46a Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
57236f2197 Update zh-CN.json 2022-05-07 23:14:56 -07:00
芊枫
401cb609ae Fix typo && update zh-CN.json 2022-05-07 23:14:56 -07:00
Mateoust
8b198d6dbe fix issues 646 2022-05-07 23:13:45 -07:00
gentlespoon
8ddd7b125d Fix null reference on stamina timer when paused player disconnects. 2022-05-07 23:13:35 -07:00
KingRainbow44
04a58d43d5 Add a plugin schema 2022-05-07 23:12:19 -07:00
Magix
e99875ea4d Update build.yml 2022-05-07 23:10:27 -07:00
KingRainbow44
2416dd66e5
Fix language fallback'ing 2022-05-07 23:44:35 -04:00
Zakhil
a269ff9563
Added polish locale (#655) 2022-05-07 18:19:24 -07:00
Akka
8739277970 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -07:00
gentlespoon
a7c1f85579 Make stamina consumption classes public so others can use. 2022-05-07 18:18:20 -07:00
gentlespoon
032db81e07 Stop stamina consumption on game pause 2022-05-07 18:18:20 -07:00
gentlespoon
090b00556b More reliable stamina calculation
by separately handling immediate one-time cost and cost over time.
2022-05-07 18:18:20 -07:00
Kimi
eb4dabe162 Update zh-TW.json 2022-05-07 15:49:22 -07:00
Kimi
fbaeaee4b5 another translation patches because i fucked it up
i hate myself
2022-05-07 15:49:22 -07:00
Magix
658ee3b547
UPGRADE TO 1.1.0 POG
Merge `development` into `stable`
2022-05-07 18:18:18 -04:00
Magix
426f3701e8
Update build.gradle (in prep for 1.1.0) 2022-05-07 18:17:32 -04:00
KingRainbow44
330427f5a5
Simplify the language fallback system 2022-05-07 18:12:53 -04:00
Magix
d70df776b1
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
f133a8b123
Update PluginManager.java 2022-05-07 17:58:18 -04:00
HotaruYS
75032b4aa2 Respect FrontHTTPS when creating URI for gacha record 2022-05-07 14:54:15 -07:00
Piotr Blecharski
55d47a014f Deleted .DS_Store 2022-05-07 14:45:42 -07:00
Piotr Blecharski
1445fe9ce5 Command list with descriptions in handbook 2022-05-07 14:45:42 -07:00
zhaodice
fadda64699 fix issue 635
fix #635
2022-05-07 14:42:25 -07:00
zhaodice
03544acb3d fix issues 629
fix #629
2022-05-07 14:39:34 -07:00
Kimi
8618c7de9e 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
2c50d2268b
Merge pull request #5 from Grasscutters/development
Development
2022-05-07 21:49:22 +08:00