Commit Graph

1158 Commits

Author SHA1 Message Date
Yazawazi
6b8b6b4899
fetter try 2022-04-22 07:37:25 +08:00
Magix
f248aa5e7e
Merge pull request #63 from JuliusPtolemy/main
Update development readme
2022-04-21 18:51:08 -04:00
Magix
1817b7289d
Merge branch 'development' into main 2022-04-21 18:50:57 -04:00
Melledy
a05f8270ab
Merge pull request #74 from 4Benj/development
Server run modes and multi-server dispatch support
2022-04-21 15:06:57 -07:00
Melledy
9cf49c3a76
Merge pull request #92 from Grasscutters/account-fix
Fixes for the error in the revive command
2022-04-21 14:48:18 -07:00
Melledy
eb44fc88c4 Refactor Revive Command + fix syntax error
No idea how I missed the syntax error while reviewing
2022-04-21 14:47:04 -07:00
Melledy
18707f9309 Merge branch 'development' into account-fix 2022-04-21 14:46:07 -07:00
Melledy
d19d80fa4e Save config everytime you load so the new options show up 2022-04-21 14:44:55 -07:00
Melledy
860e28e56a
Merge pull request #88 from alt3ri/development
Added /revive command
2022-04-21 14:05:09 -07:00
Melledy
dd72af60b7
Merge pull request #90 from Grasscutters/account-fix
Fix account dupe key error after selecting starting character
2022-04-21 14:04:10 -07:00
Melledy
dca137a93e Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
alt3ri
96a252f9dd
Added /revive command
Now it's more convenient to revive character without food :>
2022-04-22 02:28:52 +07:00
Melledy
a93398a18b
Merge pull request #86 from alt3ri/patch-7
Fix typo
2022-04-21 11:47:30 -07:00
Melledy
29fe983f67
Merge pull request #84 from yarik0chka/development
Add a changing weather id
2022-04-21 11:47:13 -07:00
Melledy
dbb9ce0997
Merge pull request #87 from Yazawazi/development
Teleport Small Fix
2022-04-21 11:46:51 -07:00
Yazawazi
a01783ef3c
Teleport Small Fix 2022-04-22 02:23:02 +08:00
alt3ri
2cc8d48fde
Fix typo
"When you create a new account via auto register or console server then during scene select a character and write a name on it press it it will get stuck and make the server disconnected. Some can get through and some can't passed it, so currently I'm still on the stable version . even how many times have I deleted the datebase and tried it on some linux and directly on windows too :/ btw 6863600865/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131) in scene folder there is a typo name "BinOutPut" it should be "BinOutput" so scene file can't be found." - [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760)
Thanks [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760)
2022-04-22 00:54:06 +07:00
yarik0chka
38c0c9eb7c Add a changing weather id 2022-04-21 22:21:24 +05:00
Benjamin Elsdon
ff6958ed1f Forgot a dispatch prefix on error while merging 2022-04-22 01:15:05 +08:00
Benjamin Elsdon
96da53b5fb Merge remote-tracking branch 'upstream/development' into development 2022-04-22 01:04:03 +08:00
Melledy
6863600865
Merge pull request #78 from MlgmXyysd/dispatch-refactor
Refact dispatch server
2022-04-21 09:03:53 -07:00
Jaida Wu
68deff0c95
Listens to all addresses by default
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:03 +08:00
Jaida Wu
aacd261206
Add dispatch server log prefix
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:02 +08:00
Jaida Wu
b0d2d29b1c
Add some log to dispatch server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:00 +08:00
Jaida Wu
2df8625b24
Fallback to HTTP if no SSL cert
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:59 +08:00
Jaida Wu
a1567895fa
Refact code
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:54 +08:00
Melledy
686aed2cd4
Merge pull request #77 from xmplay/patch-1
bring back the jade chamber and other old scene tags
2022-04-21 09:01:43 -07:00
Melledy
781448518d
Merge pull request #79 from zamlty/development
Fix artifact & weapon generation by give command
2022-04-21 09:00:30 -07:00
Melledy
ee234b125d
Merge pull request #81 from MlgmXyysd/list-command
Add list command
2022-04-21 08:59:07 -07:00
Melledy
6c2bf88a73
Merge pull request #82 from alt3ri/patch-6
Update README.md
2022-04-21 08:58:27 -07:00
alt3ri
ae086ed18c
Update README.md
Removed !sethp, added !setstats, !pos, !weather
2022-04-21 22:45:02 +07:00
Benjamin Elsdon
66b5ed8a83 Should probably remove this as well... 2022-04-21 23:04:02 +08:00
Benjamin Elsdon
72355dd3c5 Removed class left over from testing 2022-04-21 23:00:36 +08:00
Jaida Wu
dee3105763
Add list command
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 22:55:32 +08:00
Benjamin Elsdon
63e008cbcf DatabaseManager clean up 2022-04-21 22:50:06 +08:00
Benjamin Elsdon
a36f29cdf1 Fixed null pointer exception in game only mode
PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.
2022-04-21 22:38:01 +08:00
zamlty
1d54084317 Fix artifact & weapon generation by give command 2022-04-21 22:21:39 +08:00
xmplay
66c956d10e
bring back the jade chamber and other old scene tags 2022-04-21 15:04:47 +01:00
Jaida Wu
65e0799e79
Drop independent log server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 21:41:30 +08:00
Jaida Wu
ced378cee8
Add port & SSL options to proxy script
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 21:41:07 +08:00
Benjamin Elsdon
585187bebe Fixed null pointer exception in hybrid mode. 2022-04-21 19:20:49 +08:00
Benjamin Elsdon
e97e124460 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Benjamin Elsdon
6a091b254c Multi-server dispatch support and server run modes 2022-04-21 18:04:00 +08:00
Melledy
56415b7fbc
Merge pull request #70 from Grasscutters/dev-fixes
Dev fixes
2022-04-21 00:31:01 -07:00
Melledy
3a0997bb5a Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players 2022-04-21 00:29:06 -07:00
Melledy
c0e859b17c Add config entry for OverseaLogPort (default: 8888) 2022-04-21 00:28:28 -07:00
Melledy
e10d554db8
Merge pull request #69 from Grasscutters/dev-fixes
Dev fixes
2022-04-21 00:09:12 -07:00
Melledy
dce047a1ca
Merge pull request #67 from labalityowo/development
Fix Ayaka and weapon banner titles not showing up
2022-04-21 00:03:38 -07:00
labalityowo
39cad79279
Fix Ayaka and weapon banner titles not showing up 2022-04-21 14:01:51 +07:00
KingRainbow44
cc231b812d
why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04:00