Benjamin Elsdon
b9f7c657ac
Merge remote-tracking branch 'upstream/development' into dev-mail
2022-04-27 07:37:05 +08:00
WetABQ
addfb5eb5d
[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
627a2f1ee8
Merge branch 'api' into development
2022-04-26 11:17:02 -04:00
Benjamin Elsdon
3db1a86609
Merge remote-tracking branch 'upstream/development' into dev-mail
2022-04-26 15:45:58 +08:00
KingRainbow44
e27bdd9bb6
Add more events
2022-04-26 02:07:00 -04:00
Benjamin Elsdon
a5677a8e34
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
614477181f
Fix concurrency related error while spawning monsters
2022-04-25 14:28:45 -07:00
Melledy
2228332f9d
Call checkSpawns from World instead of from Player
2022-04-25 14:28:45 -07:00
Melledy
c3f9fd3ce3
Synchronize scene entity map
2022-04-25 14:28:45 -07:00
Melledy
1c691748f5
Make monsters scale off world level
2022-04-25 14:28:45 -07:00
Melledy
f28f21b061
Dont deregister scenes if the player is going to tp back into them
2022-04-25 14:28:44 -07:00
Melledy
711e6eabd0
Natural spawn test
...
(without luas)
2022-04-25 14:28:44 -07:00
Benjamin Elsdon
c68c75e8ce
Send Mail Command!
...
Almost done! Wooooo!
2022-04-25 21:53:10 +08:00
Benjamin Elsdon
3f11cc41b2
More weird git stuff
2022-04-25 16:32:26 +08:00
Benjamin Elsdon
b29bcb553a
Weird git stuff
2022-04-25 16:25:33 +08:00
Benjamin Elsdon
67b4c274ec
Deleting mail + a bit of cleanup
2022-04-25 16:23:22 +08:00
Benjamin Elsdon
9bf94f9539
Receiving items in mail
2022-04-25 16:22:13 +08:00
Benjamin Elsdon
a548fe6c52
THE MAILBOX ACTUALLY WORKS CORRECTLY NOW
2022-04-25 16:22:12 +08:00
Benjamin Elsdon
29a3e64db0
Java-16 compatiable mail system (whoops)
2022-04-25 16:22:12 +08:00
Benjamin Elsdon
69779a0321
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
480374fb39
fix indent by using smart tabs
2022-04-25 00:54:11 -07:00
Asnxthaony
4e5d72a99a
sanity check
2022-04-25 00:54:11 -07:00
Benjamin Elsdon
721d8b7223
Deleting mail + a bit of cleanup
2022-04-25 14:30:56 +08:00
Benjamin Elsdon
785effe8da
Receiving items in mail
2022-04-25 13:51:19 +08:00
Benjamin Elsdon
94a75cf903
THE MAILBOX ACTUALLY WORKS CORRECTLY NOW
2022-04-24 19:06:52 +08:00
Benjamin Elsdon
f556bff333
Java-16 compatiable mail system (whoops)
2022-04-24 18:17:08 +08:00
Benjamin Elsdon
c25e809f5c
Merge remote-tracking branch 'upstream/development' into dev-mail
2022-04-24 18:01:32 +08:00
Yazawazi
8d8866aa63
Fix fetter system
2022-04-24 15:02:31 +08:00
Yazawazi
56a1ab64ab
Player Level Reward Update Notify Support!
2022-04-24 13:22:26 +08:00
Melledy
7a4de2f0d6
Merge pull request #128 from memetrollsXD/development
...
Use count for level for equips (dev branch)
2022-04-23 15:15:22 -07:00
memetrollsXD
fd1890b072
Merge branch 'Grasscutters:development' into development
2022-04-23 22:37:48 +02:00
Yazawazi
3baef42aac
Name Card Done!!!!!!!!!!!
2022-04-23 23:48:06 +08:00
Benjamin Elsdon
9e7c9f4670
Merge remote-tracking branch 'upstream/development' into dev-mail
2022-04-23 23:07:38 +08:00
Benjamin Elsdon
cb03b654bc
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
3bc249f042
Try to give name card
2022-04-23 21:03:29 +08:00
Yazawazi
042bdc2ff2
Merge branch 'Grasscutters:development' into development
2022-04-23 19:58:17 +08:00
Jaida Wu
cd08c52b35
Fix PlayerBirthday exception
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 15:39:56 +08:00
Melledy
02c852716a
Merge pull request #136 from miyucchi/development
...
Save birthday date
2022-04-22 21:35:58 -07:00
Yazawazi
b11009f724
Merge branch 'Grasscutters:development' into development
2022-04-23 10:43:27 +08:00
Melledy
716380a078
Merge branch 'development' into java-16
2022-04-22 19:23:32 -07:00
Miyucchi
7fd0b371d0
Profile set birthday feature
2022-04-23 03:22:32 +02:00
Yazawazi
7ccecda07c
AvatarFetterLevelReward
2022-04-23 06:08:37 +08:00
memetrollsXD
a52eaf9bbc
Use count for level for equips
2022-04-22 23:19:58 +02:00
Yazawazi
eb70904660
setfetterlevel command
2022-04-22 23:46:24 +08:00
Yazawazi
159b10af72
AvatarFetterLevel
2022-04-22 22:27:40 +08:00
fumbling
06101f1b9c
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
376c668dd9
no more NullPointerException pls
2022-04-22 08:30:02 +08:00
Yazawazi
2350f0ebe2
ee, forget to change variables when copying from local
2022-04-22 07:49:35 +08:00
Yazawazi
044c2a3086
typo
2022-04-22 07:42:17 +08:00
Yazawazi
eedab79253
fetter try
2022-04-22 07:37:25 +08:00
