Commit Graph

224 Commits

Author SHA1 Message Date
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
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
Jaida Wu
746e16a25a
Add FrontHTTPS field to Dispatch server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 21:25:58 +08:00
Melledy
e86932606a Revert "Explicitly load and save UTF-8 for the handbook"
This reverts commit fe6e9967db.
2022-04-22 05:20:02 -07:00
Melledy
db0e39bd72
Merge pull request #113 from 01101sam/patch-1
[typo] Fix resources folder tips
2022-04-22 04:38:04 -07:00
Melledy
08e3d7e4fb
Merge pull request #114 from alt3ri/development
Added /talent command
2022-04-22 04:35:10 -07:00
Melledy
e4681ba5be
Merge pull request #108 from fumbling644o/development
GM handbook: Explicitly load and save UTF-8
2022-04-22 04:33:05 -07:00
alt3ri
f8c31cfd96
Deleted 2 lines 2022-04-22 17:38:58 +07:00
alt3ri
1548c2a8d7
Added /talent command
Set current character talent level by using /talent command.
> /talent getid - Gets current character talent ID
> /talent set <talent ID> <level> - Sets current character's talent level
2022-04-22 17:28:52 +07:00
Sam
21f82519cf
[typo-upd] Add missing folder 2022-04-22 17:43:06 +08:00
Sam
9715c1d646
[typo] Fix resources folder tips 2022-04-22 17:36:24 +08:00
fumbling
fe6e9967db Explicitly load and save UTF-8 for the handbook
This fixes potential output issues for non-Latin scripts when exporting the handbook by changing the filename in the code.
2022-04-22 02:32:27 -04:00
Benjamin Elsdon
c638359302 Log files 2022-04-22 13:05:06 +08:00
Magix
e76b60d7c7
Merge pull request #94 from Yazawazi/development
Try to show characters' stories and voices
2022-04-21 23:12:02 -04:00
Yazawazi
d37543beaf
cache fetters 2022-04-22 10:39:25 +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
fengyuecanzhu
fd42dd558f change fhp to heal 2022-04-22 08:45:46 +08:00
Yazawazi
cb043e0644
no more NullPointerException pls 2022-04-22 08:30:02 +08:00
fengyuecanzhu
85fd060561 remove revive command 2022-04-22 08:26:48 +08:00
fengyuecanzhu
a47655db7a add fullfp command 2022-04-22 08:08:47 +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