Commit Graph

157 Commits

Author SHA1 Message Date
yarik0chka
38c0c9eb7c Add a changing weather id 2022-04-21 22:21:24 +05:00
Benjamin Elsdon
e97e124460 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Melledy
e10d554db8
Merge pull request #69 from Grasscutters/dev-fixes
Dev fixes
2022-04-21 00:09:12 -07:00
KingRainbow44
cc231b812d
why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04:00
Benjamin Elsdon
75719c5b3b Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Melledy
75cea5bc48 More refactoring (player id -> player uid) 2022-04-20 21:50:33 -07:00
labalityowo
7b43e9a6d8
Remove the stella appearance 2022-04-21 11:42:21 +07:00
Melledy
35925903a1 Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries 2022-04-20 21:33:58 -07:00
Melledy
252fa6b958 Fix weapon skills (and artifact sets) not working when you equip them 2022-04-20 21:03:18 -07:00
Melledy
434573115c Fix not being able to join friend's world 2022-04-20 18:48:26 -07:00
Melledy
268a0f94ce Fix player location updates in co-op 2022-04-20 18:44:02 -07:00
KingRainbow44
d7ffcd1636
Update Morphia to 2.x 2022-04-20 21:11:57 -04:00
Yazawazi
eb6bb1da07
teleports 2022-04-21 04:45:38 +08:00
Benjamin Elsdon
094674124e Merge remote-tracking branch 'upstream/development' 2022-04-21 00:25:47 +08:00
KingRainbow44
6710f04b71
Fix command map 2022-04-20 12:17:56 -04:00
Benjamin Elsdon
8a3af10162 Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 21:38:59 +08:00
Jaida Wu
c42d6d81f6
Rewrite commands
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 20:21:38 +08:00
Melledy
cfb13acb7d Fix character abilities not showing for others in co-op/lasting too long 2022-04-20 03:42:59 -07: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
Magix
40c6824cdc
Merge branch 'main' into main 2022-04-19 14:07:39 -04:00
Melledy
1e3d2a04c1
Merge pull request #26 from Yazawazi/main
unlockAvatarConstellation fix
2022-04-19 09:18:42 -07:00
Yazawazi
d97b2e834a
talentData
sorry again, forgot to add
2022-04-19 20:05:45 +08: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
26c3336a0b Merge branch 'main' of https://github.com/Melledy/Grasscutter 2022-04-19 18:44:10 +08: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
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
Melledy
7b0054e936 Grant superuser permissions to accounts created before the permissions update 2022-04-19 01:28:31 -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
5c71c97108 Grant superuser permissions to accounts created before the permissions update 2022-04-18 22:00:01 -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
KingRainbow44
87a9d0c590
Implement basic permission system 2022-04-18 23:46:04 -04:00
KingRainbow44
4a70653e88
Refactor method names & add / prefix 2022-04-18 22:16:20 -04:00
KingRainbow44
a0e26352a6
Add existing commands 2022-04-18 22:10:41 -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
121f4675d7 Add SceneDatas 2022-04-18 10:14:32 -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
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
Melledy
3b45ff7d46 Initial commit 2022-04-17 05:43:07 -07:00