Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 05:49:12 +00:00
Code Issues Projects Releases Wiki Activity
958 Commits 7 Branches 22 Tags 133 MiB
3cf062c98c
Commit Graph

958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akka
3cf062c98c Merge remote-tracking branch 'fork/tower' into tower 2022-05-09 17:01:26 +08:00
Akka
bf8f4fba52 Fix #719 2022-05-09 17:01:08 +08:00
Akka
e24ad0c732 Merge remote-tracking branch 'origin/development' into tower 2022-05-09 15:43:52 +08:00
Akka
1dd3c6d2e8
Merge pull request #8 from Grasscutters/development 
Development
 2022-05-09 15:42:12 +08:00
Akka
d00465125d Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
Shirakami Ling
f0ff323b7b Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
ImmuState
8c7a46e8ef -Make the _tier suffix optional. 2022-05-08 15:59:09 -07:00
ImmuState
2a12ed5694 Fix incorrect @Command annotation. 2022-05-08 15:59:09 -07:00
ImmuState
e8e48600ae Fix invalid translation key. 2022-05-08 15:59:09 -07:00
ImmuState
14bf96e907 Added to ability to specify main and substats for /giveart via names instead of IDs. 2022-05-08 15:59:09 -07:00
Melledy
63eed41dd5 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00
KingRainbow44
392ce26e32 Add warning for language fallback 2022-05-08 13:19:23 -07:00
KingRainbow44
1234a88c67 Fallback to the fallback fallback 2022-05-08 13:19:23 -07:00
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
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
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