Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 18:56:15 +00:00
Code Issues Projects Releases Wiki Activity
281 Commits 7 Branches 22 Tags 133 MiB
ca6315f29a
Commit Graph

281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xmplay
1df7665e3e Updated Banners.json with the latest banners (19 Apr) 2022-04-19 13:23:57 +01:00
Yazawazi
5fcecfc734 talentData 
sorry again, forgot to add
 2022-04-19 20:05:45 +08:00
xmplay
4b279b45e0 Update PacketPlayerEnterSceneNotify.java 2022-04-19 13:03:43 +01:00
Yazawazi
1db13a6fa9 Constellation fix 2022-04-19 19:48:26 +08:00
Benjamin Elsdon
058d322238 Merge remote-tracking branch 'upstream/main' 2022-04-19 19:34:02 +08:00
Melledy
2572d55c00 Merge pull request #24 from Yazawazi/main 
Fix weapon refine
 2022-04-19 04:14:17 -07:00
Melledy
aedfb59831 Remove duplicate function and fix stackoverflow issue 2022-04-19 04:13:38 -07:00
Melledy
06a50365d1 Merge branch 'dev-scene' 2022-04-19 04:12:53 -07:00
Yazawazi
3da79a1dc1 Fix refine 2022-04-19 18:59:43 +08:00
Benjamin Elsdon
dfc956a19f Modified the new commands to be compliant with my changes 2022-04-19 18:55:49 +08:00
Yazawazi
f74ca6e9a0 getAwakenMaterial Add 2022-04-19 18:55:32 +08:00
Benjamin Elsdon
6e14dda855 Merge branch 'main' of https://github.com/Melledy/Grasscutter 2022-04-19 18:44:10 +08:00
Melledy
2d2013dfee Merge pull request #22 from SpikeHD/level_setting_commands 
Set world level command
 2022-04-19 03:22:45 -07:00
Melledy
0a8647897a Merge pull request #21 from lunaticwhat/main 
more friendly notes
 2022-04-19 03:22:17 -07:00
Melledy
055da209d5 Merge pull request #20 from SpikeHD/char-command 
Give character command
 2022-04-19 03:21:56 -07:00
Benjamin Elsdon
5cea728eb7 Admin cmds, perms and descriptions for all cmds + 
Additonal stuff: Fixed + refactored help command. Removed 'Usage: ' from all commands. Created 'player.hasPermission(permission)' function. Created default for Usage annotation. Created hashmap version of 'getHandlers' and renamed the original to getHandlersAsList()
 2022-04-19 18:17:19 +08:00
SpikeHD
c5cebf2716 add to readme 2022-04-19 02:45:15 -07:00