Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-18 04:48:24 +00:00
Code Issues Projects Releases Wiki Activity
462 Commits 7 Branches 22 Tags 136 MiB
658c050873
Commit Graph

462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melledy
658c050873 Merge branch 'dev-entity' of https://github.com/Grasscutters/Grasscutter into dev-entity 2022-04-25 14:39:07 -07:00
Melledy
459d3c2699 Add getter for DispatchServer's HttpServer 2022-04-25 14:34:37 -07:00
Melledy
f0ae673091 Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2b75cda6df Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
080fdeeef6 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
a9b7a5a5f6 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
b0322fa3e5 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
3b414cda38 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Melledy
cdfa78a62c Fix concurrency related error while spawning monsters 2022-04-25 14:27:54 -07:00
Melledy
b6300cafec Call checkSpawns from World instead of from Player 2022-04-25 14:12:35 -07:00
Magix
adb1831155
Merge pull request #232 from RealHeart/java-17 
Update Java to 17
 2022-04-25 17:09:46 -04:00
Magix
0022818508
Merge pull request #135 from Grasscutters/plugin-system 
Implement a plugin system
 2022-04-25 17:08:38 -04:00
Magix
b857601b78
Merge branch 'development' into plugin-system 2022-04-25 17:08:18 -04:00
Melledy
803ad40821 Synchronize scene entity map 2022-04-25 13:59:42 -07:00
xtaodada
dbb7350f6f Support kill from console 2022-04-25 11:01:18 -07:00
xtaodada
76e2fa59d8 Add a new alias to the command killcharacter 2022-04-25 11:01:18 -07:00
xtaodada
f3240fc53f Add killcharacter command 2022-04-25 11:01:18 -07:00
alt3ri
37b875717f 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
dbca694a78 Delete ClearArtifactsCommand.java 2022-04-25 11:00:10 -07:00
alt3ri
0ecde3d82f Delete ClearWeaponsCommand.java 2022-04-25 11:00:10 -07:00
Melledy
7efac01890 Make monsters scale off world level 2022-04-25 04:04:01 -07:00
Melledy
0b49f487c4 Dont deregister scenes if the player is going to tp back into them 2022-04-25 02:16:01 -07:00
真心
8007b2ee9f
Update Java to 17 2022-04-25 16:57:46 +08:00
真心
c592891c74
Update Java to 17 2022-04-25 16:55:21 +08:00
Melledy
b8abf9dcfc Natural spawn test 
(without luas)
 2022-04-25 01:50:58 -07:00
Melledy
70ca853e5e Merge branch 'stable' into development 2022-04-25 00:58:53 -07:00
Magix
285426e89a Update issue templates 2022-04-25 00:56:31 -07:00
zhufengning
bb6c38d200 fix spelling in README_zh-CN.md 2022-04-25 00:55:07 -07:00
Asnxthaony
bc3fa67408 fix indent by using smart tabs 2022-04-25 00:54:11 -07:00
Asnxthaony
25111ed907 sanity check 2022-04-25 00:54:11 -07:00
Asnxthaony
6350d83ad0 fix SetPlayerBirthdayRsp 2022-04-25 00:54:11 -07:00
Wansn
4cf8fc90bb Update README_zh-CN.md 2022-04-24 21:58:35 -07:00
Wansn
c09dbeebab Create README_zh-CN.md 2022-04-24 21:58:35 -07:00
Wansn
e199a610fd Fix outdated jdk versions in some places 2022-04-24 21:58:35 -07:00
Wansn
03c3b349e6 Fix outdated jdk versions in some places 2022-04-24 21:58:35 -07:00
Wansn
9eb509ee54 Update README.md 2022-04-24 20:18:46 -07:00
Wansn
f8d88d785e Update README.md 2022-04-24 20:18:46 -07:00
Wansn
f4058ae0f0 Update README.md 2022-04-24 20:18:46 -07:00
Wansn
bc5710594c Update README.md 2022-04-24 20:18:46 -07:00
Yan
0cdc6115d4 fix setting electro dmg stat 2022-04-24 17:57:42 -07:00
alangy98
dce63b0760 Revert "bugfix: portbind error when falling back to http server" 
This reverts commit c14eb2204b.
the bugfix is inappropriate
 2022-04-24 17:57:18 -07:00
alt3ri
5d637ed559 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
f46650c983 add setfriendship aliases 2022-04-24 10:32:47 -07:00
Magix
0395ebfa15
Merge pull request #186 from FahimFBA/fba-code-of-conduct 
Code of Conduct Added
 2022-04-24 13:20:23 -04:00
Melledy
c8e9bb3669
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
c14eb2204b bugfix: portbind error when falling back to http server 2022-04-24 23:05:08 +08:00
Melledy
d9200b4e31
Merge pull request #182 from RimuruChan/development 
Fix a spelling mistake
 2022-04-24 07:22:27 -07:00
Melledy
39babd8f3b
Merge pull request #181 from lunaticwhat/development 
corrected some information for dev branch
 2022-04-24 07:22:09 -07:00
Melledy
d04a4856df
Merge pull request #180 from Yazawazi/development 
Fix the property prompt issue in fetter system
 2022-04-24 07:21:34 -07:00
Melledy
146b1ebb6f
Merge pull request #167 from memetrollsXD/development 
Try to fix "No SSL cert found bind exception"
 2022-04-24 07:16:05 -07:00