Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 02:34:07 +00:00
Code Issues Projects Releases Wiki Activity
462 Commits 7 Branches 22 Tags 133 MiB
297db2ad33
Commit Graph

462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melledy
297db2ad33 Merge branch 'dev-entity' of https://github.com/Grasscutters/Grasscutter into dev-entity 2022-04-25 14:39:07 -07:00
Melledy
b2f1142116 Add getter for DispatchServer's HttpServer 2022-04-25 14:34:37 -07:00
Melledy
614477181f Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2228332f9d Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
c3f9fd3ce3 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
1c691748f5 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
f28f21b061 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
711e6eabd0 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Melledy
0ea3edb73b Fix concurrency related error while spawning monsters 2022-04-25 14:27:54 -07:00
Melledy
5f4afc8ee9 Call checkSpawns from World instead of from Player 2022-04-25 14:12:35 -07:00
Magix
c4bdcc387c Merge pull request #232 from RealHeart/java-17 
Update Java to 17
 2022-04-25 17:09:46 -04:00
Magix
a505b041f2 Merge pull request #135 from Grasscutters/plugin-system 
Implement a plugin system
 2022-04-25 17:08:38 -04:00
Magix
dce13cf6af Merge branch 'development' into plugin-system 2022-04-25 17:08:18 -04:00
Melledy
d6544d123a Synchronize scene entity map 2022-04-25 13:59:42 -07:00
xtaodada
b6fedcf262 Support kill from console 2022-04-25 11:01:18 -07:00
xtaodada
dc6702eb5c Add a new alias to the command killcharacter 2022-04-25 11:01:18 -07:00
xtaodada
00a40a84bb Add killcharacter command 2022-04-25 11:01:18 -07:00
alt3ri
5dd5f70903 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]
 2022-04-25 11:00:10 -07:00
alt3ri
56eb711055 Delete ClearArtifactsCommand.java 2022-04-25 11:00:10 -07:00
alt3ri
c1ef679e30 Delete ClearWeaponsCommand.java 2022-04-25 11:00:10 -07:00
Melledy
eb997006ca Make monsters scale off world level 2022-04-25 04:04:01 -07:00
Melledy
02d2d72890 Dont deregister scenes if the player is going to tp back into them 2022-04-25 02:16:01 -07:00
真心
4c75f9d9cf Update Java to 17 2022-04-25 16:57:46 +08:00
真心
f78e018029 Update Java to 17 2022-04-25 16:55:21 +08:00
Melledy
b8614d63fe Natural spawn test 
(without luas)
 2022-04-25 01:50:58 -07:00
Melledy
d9e1ed5083 Merge branch 'stable' into development 2022-04-25 00:58:53 -07:00
Magix
cfeec14d01 Update issue templates 2022-04-25 00:56:31 -07:00
zhufengning
16e8439058 fix spelling in README_zh-CN.md 2022-04-25 00:55:07 -07:00
Asnxthaony
480374fb39 fix indent by using smart tabs 2022-04-25 00:54:11 -07:00
Asnxthaony
4e5d72a99a sanity check 2022-04-25 00:54:11 -07:00
Asnxthaony
122568ad27 fix SetPlayerBirthdayRsp 2022-04-25 00:54:11 -07:00
Wansn
b6801cf427 Update README_zh-CN.md 2022-04-24 21:58:35 -07:00
Wansn
0a497b3626 Create README_zh-CN.md 2022-04-24 21:58:35 -07:00
Wansn
f7d9be5c05 Fix outdated jdk versions in some places 2022-04-24 21:58:35 -07:00
Wansn
bbda2e96db Fix outdated jdk versions in some places 2022-04-24 21:58:35 -07:00
Wansn
67990b4684 Update README.md 2022-04-24 20:18:46 -07:00
Wansn
570f869786 Update README.md 2022-04-24 20:18:46 -07:00
Wansn
848efc2298 Update README.md 2022-04-24 20:18:46 -07:00
Wansn
6666fef81a Update README.md 2022-04-24 20:18:46 -07:00
Yan
2238a7c3aa fix setting electro dmg stat 2022-04-24 17:57:42 -07:00
alangy98
21b3ac103a Revert "bugfix: portbind error when falling back to http server" 
This reverts commit 4817ed9c52.
the bugfix is inappropriate
 2022-04-24 17:57:18 -07:00
alt3ri
4837ccb983 Added UID parameter 
Now you can delete other player's weapons with UID
Usage: /clearwp [uid]
 2022-04-24 17:56:49 -07:00
Yazawazi
5010b8ac75 add setfriendship aliases 2022-04-24 10:32:47 -07:00
Magix
40953dd845 Merge pull request #186 from FahimFBA/fba-code-of-conduct 
Code of Conduct Added
 2022-04-24 13:20:23 -04:00
Melledy
bfefb2a022 Merge pull request #194 from alangy98/development 
bugfix: port bind error when falling back to http server
 2022-04-24 09:03:25 -07:00
Alangy
4817ed9c52 bugfix: portbind error when falling back to http server 2022-04-24 23:05:08 +08:00
Melledy
a8ed99c94f Merge pull request #182 from RimuruChan/development 
Fix a spelling mistake
 2022-04-24 07:22:27 -07:00
Melledy
dfbf67c81e Merge pull request #181 from lunaticwhat/development 
corrected some information for dev branch
 2022-04-24 07:22:09 -07:00
Melledy
929bb38f2e Merge pull request #180 from Yazawazi/development 
Fix the property prompt issue in fetter system
 2022-04-24 07:21:34 -07:00
Melledy
edd0bccf5a Merge pull request #167 from memetrollsXD/development 
Try to fix "No SSL cert found bind exception"
 2022-04-24 07:16:05 -07:00