Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 20:56:55 +00:00
Code Issues Projects Releases Wiki Activity
898 Commits 7 Branches 22 Tags 136 MiB
8a52a041bd
Commit Graph

638 Commits

Author SHA1 Message Date
Benjamin Elsdon
93ae8742c0 Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 17:18:51 +08:00
Benjamin Elsdon
149ebaabdb /reload now reloads the gacha as well 2022-04-20 17:17:59 +08:00
Melledy
2f90946da5
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
Yazawazi
51e1afefba
Add /weather Command 2022-04-20 17:16:21 +08:00
Benjamin Elsdon
ba56ccff1e 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
a498b81a24 Forgot config check 2022-04-20 16:07:18 +08:00
Benjamin Elsdon
c08a341b20 Update gradle + Work gacha reload (gs broken atm) 2022-04-20 16:05:53 +08:00
memetrollsXD
98a86f6946
Merge branch 'development' into restart-command 2022-04-20 09:03:18 +02:00
memetrollsXD
b142be953f
Fix merge conflict 2022-04-20 09:00:50 +02:00
memetrollsXD
2a4c08f59f It won't get better than this for now.. 2022-04-20 08:52:47 +02:00
w4123
10f98cf13c Implement stub NpcTalk packets 2022-04-20 12:25:38 +08:00
KingRainbow44
9f2cf00b95
totally not me forgetting how this works 2022-04-20 00:15:37 -04:00
KingRainbow44
7485e9fd4e
Change to String#equals 2022-04-20 00:10:43 -04:00
KingRainbow44
c0155b8dcc
Add config option 2022-04-20 00:10:32 -04:00
KingRainbow44
50e630b1fa
Automatically create account on login screen 2022-04-20 00:03:01 -04:00
KingRainbow44
85801df482
Small updates to server commands 2022-04-19 14:11:48 -04:00
Magix
40c6824cdc
Merge branch 'main' into main 2022-04-19 14:07:39 -04:00
memetrollsXD
1422e20bb3 Try PlayerTokenRsp instead of LoginRsp 2022-04-19 19:45:39 +02:00
memetrollsXD
42260f68a8 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
ayy lmao
eb232f0435 Fix folder seperators 2022-04-19 19:21:14 +03:00
Melledy
1e3d2a04c1
Merge pull request #26 from Yazawazi/main 
unlockAvatarConstellation fix
 2022-04-19 09:18:42 -07:00
Melledy
ed7df5b711
Merge pull request #27 from OtakuNekoP/main 
skip beta server device id verify
 2022-04-19 09:09:17 -07:00
Melledy
0e104f00bf
Merge pull request #25 from xmplay/main 
add water to golden apple archipelago by default
 2022-04-19 09:08:58 -07:00
KingRainbow44
4b68031019
Attempt to fix !givechar 2022-04-19 10:31:24 -04:00
KingRainbow44
ffbd606414
Command reformat 2022-04-19 10:00:50 -04:00
OtakuNekoP
58a2cc26f1
skip beta server device id verify 2022-04-19 14:48:03 +02:00
Benjamin Elsdon
d2ef8a4b49 Fixed an issue with kicking players 
(Still broken but now it actually disconnects the player)
 2022-04-19 20:36:15 +08:00
Yazawazi
d97b2e834a
talentData 
sorry again, forgot to add
 2022-04-19 20:05:45 +08:00
xmplay
3639906857
Update PacketPlayerEnterSceneNotify.java 2022-04-19 13:03:43 +01:00
Yazawazi
e69b08b7c0
Constellation fix 2022-04-19 19:48:26 +08:00
Benjamin Elsdon
ca4cb2b7a8 Merge remote-tracking branch 'upstream/main' 2022-04-19 19:34:02 +08:00
Melledy
8d6019fe8f
Merge pull request #24 from Yazawazi/main 
Fix weapon refine
 2022-04-19 04:14:17 -07:00
Melledy
b9c69408f9 Remove duplicate function and fix stackoverflow issue 2022-04-19 04:13:38 -07:00
Melledy
812811c550 Merge branch 'dev-scene' 2022-04-19 04:12:53 -07:00
Yazawazi
e177b111f0
Fix refine 2022-04-19 18:59:43 +08:00
Benjamin Elsdon
73cf9db747 Modified the new commands to be compliant with my changes 2022-04-19 18:55:49 +08:00
Yazawazi
56ca323645
getAwakenMaterial Add 2022-04-19 18:55:32 +08:00
Benjamin Elsdon
26c3336a0b Merge branch 'main' of https://github.com/Melledy/Grasscutter 2022-04-19 18:44:10 +08:00
Melledy
971c5470ba
Merge pull request #22 from SpikeHD/level_setting_commands 
Set world level command
 2022-04-19 03:22:45 -07:00
