958 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'fork/tower' into tower
  Akka · 2022-05-09 17:01:26 +08:00
  45b45c4beb
• Fix #719
  Akka · 2022-05-09 17:01:08 +08:00
  722e710c7b
• Merge remote-tracking branch 'origin/development' into tower
  Akka · 2022-05-09 15:43:52 +08:00
  47ea466054
• Merge pull request #8 from Grasscutters/development

  Development

  Akka · 2022-05-09 15:42:12 +08:00
  0bfa1fa0e9
• Support Team Toggle in Tower & Refactor MonsterTide
  Akka · 2022-05-09 15:39:49 +08:00
  65c93a747c
• Change the license type in zh-CN.json.
  Shirakami Ling · 2022-05-08 16:02:09 -07:00
  056b5b80c8
• -Make the _tier suffix optional.
  ImmuState · 2022-05-08 15:59:09 -07:00
  9869e4368d
• Fix incorrect @Command annotation.
  ImmuState · 2022-05-08 15:59:09 -07:00
  935bb4b523
• Fix invalid translation key.
  ImmuState · 2022-05-08 15:59:09 -07:00
  72e8a976ea
• Added to ability to specify main and substats for /giveart via names instead of IDs.
  ImmuState · 2022-05-08 15:59:09 -07:00
  5f8011f0ec
• Merge branch 'stable' into development
  Melledy · 2022-05-08 15:52:16 -07:00
  06f531fe18
• Add warning for language fallback
  KingRainbow44 · 2022-05-08 13:19:23 -07:00
  d43f431506
• Fallback to the fallback fallback
  KingRainbow44 · 2022-05-08 13:19:23 -07:00
  137ea1e294
• Update com.google.code.gson 2.8.8 -> 2.9.0
  memetrollsXD · 2022-05-08 13:11:34 -07:00
  09801a1845
• 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)

  memetrollsXD · 2022-05-08 13:09:22 -07:00
  3c20f2b032
• Merge branch 'tower' of https://github.com/Akka0/Grasscutter into tower
  Akka · 2022-05-08 22:55:37 +08:00
  ccdce68434
• 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.

  Yazawazi · 2022-05-08 06:28:13 -07:00
  5d1f49579b
• Persist Tower Data && Set The Tower Schedule
  Akka · 2022-05-08 06:06:32 -07:00
  9fc4b916c8
• Monsters tide turn by turn && Ban User Skill && Lua functions
  Akka · 2022-05-08 06:06:32 -07:00
  9ad44f5c10
• Optimize invoke packet handling
  Melledy · 2022-05-08 06:05:50 -07:00
  55389d3a5c
• Implement energy balls (orbs)
  Melledy · 2022-05-08 06:05:50 -07:00
  2dfdc62743
• Implement AbilityManager
  Melledy · 2022-05-08 06:05:50 -07:00
  897f082b12
• Merge remote-tracking branch 'origin/development' into tower
  Akka · 2022-05-08 20:56:50 +08:00
  219a850818
• Merge pull request #7 from Grasscutters/development

  Development

  Akka · 2022-05-08 20:54:42 +08:00
  65861c3c22
• fill description
  Michaellan · 2022-05-08 05:51:13 -07:00
  176f3e91f1
• Update StaminaManager
  gentlespoon · 2022-05-08 04:39:25 -07:00
  d78348522e
• Fix: timer is already cancelled.
  gentlespoon · 2022-05-08 04:39:25 -07:00
  a09723f07d
• 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`

  HotaruYS · 2022-05-08 03:48:06 -07:00
  7c35c51a6a
• merge
  Akka · 2022-05-08 17:19:17 +08:00
  d468edcfc1
• Persist Tower Data && Set The Tower Schedule
  Akka · 2022-05-08 17:11:02 +08:00
  4b6842f006
• Using annotation key translation
  方块君 · 2022-05-08 01:47:26 -07:00
  3a5503de72
• add Command description
  方块君 · 2022-05-08 01:47:26 -07:00
  ef3579da82
• Add command description multilingual
  方块君 · 2022-05-08 01:47:26 -07:00
  a46d58e5f6
• Update build.yml
  Magix · 2022-05-08 01:45:39 -07:00
  257a92f3ef
• Update zh-CN.json
  芊枫 · 2022-05-07 23:14:56 -07:00
  4c911d6f55
• Update zh-CN.json
  芊枫 · 2022-05-07 23:14:56 -07:00
  d7a82e1c9f
• Fix typo && update zh-CN.json
  芊枫 · 2022-05-07 23:14:56 -07:00
  21cd002fbd
• fix issues 646
  Mateoust · 2022-05-07 23:13:45 -07:00
  06564da009
• Fix null reference on stamina timer when paused player disconnects.
  gentlespoon · 2022-05-07 23:13:35 -07:00
  94a6a79b4a
• Add a plugin schema
  KingRainbow44 · 2022-05-07 23:12:19 -07:00
  c9e8d6cad7
• Update build.yml
  Magix · 2022-05-07 23:10:27 -07:00
  2677ef146b
• Fix language fallback'ing
  KingRainbow44 · 2022-05-07 23:44:35 -04:00
  549471b76e
• Added polish locale (#655)
  Zakhil · 2022-05-07 18:19:24 -07:00
  50307ea3a9
• Monsters tide turn by turn && Ban User Skill && Lua functions
  Akka · 2022-05-07 18:18:27 -07:00
  eb94adb296
• Make stamina consumption classes public so others can use.
  gentlespoon · 2022-05-07 18:18:20 -07:00
  29f9d6506a
• Stop stamina consumption on game pause
  gentlespoon · 2022-05-07 18:18:20 -07:00
  836e0150b5
• More reliable stamina calculation

  by separately handling immediate one-time cost and cost over time.

  gentlespoon · 2022-05-07 18:18:20 -07:00
  8e99cb4f35
• Update zh-TW.json
  Kimi · 2022-05-07 15:49:22 -07:00
  43c27c4679
• another translation patches because i fucked it up

  i hate myself

  Kimi · 2022-05-07 15:49:22 -07:00
  88bc5c4c54
• UPGRADE TO 1.1.0 POG

  Merge `development` into `stable`

  Magix · 2022-05-07 18:18:18 -04:00
  01b190bced