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

157 Commits

Author SHA1 Message Date
KingRainbow44
9fd5aef687
Add more events 2022-04-26 02:07:00 -04:00
Benjamin Elsdon
7015905991 Improvements and send all mail fix 
Mail ID no longer exists and is handled by it's position in the mail array
 2022-04-26 11:57:55 +08:00
Melledy
f0ae673091 Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2b75cda6df Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
080fdeeef6 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
a9b7a5a5f6 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
b0322fa3e5 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
3b414cda38 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Benjamin Elsdon
ae190f3fa0 Send Mail Command! 
Almost done! Wooooo!
 2022-04-25 21:53:10 +08:00
Benjamin Elsdon
f18068bc16 More weird git stuff 2022-04-25 16:32:26 +08:00
Benjamin Elsdon
43ef6ff9c5 Weird git stuff 2022-04-25 16:25:33 +08:00
Benjamin Elsdon
15d1159509 Deleting mail + a bit of cleanup 2022-04-25 16:23:22 +08:00
Benjamin Elsdon
ced5fc38be Receiving items in mail 2022-04-25 16:22:13 +08:00
Benjamin Elsdon
4e3a1c769f THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
30bc3a8ad1 Java-16 compatiable mail system (whoops) 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
b1f34f4fbe Added database support for mail 
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
 2022-04-25 16:22:12 +08:00
Asnxthaony
bc3fa67408 fix indent by using smart tabs 2022-04-25 00:54:11 -07:00
Asnxthaony
25111ed907 sanity check 2022-04-25 00:54:11 -07:00
Benjamin Elsdon
ffe96fe93a Deleting mail + a bit of cleanup 2022-04-25 14:30:56 +08:00
Benjamin Elsdon
850b3d20ff Receiving items in mail 2022-04-25 13:51:19 +08:00
Benjamin Elsdon
c7096f9e49 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-24 19:06:52 +08:00
Benjamin Elsdon
b10a889d76 Java-16 compatiable mail system (whoops) 2022-04-24 18:17:08 +08:00
Benjamin Elsdon
9e81e10e64 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-24 18:01:32 +08:00
Yazawazi
fb9f6c0bf4
Fix fetter system 2022-04-24 15:02:31 +08:00
Yazawazi
232e9a470d
Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
Melledy
54ad583c67
Merge pull request #128 from memetrollsXD/development 
Use count for level for equips (dev branch)
 2022-04-23 15:15:22 -07:00
memetrollsXD
b1508183f8
Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
Yazawazi
9c920b139a
Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Benjamin Elsdon
7fd1e4dacb Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-23 23:07:38 +08:00
Benjamin Elsdon
903e02c538 Added database support for mail 
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
 2022-04-23 23:07:18 +08:00
Yazawazi
45281695fe
Try to give name card 2022-04-23 21:03:29 +08:00
Yazawazi
e970fdb60a
Merge branch 'Grasscutters:development' into development 2022-04-23 19:58:17 +08:00
Jaida Wu
e38f5ca97b
Fix PlayerBirthday exception 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 15:39:56 +08:00
Melledy
473a90432f
Merge pull request #136 from miyucchi/development 
Save birthday date
 2022-04-22 21:35:58 -07:00
Yazawazi
eb57534a2a
Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Melledy
17abf321a2 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
Miyucchi
e2543483ff Profile set birthday feature 2022-04-23 03:22:32 +02:00
Yazawazi
53659d2586
AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00
memetrollsXD
d341e4f245 Use count for level for equips 2022-04-22 23:19:58 +02:00
Yazawazi
34c0c6b01b
setfetterlevel command 2022-04-22 23:46:24 +08:00
Yazawazi
9edb70d6cf
AvatarFetterLevel 2022-04-22 22:27:40 +08:00
fumbling
91b685586e Morphia call fixes; add @Entity to more classes 
1. During the conversion of Morphia calls to the new API, some of the `Filter.eq()` calls had their `field` set to `playerId` due to a copy/paste typo.

2. Morphia 2 switches to the codec system, so anything that will be serialized in the pipeline requires the `@Entity` annotation.
 2022-04-21 22:19:47 -04:00
Yazawazi
cb043e0644
no more NullPointerException pls 2022-04-22 08:30:02 +08:00
Yazawazi
1c6aa32cea
ee, forget to change variables when copying from local 2022-04-22 07:49:35 +08:00
Yazawazi
a3f528ede0
typo 2022-04-22 07:42:17 +08:00
Yazawazi
6b8b6b4899
fetter try 2022-04-22 07:37:25 +08: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
dca137a93e Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
Melledy
29fe983f67
Merge pull request #84 from yarik0chka/development 
Add a changing weather id
 2022-04-21 11:47:13 -07:00
Yazawazi
a01783ef3c
Teleport Small Fix 2022-04-22 02:23:02 +08:00
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