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

118 Commits

Author SHA1 Message Date
Melledy
be307fe5f0 Fix white screen after logging in 2022-04-26 21:27:35 -07:00
Benjamin Elsdon
e4899034b2 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
Benjamin Elsdon
63d0db376a Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
98bb7e9bc4 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
Benjamin Elsdon
2ed6fbc1da Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
619b84027f DateHelper 2022-04-27 07:01:05 +08:00
Yazawazi
c3f25edff3
utils 2022-04-27 06:15:59 +08:00
Yazawazi
383356deb0
Moon Card 2022-04-27 06:04:21 +08:00
WetABQ
b392849577
[BREAKING CHANGE] proto auto compiled by gradle (#226) 
* [BREAK] proto auto compiled by gradle

* [BREAK] move proto to submodule

* update gitmodules

* [BREAK] move proto to submodule

* move proto to submodule

* fix merge conflict

* fix github action after merging

* fix merge conflicts and del submodule

* upload the proto
 2022-04-26 14:44:30 -07:00
Magix
30d4fec9d4
Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
Benjamin Elsdon
a2b6633797 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
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