Commit Graph

246 Commits

Author SHA1 Message Date
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
Melledy
b6d8dd0db4 Merge pull request #175 from omg-xtao/suicide
GodMode command supports playerId
2022-04-24 00:03:21 -07:00
Yazawazi
56a1ab64ab Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
2f5ae6c784 GodMode command supports playerId 2022-04-24 11:40:10 +08:00
Yazawazi
b2840b1740 Player level reward 2022-04-24 11:25:13 +08:00
Melledy
81ee9a00a2 Merge pull request #164 from miyucchi/development
Fix counter (Create a new account if exists issue)
2022-04-23 15:26:14 -07: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
Miyucchi
7792c5c73f Fix counter 2022-04-24 00:10:26 +02:00
Yazawazi
9e523da18e tp with relative coordinates 2022-04-24 05:20:59 +08:00
Yazawazi
0c4d975409 Merge branch 'Grasscutters:development' into development 2022-04-24 05:03:55 +08:00
memetrollsXD
fd1890b072 Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
2dd8932144 Add Teleport command 2022-04-24 03:10:07 +08: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
ad1c3f9a3b Will 2022-04-23 22:16:59 +08:00
Yazawazi
aa4489497e Merge branch 'Grasscutters:development' into development 2022-04-23 22:16:21 +08:00
memetrollsXD
57e3637251 Add promoteLevel and count 2022-04-23 16:11:45 +02:00
301d0a174c Add another way to set talent level 2022-04-23 21:13:45 +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
Melledy
9fab2682ee Merge pull request #153 from TheLostTree/main
Handle drowning
2022-04-23 04:39:02 -07:00
TheLostTree
3d9b71dc4d git doesnt like me 2022-04-23 03:32:08 -07:00
TheLostTree
91894380cb drowning added 2022-04-23 03:19:33 -07:00
Jaida Wu
3eabd40345 Make some control panel happy
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 16:47:13 +08:00
Melledy
df1dca8d87 Merge pull request #141 from Grasscutters/bind-failure
Push a helpful error message to the console on bind failure
2022-04-23 01:14:51 -07:00
Jaida Wu
cd08c52b35 Fix PlayerBirthday exception
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 15:39:56 +08:00
KingRainbow44
8afcc0b89a Add message for bind failure (HTTP) 2022-04-23 02:20:18 -04:00
Melledy
a957379afb Merge pull request #131 from Raeliana/patch-1
Create ClearWeaponsCommand.java
2022-04-22 21:36:52 -07:00
Melledy
02c852716a Merge pull request #136 from miyucchi/development
Save birthday date
2022-04-22 21:35:58 -07:00
Melledy
3ed6a99445 Merge pull request #127 from yarik0chka/development
Implemented sitting
2022-04-22 21:34:36 -07:00
Magix
0992fc11b4 Add keystore password 2022-04-22 23:53:37 -04:00
Yazawazi
5ea5ea238c OpenCond for unlocking judgment 2022-04-23 10:51:22 +08: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
539970fd50 Feature: SetBirthdayDate 2022-04-23 03:29:08 +02:00
Miyucchi
7fd0b371d0 Profile set birthday feature 2022-04-23 03:22:32 +02:00
Raeliana
cdf6c697f1 Create ClearWeaponsCommand.java
A command to clear unlocked and unequipped artifacts
2022-04-23 02:48:04 +03:00
Melledy
dffffc8d49 Merge branch 'stable' into development 2022-04-22 16:34:41 -07: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
PasserbyAlpha
6cc0fdaeed use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o] 2022-04-23 02:28:34 +08:00
yarik0chka
3ca181e76d Implemented sitting 2022-04-22 23:24:51 +05:00
4605c6506e Add PublicPort field to server 2022-04-23 01:42:04 +08:00
Yazawazi
48db644692 command fix 2022-04-23 01:36:48 +08:00
104d10352b Add PublicPort field to Dispatch server 2022-04-23 01:16:55 +08:00
Yazawazi
eb70904660 setfetterlevel command 2022-04-22 23:46:24 +08:00