2348 Commits

Author SHA1 Message Date
137ea1e294 Fallback to the fallback fallback 2022-05-08 13:19:23 -07:00
09801a1845 Update com.google.code.gson 2.8.8 -> 2.9.0 2022-05-08 13:11:34 -07:00
3c20f2b032 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
ccdce68434 Merge branch 'tower' of https://github.com/Akka0/Grasscutter into tower 2022-05-08 22:55:37 +08:00
9a0a15a462 Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
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
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
9ad44f5c10 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-08 06:06:32 -07:00
55389d3a5c Optimize invoke packet handling 2022-05-08 06:05:50 -07:00
2dfdc62743 Implement energy balls (orbs) 2022-05-08 06:05:50 -07:00
897f082b12 Implement AbilityManager 2022-05-08 06:05:50 -07:00
219a850818 Merge remote-tracking branch 'origin/development' into tower 2022-05-08 20:56:50 +08:00
65861c3c22 Merge pull request #7 from Grasscutters/development
Development
2022-05-08 20:54:42 +08:00
176f3e91f1 fill description 2022-05-08 05:51:13 -07:00
beea95fdae Improve logging pattern by including caller class name 2022-05-08 14:30:48 +02:00
d78348522e Update StaminaManager 2022-05-08 04:39:25 -07:00
a09723f07d Fix: timer is already cancelled. 2022-05-08 04:39:25 -07:00
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
d468edcfc1 merge 2022-05-08 17:19:17 +08:00
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
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
06564da009 fix issues 646 2022-05-07 23:13:45 -07:00
94a6a79b4a Fix null reference on stamina timer when paused player disconnects. 2022-05-07 23:13:35 -07:00
c9e8d6cad7 Add a plugin schema 2022-05-07 23:12:19 -07:00
2677ef146b Update build.yml 2022-05-07 23:10:27 -07:00
549471b76e Fix language fallback'ing 2022-05-07 23:44:35 -04:00
50307ea3a9 Added polish locale (#655) 2022-05-07 18:19:24 -07:00
eb94adb296 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-07 18:18:27 -07:00
29f9d6506a Make stamina consumption classes public so others can use. 2022-05-07 18:18:20 -07:00
836e0150b5 Stop stamina consumption on game pause 2022-05-07 18:18:20 -07:00
8e99cb4f35 More reliable stamina calculation
by separately handling immediate one-time cost and cost over time.
2022-05-07 18:18:20 -07:00
43c27c4679 Update zh-TW.json 2022-05-07 15:49:22 -07:00
88bc5c4c54 another translation patches because i fucked it up
i hate myself
2022-05-07 15:49:22 -07:00
01b190bced UPGRADE TO 1.1.0 POG
Merge `development` into `stable`
2022-05-07 18:18:18 -04:00
1beddf16c1 Update build.gradle (in prep for 1.1.0) 2022-05-07 18:17:32 -04:00
57cc111350 Simplify the language fallback system 2022-05-07 18:12:53 -04:00
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
84c1cd7aa7 Update PluginManager.java 2022-05-07 17:58:18 -04:00
ab5131e9fd Respect FrontHTTPS when creating URI for gacha record 2022-05-07 14:54:15 -07:00
747d6e91f6 Deleted .DS_Store 2022-05-07 14:45:42 -07:00
34228dc9cd Command list with descriptions in handbook 2022-05-07 14:45:42 -07:00
e85eb2f48a fix issue 635
fix #635
2022-05-07 14:42:25 -07:00
7e5696211c fix issues 629
fix #629
2022-05-07 14:39:34 -07:00
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