Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 09:11:45 +00:00
Code Issues Projects Releases Wiki Activity
1,998 Commits 7 Branches 22 Tags 133 MiB
b09c0d48bf
Commit Graph

1998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yazawazi
7e6bcca2c3 Merge branch 'development' into main 2022-04-20 19:09:48 +08:00
Melledy
d388950193 Merge pull request #47 from alt3ri/patch-3 
Adding /pos
 2022-04-20 03:43:59 -07:00
Melledy
5a09c22aa1 Fix character abilities not showing for others in co-op/lasting too long 2022-04-20 03:42:59 -07:00
alt3ri
aeb335c843 Adding /pos 
Some people want to get the coordinate, here you go!
 2022-04-20 17:40:26 +07:00
Melledy
fda205015b Fix account not found issue when logging in 2022-04-20 03:28:54 -07:00
Jaida Wu
087cd680bd Optimize proxy scripts 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 18:13:26 +08:00
Benjamin Elsdon
e8601de5d5 Added OnGameServerStartFinish EventBus 
Removed those temporary warning messages as I figured out how to disable them
 2022-04-20 17:44:44 +08:00
Benjamin Elsdon
b7f5cc9748 Added OnGameServerStop EventBus 
There is a temporary warning message telling users to ignore the 'No subscribers registered' error. This can be removed once things actually subscribe to it
 2022-04-20 17:31:41 +08:00
Benjamin Elsdon
22781ac6e7 Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 17:18:51 +08:00
Benjamin Elsdon
1c2560736f /reload now reloads the gacha as well 2022-04-20 17:17:59 +08:00
Melledy
88e608adba Merge pull request #40 from Grasscutters/auto-account 
Create the account if it doesn't exist on the login screen
 2022-04-20 02:17:21 -07:00
Melledy
a3beffac06 Merge pull request #31 from alt3ri/patch-1 
Added bonus for ingame function
 2022-04-20 02:16:56 -07:00
Melledy
df264bacd9 Update README.md 2022-04-20 02:16:39 -07:00
Yazawazi
500580f368 Add /weather Command 2022-04-20 17:16:21 +08:00
Melledy
f52a1ae183 Merge pull request #37 from memetrollsXD/restart-command 
Restart command
 2022-04-20 02:14:32 -07:00
Benjamin Elsdon
26e1341ce9 Out of my madness and suffering I have achieved the impossible. I almost lost all hope and was about to end it all. However, it worked out in the end and now we have gacha reloading. 2022-04-20 17:14:07 +08:00
Benjamin Elsdon
28a070f19a Forgot config check 2022-04-20 16:07:18 +08:00
Benjamin Elsdon
d59799ce55 Update gradle + Work gacha reload (gs broken atm) 2022-04-20 16:05:53 +08:00
memetrollsXD
77076a766b Merge branch 'development' into restart-command 2022-04-20 09:03:18 +02:00
memetrollsXD
2632ae373c Fix merge conflict 2022-04-20 09:00:50 +02:00
memetrollsXD
ad1e9400e3 It won't get better than this for now.. 2022-04-20 08:52:47 +02:00
w4123
716b6df2ec Implement stub NpcTalk packets 2022-04-20 12:25:38 +08:00
KingRainbow44
7137f5b715 totally not me forgetting how this works 2022-04-20 00:15:37 -04:00
KingRainbow44
107f6b9a44 Change to String#equals 2022-04-20 00:10:43 -04:00
KingRainbow44
f58c590aa3 Add config option 2022-04-20 00:10:32 -04:00
KingRainbow44
dd826abb55 Automatically create account on login screen 2022-04-20 00:03:01 -04:00
junu128
6c938e6ca5 Update resources-fun.md 2022-04-20 11:50:56 +08:00
junu128
e28509c350 Update resources-fun.md 2022-04-20 11:12:56 +08:00
junu128
a35f93a7f4 Update resources-fun.md 2022-04-20 11:12:16 +08:00
junu128
167b25213e Add files via upload 2022-04-20 10:50:05 +08:00
KingRainbow44
866941589b Small updates to server commands 2022-04-19 14:11:48 -04:00
Magix
ea0f8fd524 Overhaul commands (not the system) 
Added admin commands, refactored help command, and created command descriptions + more
 2022-04-19 14:08:11 -04:00
Magix
71cdd2c8e9 Merge branch 'main' into main 2022-04-19 14:07:39 -04:00
memetrollsXD
d603681355 Try PlayerTokenRsp instead of LoginRsp 2022-04-19 19:45:39 +02:00
memetrollsXD
657ac2e529 WIP Restart command - For now disconnects session, preferrably just send PlayerLoginRsp so it does the login sequence all over again 2022-04-19 19:39:54 +02:00
Melledy
14da6c474b Protos 2022-04-19 10:26:31 -07:00
Melledy
b7a7c8e41a Remove protos 2022-04-19 10:23:08 -07:00
Melledy
d2d4c2524c Merge pull request #35 from MlgmXyysd/main 
Make overseauspider.yuanshen.com reachable
 2022-04-19 09:45:07 -07:00
Jaida Wu
c2a2f569ef Make overseauspider.yuanshen.com reachable 
* Since DispatchServer has handled the server correctly, so it should not be invalidated: https://github.com/Melledy/Grasscutter/blob/main/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java#L402
 2022-04-20 00:43:01 +08:00
Jaida Wu
f739ddb29e Delete run.bat 2022-04-20 00:40:44 +08:00
Melledy
4295ec8f39 Merge pull request #34 from lilmayofuksu/main 
Fix folder seperators
 2022-04-19 09:21:55 -07:00
ayy lmao
ac6ae1178d Fix folder seperators 2022-04-19 19:21:14 +03:00
Melledy
c72891ff97 Merge pull request #26 from Yazawazi/main 
unlockAvatarConstellation fix
 2022-04-19 09:18:42 -07:00
Melledy
5bc1448d82 Merge pull request #27 from OtakuNekoP/main 
skip beta server device id verify
 2022-04-19 09:09:17 -07:00
Melledy
76ed85ee68 Merge pull request #25 from xmplay/main 
add water to golden apple archipelago by default
 2022-04-19 09:08:58 -07:00
alt3ri
3e627701fb Added bonus for ingame function 
A tip to teleport since TP waypoint didn't work.
 2022-04-19 21:39:17 +07:00
KingRainbow44
c728b9f5fe Attempt to fix !givechar 2022-04-19 10:31:24 -04:00
KingRainbow44
69cb03f4d4 Command reformat 2022-04-19 10:00:50 -04:00
OtakuNekoP
e1257739b7 skip beta server device id verify 2022-04-19 14:48:03 +02:00
Benjamin Elsdon
f54cfc6c75 Fixed an issue with kicking players 
(Still broken but now it actually disconnects the player)
 2022-04-19 20:36:15 +08:00