Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 23:32:43 +00:00
Code Issues Projects Releases Wiki Activity
787 Commits 7 Branches 22 Tags 133 MiB
06983e9e84
Commit Graph

787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melledy
1130138a4f Fix internal server error when changing characters 2022-04-27 11:23:33 -07:00
KingRainbow44
d32f706cf3 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java
 2022-04-27 14:05:34 -04:00
iTruth
f0d728b4e3 Fix start.cmd can't find grasscutter when modify SERVER_JAR_NAME in start_config.cmd 2022-04-27 19:06:30 +02:00
Yazawazi
2ba16cf8b2 comment & mooncard 2022-04-27 08:42:48 -07:00
Yazawazi
32d322b0be onEnable & onDisable 2022-04-27 08:42:48 -07:00
Yazawazi
5b6ecc7219 Task Improvement 2022-04-27 08:42:48 -07:00
Melledy
ef2e159bb8 Merge pull request #297 from Kengxxiao/dev-feature-drop 
Implement simple monster drop
 2022-04-27 08:40:30 -07:00
xmplay
e1b6cbc87e fix readme again (bruh moment) 2022-04-27 08:38:53 -07:00
Kengxxiao
669e58d9f3 Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
ee3a0c32fc use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
3e0ccbbbde implement npc shop 2022-04-27 07:35:31 -07:00
ayy lmao
0e3a80407e Added missing isGiftMail section to GetAllMailRsp 2022-04-27 15:11:57 +02:00
memetrollsXD
3c543e5c67 Update Drop.json 
data/ will appear in everyones files, so better change it to something more sane
 2022-04-27 14:44:36 +02:00
BaiSugar
fa9d703d44 Merge branch 'Grasscutters:development' into development 2022-04-27 20:31:40 +08:00
memetrollsXD
8d1c571c0c Update README.md 2022-04-27 13:20:57 +02:00
Yazawazi
897f529e62 comment & mooncard 2022-04-27 17:52:04 +08:00
Kengxxiao
57e408012b reset drop table in reload command 2022-04-27 17:44:12 +08:00
Kengxxiao
8b614d8df8 implement simple drop system 2022-04-27 17:42:02 +08:00
memetrollsXD
d9441a2188 Update README.md 2022-04-27 11:37:50 +02:00
Yazawazi
2374c53ec3 onEnable & onDisable 2022-04-27 17:30:16 +08:00
Kengxxiao
9fc8cc1c17 Merge pull request #1 from Grasscutters/development 
merge
 2022-04-27 14:59:54 +08:00
Yazawazi
7789df6d4d Task Improvement 2022-04-27 13:10:50 +08:00
Melledy
d1fc8c1faa Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
1c36f0785b Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Melledy
6b8902bee2 Deprecate getServer() in DispatchServer, use getHttpServer() instead 2022-04-26 21:27:35 -07:00
Melledy
9afa32928a Cleanup https server creation in dispatch server 2022-04-26 21:27:35 -07:00
Melledy
cdb08195ee Fix cherry pick issues from drown packets 2022-04-26 21:27:35 -07:00
TheLostTree
a0ed13182c git doesnt like me 2022-04-26 21:27:35 -07:00
TheLostTree
687bc7ce87 drowning added 2022-04-26 21:27:35 -07:00
Melledy
d81895543f Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
4420918f9c Rename handler 2022-04-26 21:27:35 -07:00
Melledy
7cf0e448cd World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
9b7293272b Fix white screen after logging in 2022-04-26 21:27:35 -07:00
Melledy
0387992c42 Fix eclipse gradle support 2022-04-26 21:27:35 -07:00
BaiSugar
6a5d97a3fa Update the command format of the usage (including source code) 2022-04-27 10:14:24 +08:00
BaiSugar
3b4454bc14 Update README.md 2022-04-27 10:02:41 +08:00
Magix
ae00ab2dca Merge pull request #277 from Thomitics/patch-2 
Fix build uploading
 2022-04-26 21:46:32 -04:00
芊枫
9bdb96d154 Fix build uploading 2022-04-27 09:43:19 +08:00
Melledy
d44793359d Merge pull request #115 from 4Benj/dev-mail 
Implement the Mail System
 2022-04-26 18:42:30 -07:00
KingRainbow44
47d8fd3c43 Add get methods to the server hook 2022-04-26 21:24:37 -04:00
KingRainbow44
d4f9820e44 Added getting resources from the JAR 2022-04-26 21:24:09 -04:00
Benjamin Elsdon
cebc140228 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
KingRainbow44
f3061a366e gave up, Pass class as argument to constructor 2022-04-26 20:54:56 -04:00
KingRainbow44
ae6a6abcd1 woo back to generics 2022-04-26 20:47:45 -04:00
KingRainbow44
749293350d Add dispatch to server hook & create instance 2022-04-26 20:47:28 -04:00
Benjamin Elsdon
0917f516ea Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
ed3f88f013 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
KingRainbow44
88bdaf155f Use a custom consumer instead of the built-in one 2022-04-26 20:28:13 -04:00
KingRainbow44
993255235e Fix handler invocation 2022-04-26 19:58:03 -04:00
KingRainbow44
0e514b9002 Fix handler creation 2022-04-26 19:57:32 -04:00