Benjamin Elsdon
ceaedca209 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
98f1ab7393 set world level command 2022-04-19 02:44:33 -07:00
Melledy
c4ccb298f9 Refactor some commands and move inventory/team limits to the config 2022-04-19 02:22:21 -07:00
SpikeHD
61e03bdc8c properly add ascension-locked talents 2022-04-19 02:06:58 -07:00
Melledy
f7752c027d Fix issue with a player not being able to spawn when they join somone in co-op with a singleplayer team of more than the max allowed amount 2022-04-19 01:43:38 -07:00
SpikeHD
535a9167cf calculate ascension based on level provided to givechar command 2022-04-19 01:37:52 -07:00
Melledy
7b0054e936 Grant superuser permissions to accounts created before the permissions update 2022-04-19 01:28:31 -07:00
SpikeHD
5bf2e5d935 fix references to givechar 2022-04-19 01:01:40 -07:00
SpikeHD
5c6578a2f8 fix conventions to match other commands 2022-04-19 00:41:40 -07:00
SpikeHD
f7baa1dbeb Give character command base 2022-04-19 00:15:10 -07:00
Melledy
e8b6f23bcb Make co-op players spawn into the host's scene too 2022-04-18 23:09:48 -07:00
Melledy
02fc29ce90 Deregister empty scenes if a player leaves them 2022-04-18 23:00:12 -07:00
Melledy
53e7f01a15
Merge pull request #16 from pedox/feat-dispatch-server 
Added Config for using http server with non SSL
 2022-04-18 22:05:51 -07:00
Melledy
5c71c97108 Grant superuser permissions to accounts created before the permissions update 2022-04-18 22:00:01 -07:00
naufal
9dc58d8b3b feat: added configuration for change upload port 
feat: added configuration for use non SSL
 2022-04-19 11:49:08 +07:00
Melledy
efe183ecf7 Fix permissions not saving 2022-04-18 21:38:38 -07:00
Melledy
8af0a70b82 Fix permissions not saving 2022-04-18 21:38:19 -07:00
Melledy
cd81494b8f Merge branch 'main' into dev-scene 2022-04-18 21:35:01 -07:00
Melledy
bcf234e087
Merge pull request #15 from Melledy/file-separator 
Use the operating system's file separator
 2022-04-18 20:55:12 -07:00
KingRainbow44
27c9545b0d
GameServer#getPlayerByUid = GameServer#getPlayerById 2022-04-18 23:53:05 -04:00
KingRainbow44
87a9d0c590
Implement basic permission system 2022-04-18 23:46:04 -04:00
KingRainbow44
17163ff81c
Use OS file separator 2022-04-18 23:26:34 -04:00
KingRainbow44
fa65f512ca
Generic help command 2022-04-18 23:06:03 -04:00
KingRainbow44
ba4e727302
Fix bugs with commands 2022-04-18 22:31:31 -04:00
KingRainbow44
f8496a5ea5
Find by player's UID not IID 2022-04-18 22:23:22 -04:00
KingRainbow44
4a70653e88
Refactor method names & add / prefix 2022-04-18 22:16:20 -04:00
KingRainbow44
052d0dbf87
Add color to logback 2022-04-18 22:10:51 -04:00
KingRainbow44
a0e26352a6
Add existing commands 2022-04-18 22:10:41 -04:00
KingRainbow44
1028e48e49
Execution power 2022-04-18 22:09:51 -04:00
KingRainbow44
4f7f3580db
Fix registering error & implement handling 2022-04-18 20:11:23 -04:00
KingRainbow44
ce51e9d6c3
Implement new command system 2022-04-18 18:24:08 -04:00
Melledy
59c027eab9 Update failure message when not being able to change scene 2022-04-18 10:17:19 -07:00
Melledy
b2466693ae Fix small issue with command parsing 2022-04-18 10:15:33 -07:00
Melledy
afdadc41bc Set scene names to generate in the handbook 2022-04-18 10:14:45 -07:00
Melledy
121f4675d7 Add SceneDatas 2022-04-18 10:14:32 -07:00
Melledy
696647dbd1 Fix small issue with command parsing 2022-04-18 09:59:57 -07:00
Melledy
e00bd69278 Add !changescene command 2022-04-18 09:59:21 -07:00
Melledy
1322f909f3 Simple sanity check when changing scenes 2022-04-18 09:59:00 -07:00
Melledy
cf69b61b98 Merge branch 'main' into dev-scene 2022-04-18 09:40:06 -07:00
Melledy
06ad1e8f9b Implement support for multiple scenes in a world 2022-04-18 09:39:29 -07:00
Benjamin Elsdon
3be50b5b01 Refactored PlayerCommands, added commands and more 
Added player "Help" command, added server "sendmsg" command, changed getAcccountByPlayerID to public in DatabaseHelper, and allowed player commands to be submitted with "/" and "!"
 2022-04-18 23:47:26 +08:00
ayy lmao
f3dc5f81ea Add support for specifying a Public IP 2022-04-18 12:10:39 +03:00
Melledy
5398410113 Properly level up characters with the character exp virtual item 2022-04-18 00:45:28 -07:00
Melledy
58c03d9317 Random thing for logback 2022-04-18 00:42:58 -07:00
Melledy
c83bec9b9e Merge branch 'main' of https://github.com/Melledy/Grasscutter 2022-04-17 23:45:08 -07:00
Melledy
26782146e0 Remove gadgets from world when a player leaves 2022-04-17 23:43:47 -07:00
Melledy
51cba69915 Limit co-op teams to 4 avatars max total 2022-04-17 23:36:47 -07:00
KingRainbow44
54854e5c17
Refactor existing code 2022-04-18 01:11:27 -04:00
Melledy
3b45ff7d46 Initial commit 2022-04-17 05:43:07 -07:00