Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 10:21:42 +00:00
Code Issues Projects Releases Wiki Activity
801 Commits 7 Branches 22 Tags 133 MiB
37c2ee5e2c
Commit Graph

801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Elsdon
a2069c0084 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 11:59:16 +08:00
Benjamin Elsdon
a5677a8e34 Improvements and send all mail fix 
Mail ID no longer exists and is handled by it's position in the mail array
 2022-04-26 11:57:55 +08:00
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
lunaticwhat
c18efa7252 issue and pr template updated. 2022-04-25 21:25:35 +07:00
Benjamin Elsdon
c68c75e8ce Send Mail Command! 
Almost done! Wooooo!
 2022-04-25 21:53:10 +08: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
lunaticwhat
e3383e221b issue and pr template updated. 2022-04-25 15:57:16 +07: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
Benjamin Elsdon
e30352a667 Forgot to implement levels into GetMailItemRsp 
Also added promoteLevels
 2022-04-25 16:42:56 +08:00
Benjamin Elsdon
3f11cc41b2 More weird git stuff 2022-04-25 16:32:26 +08:00
Benjamin Elsdon
b29bcb553a Weird git stuff 2022-04-25 16:25:33 +08:00
Benjamin Elsdon
c4de030496 Added ChangeMailStarNotify (change importance level) 2022-04-25 16:23:23 +08:00
Benjamin Elsdon
8d427f2317 Mail read notify 2022-04-25 16:23:23 +08:00
Benjamin Elsdon
67b4c274ec Deleting mail + a bit of cleanup 2022-04-25 16:23:22 +08:00
Benjamin Elsdon
9bf94f9539 Receiving items in mail 2022-04-25 16:22:13 +08:00
Benjamin Elsdon
a548fe6c52 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
29a3e64db0 Java-16 compatiable mail system (whoops) 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
69779a0321 Added database support for mail 
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
e24de95d29 Added GetMailItemReq/Rsp & PacketMailChangeNotify 
Mail still doesn't work for whatever reason. I also added a temporary SendMailCommand just to receive PacketMailChangeNotify.
I feel like I'm about to lose my mind.
 2022-04-25 16:18:23 +08:00
Benjamin Elsdon
346652cf5b Initial work on mail 2022-04-25 16:18:23 +08:00
Benjamin Elsdon
caa1829b46 Update protos 2022-04-25 16:18:23 +08:00
Benjamin Elsdon
3787cfad59 Added ChangeMailStarNotify (change importance level) 2022-04-25 16:11:57 +08: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