1778 Commits

Author SHA1 Message Date
19e798a28b Change ccount delete to delete all referenced items in the database. 2022-05-09 12:50:47 -07:00
85f5a753e1 Merge pull request #746 from Akka0/tower
fix the Monster spawn between stage challenges
2022-05-09 12:50:33 -07:00
bdc9e483ae Fixed MissingFormatArgumentException (#727)
Format string is `"given_level": "Given %s with level %s %s times to %s"`
2022-05-09 12:50:23 -07:00
66b17cad26 little fix 2022-05-10 00:14:50 +08:00
2e69a4d8f7 Merge remote-tracking branch 'origin/development' into tower 2022-05-10 00:07:10 +08:00
c2a7d6076b Merge pull request #9 from Grasscutters/development
Development
2022-05-10 00:06:08 +08:00
faa3cde575 fix the Monster spawn between stage challenges 2022-05-10 00:05:01 +08:00
9a7d78e0b7 Update translation keys to fix issues 648 677
fix issues 648 677
2022-05-09 04:18:12 -07:00
c432ace5d8 Updating language files fixed the issue 648 677
fix issue 648 677
2022-05-09 04:18:12 -07:00
63efef8d05 Fix /talent saving to level instead of id 2022-05-09 04:18:04 -07:00
5d917f185f Move "if Grasscutter.getConfig().OpenStamina" to the correct place. 2022-05-09 03:46:18 -07:00
eb2b23928b Fix #719 2022-05-09 02:28:41 -07:00
6197ab21cd Exclude macOS junk in case anyone develops on mac. 2022-05-09 02:28:23 -07:00
ccdc3d1214 Only handle motion notify for current entity. 2022-05-09 02:28:13 -07:00
45b45c4beb Merge remote-tracking branch 'fork/tower' into tower 2022-05-09 17:01:26 +08:00
722e710c7b Fix #719 2022-05-09 17:01:08 +08:00
f0aa8c2c53 Merge pull request #718 from Akka0/tower
Support Team Toggle in Tower & Refactor MonsterTide
2022-05-09 01:15:02 -07:00
713b2698d0 Fix perm field order consistency on GiveCommand 2022-05-09 01:12:47 -07:00
f08a89711c Account permission wildcards 2022-05-09 01:12:47 -07:00
80db118f72 Add permissionTargeted to applicable commands
Change target perm from target.perm to x.perm.others
2022-05-09 01:12:47 -07:00
47ea466054 Merge remote-tracking branch 'origin/development' into tower 2022-05-09 15:43:52 +08:00
0bfa1fa0e9 Merge pull request #8 from Grasscutters/development
Development
2022-05-09 15:42:12 +08:00
65c93a747c Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
056b5b80c8 Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
9869e4368d -Make the _tier suffix optional. 2022-05-08 15:59:09 -07:00
935bb4b523 Fix incorrect @Command annotation. 2022-05-08 15:59:09 -07:00
72e8a976ea Fix invalid translation key. 2022-05-08 15:59:09 -07:00
5f8011f0ec Added to ability to specify main and substats for /giveart via names instead of IDs. 2022-05-08 15:59:09 -07:00
06f531fe18 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00
d43f431506 Add warning for language fallback 2022-05-08 13:19:23 -07:00
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