Commit Graph

248 Commits

Author SHA1 Message Date
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
Melledy
3c9a2ba846
Merge pull request #175 from omg-xtao/suicide
GodMode command supports playerId
2022-04-24 00:03:21 -07:00
Yazawazi
232e9a470d
Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
95411a6df3
GodMode command supports playerId 2022-04-24 11:40:10 +08:00
Yazawazi
1517c567c1
Player level reward 2022-04-24 11:25:13 +08:00
Melledy
bae34b8072
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
54ad583c67
Merge pull request #128 from memetrollsXD/development
Use count for level for equips (dev branch)
2022-04-23 15:15:22 -07:00
Miyucchi
c4cdc97d7b Fix counter 2022-04-24 00:10:26 +02:00
Yazawazi
523d0260d0
tp with relative coordinates 2022-04-24 05:20:59 +08:00
Yazawazi
80cb967c86
Merge branch 'Grasscutters:development' into development 2022-04-24 05:03:55 +08:00
memetrollsXD
b1508183f8
Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
00f2da10df
Add Teleport command 2022-04-24 03:10:07 +08: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
88e1a0c555
Will 2022-04-23 22:16:59 +08:00
Yazawazi
984ee9d7ea
Merge branch 'Grasscutters:development' into development 2022-04-23 22:16:21 +08:00
memetrollsXD
5d145fb1d6 Add promoteLevel and count 2022-04-23 16:11:45 +02:00
d1d2be9b16
Add another way to set talent level 2022-04-23 21:13:45 +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
Melledy
690abd647e
Merge pull request #153 from TheLostTree/main
Handle drowning
2022-04-23 04:39:02 -07:00
TheLostTree
46aded281d git doesnt like me 2022-04-23 03:32:08 -07:00
TheLostTree
d64044f931 drowning added 2022-04-23 03:19:33 -07:00
Jaida Wu
46f40a9012
Make some control panel happy
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 16:47:13 +08:00
Melledy
ea9cda21e2
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
e38f5ca97b
Fix PlayerBirthday exception
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 15:39:56 +08:00
KingRainbow44
bba4a00508
Add message for bind failure (HTTP) 2022-04-23 02:20:18 -04:00
Melledy
90c9af7257
Merge pull request #131 from Raeliana/patch-1
Create ClearWeaponsCommand.java
2022-04-22 21:36:52 -07:00
Melledy
473a90432f
Merge pull request #136 from miyucchi/development
Save birthday date
2022-04-22 21:35:58 -07:00
Melledy
bdfd92e7a3
Merge pull request #127 from yarik0chka/development
Implemented sitting
2022-04-22 21:34:36 -07:00
Magix
1933bfc95a
Add keystore password 2022-04-22 23:53:37 -04:00
Yazawazi
23481cfe0c
OpenCond for unlocking judgment 2022-04-23 10:51:22 +08: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
6d53f2d6ac Feature: SetBirthdayDate 2022-04-23 03:29:08 +02:00
Miyucchi
e2543483ff Profile set birthday feature 2022-04-23 03:22:32 +02:00
Raeliana
f04f1ec5ce
Create ClearWeaponsCommand.java
A command to clear unlocked and unequipped artifacts
2022-04-23 02:48:04 +03:00
Melledy
5c1f48a5aa Merge branch 'stable' into development 2022-04-22 16:34:41 -07: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
PasserbyAlpha
2750d5da2d use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o] 2022-04-23 02:28:34 +08:00
yarik0chka
266443b321 Implemented sitting 2022-04-22 23:24:51 +05:00
04c0e968ed
Add PublicPort field to server 2022-04-23 01:42:04 +08:00
Yazawazi
f9b5c8a9ee
command fix 2022-04-23 01:36:48 +08:00
26c3651cc8
Add PublicPort field to Dispatch server 2022-04-23 01:16:55 +08:00
Yazawazi
34c0c6b01b
setfetterlevel command 2022-04-22 23:46:24 +08:00
PasserbyAlpha
1b39f67032 fixed encoding problem when generating gm handbook 2022-04-22 23:11:29 +08:00
Yazawazi
9edb70d6cf
AvatarFetterLevel 2022-04-22 22:27:40 +08:00