462 Commits

This Branch

This Branch

All Branches

• Merge branch 'dev-entity' of https://github.com/Grasscutters/Grasscutter into dev-entity
  Melledy · 2022-04-25 14:39:07 -07:00
  658c050873
• Add getter for DispatchServer's HttpServer
  Melledy · 2022-04-25 14:34:37 -07:00
  459d3c2699
• Fix concurrency related error while spawning monsters
  Melledy · 2022-04-25 14:28:45 -07:00
  f0ae673091
• Call checkSpawns from World instead of from Player
  Melledy · 2022-04-25 14:28:45 -07:00
  2b75cda6df
• Synchronize scene entity map
  Melledy · 2022-04-25 14:28:45 -07:00
  080fdeeef6
• Make monsters scale off world level
  Melledy · 2022-04-25 14:28:45 -07:00
  a9b7a5a5f6
• Dont deregister scenes if the player is going to tp back into them
  Melledy · 2022-04-25 14:28:44 -07:00
  b0322fa3e5
• Natural spawn test

  (without luas)

  Melledy · 2022-04-25 14:28:44 -07:00
  3b414cda38
• Fix concurrency related error while spawning monsters
  Melledy · 2022-04-25 14:27:54 -07:00
  cdfa78a62c
• Call checkSpawns from World instead of from Player
  Melledy · 2022-04-25 14:12:35 -07:00
  b6300cafec
• Merge pull request #232 from RealHeart/java-17

  Update Java to 17

  Magix · 2022-04-25 17:09:46 -04:00
  adb1831155
• Merge pull request #135 from Grasscutters/plugin-system

  Implement a plugin system

  Magix · 2022-04-25 17:08:38 -04:00
  0022818508
• Merge branch 'development' into plugin-system
  Magix · 2022-04-25 17:08:18 -04:00
  b857601b78
• Synchronize scene entity map
  Melledy · 2022-04-25 13:59:42 -07:00
  803ad40821
• Support kill from console
  xtaodada · 2022-04-25 11:01:18 -07:00
  dbb7350f6f
• Add a new alias to the command killcharacter
  xtaodada · 2022-04-25 11:01:18 -07:00
  76e2fa59d8
• Add killcharacter command
  xtaodada · 2022-04-25 11:01:18 -07:00
  f3240fc53f
• Merged /clearartifacts and /clearweapons

  I merged ClearArtifactsCommand and ClearWeaponsCommand to ClearCommand with UID parameter. Still no send from console cuz I forgor 💀
  Usage: /clear <wp | art | mat | all> [uid]

  alt3ri · 2022-04-25 11:00:10 -07:00
  37b875717f
• Delete ClearArtifactsCommand.java
  alt3ri · 2022-04-25 11:00:10 -07:00
  dbca694a78
• Delete ClearWeaponsCommand.java
  alt3ri · 2022-04-25 11:00:10 -07:00
  0ecde3d82f
• Make monsters scale off world level
  Melledy · 2022-04-25 04:04:01 -07:00
  7efac01890
• Dont deregister scenes if the player is going to tp back into them
  Melledy · 2022-04-25 02:16:01 -07:00
  0b49f487c4
• Update Java to 17
  真心 · 2022-04-25 16:57:46 +08:00
  8007b2ee9f
• Update Java to 17
  真心 · 2022-04-25 16:55:21 +08:00
  c592891c74
• Natural spawn test

  (without luas)

  Melledy · 2022-04-25 01:50:58 -07:00
  b8abf9dcfc
• Merge branch 'stable' into development
  Melledy · 2022-04-25 00:58:53 -07:00
  70ca853e5e
• Update issue templates
  Magix · 2022-04-25 00:56:31 -07:00
  285426e89a
• fix spelling in README_zh-CN.md
  zhufengning · 2022-04-25 00:55:07 -07:00
  bb6c38d200
• fix indent by using smart tabs
  Asnxthaony · 2022-04-25 00:54:11 -07:00
  bc3fa67408
• sanity check
  Asnxthaony · 2022-04-25 00:54:11 -07:00
  25111ed907
• fix SetPlayerBirthdayRsp
  Asnxthaony · 2022-04-25 00:54:11 -07:00
  6350d83ad0
• Update README_zh-CN.md
  Wansn · 2022-04-24 21:58:35 -07:00
  4cf8fc90bb
• Create README_zh-CN.md
  Wansn · 2022-04-24 21:58:35 -07:00
  c09dbeebab
• Fix outdated jdk versions in some places
  Wansn · 2022-04-24 21:58:35 -07:00
  e199a610fd
• Fix outdated jdk versions in some places
  Wansn · 2022-04-24 21:58:35 -07:00
  03c3b349e6
• Update README.md
  Wansn · 2022-04-24 20:18:46 -07:00
  9eb509ee54
• Update README.md
  Wansn · 2022-04-24 20:18:46 -07:00
  f8d88d785e
• Update README.md
  Wansn · 2022-04-24 20:18:46 -07:00
  f4058ae0f0
• Update README.md
  Wansn · 2022-04-24 20:18:46 -07:00
  bc5710594c
• fix setting electro dmg stat
  Yan · 2022-04-24 17:57:42 -07:00
  0cdc6115d4
• Revert "bugfix: portbind error when falling back to http server"

  This reverts commit c14eb2204b.
  the bugfix is inappropriate

  alangy98 · 2022-04-24 17:57:18 -07:00
  dce63b0760
• Added UID parameter

  Now you can delete other player's weapons with UID
  Usage: /clearwp [uid]

  alt3ri · 2022-04-24 17:56:49 -07:00
  5d637ed559
• add setfriendship aliases
  Yazawazi · 2022-04-24 10:32:47 -07:00
  f46650c983
• Merge pull request #186 from FahimFBA/fba-code-of-conduct

  Code of Conduct Added

  Magix · 2022-04-24 13:20:23 -04:00
  0395ebfa15
• Merge pull request #194 from alangy98/development

  bugfix: port bind error when falling back to http server

  Melledy · 2022-04-24 09:03:25 -07:00
  c8e9bb3669
• bugfix: portbind error when falling back to http server
  Alangy · 2022-04-24 23:05:08 +08:00
  c14eb2204b
• Merge pull request #182 from RimuruChan/development

  Fix a spelling mistake

  Melledy · 2022-04-24 07:22:27 -07:00
  d9200b4e31
• Merge pull request #181 from lunaticwhat/development

  corrected some information for dev branch

  Melledy · 2022-04-24 07:22:09 -07:00
  39babd8f3b
• Merge pull request #180 from Yazawazi/development

  Fix the property prompt issue in fetter system

  Melledy · 2022-04-24 07:21:34 -07:00
  d04a4856df
• Merge pull request #167 from memetrollsXD/development

  Try to fix "No SSL cert found bind exception"

  Melledy · 2022-04-24 07:16:05 -07:00
  146b1ebb6f