Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 01:21:30 +00:00
Code Issues Projects Releases Wiki Activity
743 Commits 7 Branches 22 Tags 133 MiB
e8aaee6515
Commit Graph

743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yazawazi
d539fb4c44
Merge branch 'Grasscutters:development' into development 2022-04-28 03:11:39 +08:00
Melledy
fef0f2aff7 Fix co-op requests not showing up 2022-04-27 11:23:33 -07:00
Melledy
bec30c24c9 Add message about the server being free 2022-04-27 11:23:33 -07:00
Melledy
fcb50414f0 Fixed concurrency issue in killall 2022-04-27 11:23:33 -07:00
Melledy
e34ab885a3 Fixed genesis crystals not being given to player 2022-04-27 11:23:33 -07:00
Melledy
99fe453658 Gacha banner tweaks 
Removed min/maxItemType
Added configurable base weight values for banners
 2022-04-27 11:23:33 -07:00
Melledy
17d2c6cc74 Fix internal server error when changing characters 2022-04-27 11:23:33 -07:00
KingRainbow44
38b782e5c3
Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java
 2022-04-27 14:05:34 -04:00
iTruth
36c6219ffa 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
411a6c0715 comment & mooncard 2022-04-27 08:42:48 -07:00
Yazawazi
63b70497f0 onEnable & onDisable 2022-04-27 08:42:48 -07:00
Yazawazi
707147ba78 Task Improvement 2022-04-27 08:42:48 -07:00
Melledy
c36abce08a
Merge pull request #297 from Kengxxiao/dev-feature-drop 
Implement simple monster drop
 2022-04-27 08:40:30 -07:00
xmplay
64815e07f8 fix readme again (bruh moment) 2022-04-27 08:38:53 -07:00
Kengxxiao
27ac32a42b
Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
60a36282c4 use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
842acabe5a implement npc shop 2022-04-27 07:35:31 -07:00
ayy lmao
ca7c335c94 Added missing isGiftMail section to GetAllMailRsp 2022-04-27 15:11:57 +02:00
memetrollsXD
653bbbd737
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
cb5c2c460d
Merge branch 'Grasscutters:development' into development 2022-04-27 20:31:40 +08:00
memetrollsXD
efe694fb06
Update README.md 2022-04-27 13:20:57 +02:00
Yazawazi
3ea5a6cc79
comment & mooncard 2022-04-27 17:52:04 +08:00
Kengxxiao
c0b6193220 reset drop table in reload command 2022-04-27 17:44:12 +08:00
Kengxxiao
08062b6da9 implement simple drop system 2022-04-27 17:42:02 +08:00
memetrollsXD
d261931ff7
Update README.md 2022-04-27 11:37:50 +02:00
Yazawazi
01e411b9b8
onEnable & onDisable 2022-04-27 17:30:16 +08:00
Kengxxiao
cbde6ae30f
Merge pull request #1 from Grasscutters/development 
merge
 2022-04-27 14:59:54 +08:00
Yazawazi
bca7aea95b
Task Improvement 2022-04-27 13:10:50 +08:00
Melledy
4480ce14a7 Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
556018d9a9 Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Melledy
07b4dc95ea Deprecate getServer() in DispatchServer, use getHttpServer() instead 2022-04-26 21:27:35 -07:00
Melledy
691324c9e7 Cleanup https server creation in dispatch server 2022-04-26 21:27:35 -07:00
Melledy
931894aacf Fix cherry pick issues from drown packets 2022-04-26 21:27:35 -07:00
TheLostTree
51ab19d418 git doesnt like me 2022-04-26 21:27:35 -07:00
TheLostTree
a179caa44e drowning added 2022-04-26 21:27:35 -07:00
Melledy
8105d2a7a9 Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
6fbe2f13d3 Rename handler 2022-04-26 21:27:35 -07:00
Melledy
2b69978327 World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
be307fe5f0 Fix white screen after logging in 2022-04-26 21:27:35 -07:00
Melledy
e3034326c1 Fix eclipse gradle support 2022-04-26 21:27:35 -07:00
BaiSugar
2de749906f Update the command format of the usage (including source code) 2022-04-27 10:14:24 +08:00
BaiSugar
0de5474e23 Update README.md 2022-04-27 10:02:41 +08:00
Magix
99f41b0bd4
Merge pull request #277 from Thomitics/patch-2 
Fix build uploading
 2022-04-26 21:46:32 -04:00
芊枫
eaca8a6d8a
Fix build uploading 2022-04-27 09:43:19 +08:00
Melledy
301566f4b9
Merge pull request #115 from 4Benj/dev-mail 
Implement the Mail System
 2022-04-26 18:42:30 -07:00
KingRainbow44
5b351b955c
Add get methods to the server hook 2022-04-26 21:24:37 -04:00
KingRainbow44
34c358669b
Added getting resources from the JAR 2022-04-26 21:24:09 -04:00
Benjamin Elsdon
e4899034b2 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
KingRainbow44
54658afe68
gave up, Pass class as argument to constructor 2022-04-26 20:54:56 -04:00
KingRainbow44
cf7fae8d06
woo back to generics 2022-04-26 20:47:45 -04:00