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
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
Melledy
a05f8270ab
Merge pull request #74 from 4Benj/development
...
Server run modes and multi-server dispatch support
2022-04-21 15:06:57 -07:00
Melledy
eb44fc88c4
Refactor Revive Command + fix syntax error
...
No idea how I missed the syntax error while reviewing
2022-04-21 14:47:04 -07:00
Melledy
18707f9309
Merge branch 'development' into account-fix
2022-04-21 14:46:07 -07:00
Melledy
d19d80fa4e
Save config everytime you load so the new options show up
2022-04-21 14:44:55 -07:00
Melledy
860e28e56a
Merge pull request #88 from alt3ri/development
...
Added /revive command
2022-04-21 14:05:09 -07:00
Melledy
dca137a93e
Fix account dupe key error after selecting starting character
2022-04-21 14:02:17 -07:00
alt3ri
96a252f9dd
Added /revive command
...
Now it's more convenient to revive character without food :>
2022-04-22 02:28:52 +07:00
Melledy
a93398a18b
Merge pull request #86 from alt3ri/patch-7
...
Fix typo
2022-04-21 11:47:30 -07:00
Melledy
29fe983f67
Merge pull request #84 from yarik0chka/development
...
Add a changing weather id
2022-04-21 11:47:13 -07:00
Yazawazi
a01783ef3c
Teleport Small Fix
2022-04-22 02:23:02 +08:00
alt3ri
2cc8d48fde
Fix typo
...
"When you create a new account via auto register or console server then during scene select a character and write a name on it press it it will get stuck and make the server disconnected. Some can get through and some can't passed it, so currently I'm still on the stable version . even how many times have I deleted the datebase and tried it on some linux and directly on windows too :/ btw 6863600865/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131)https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760 )
Thanks [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760 )
2022-04-22 00:54:06 +07:00
yarik0chka
38c0c9eb7c
Add a changing weather id
2022-04-21 22:21:24 +05:00
Benjamin Elsdon
ff6958ed1f
Forgot a dispatch prefix on error while merging
2022-04-22 01:15:05 +08:00
Benjamin Elsdon
96da53b5fb
Merge remote-tracking branch 'upstream/development' into development
2022-04-22 01:04:03 +08:00
Melledy
6863600865
Merge pull request #78 from MlgmXyysd/dispatch-refactor
...
Refact dispatch server
2022-04-21 09:03:53 -07:00
Jaida Wu
68deff0c95
Listens to all addresses by default
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:03 +08:00
Jaida Wu
aacd261206
Add dispatch server log prefix
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:02 +08:00
Jaida Wu
b0d2d29b1c
Add some log to dispatch server
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:00 +08:00
Jaida Wu
2df8625b24
Fallback to HTTP if no SSL cert
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:59 +08:00
Jaida Wu
a1567895fa
Refact code
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:54 +08:00
Melledy
686aed2cd4
Merge pull request #77 from xmplay/patch-1
...
bring back the jade chamber and other old scene tags
2022-04-21 09:01:43 -07:00
Melledy
781448518d
Merge pull request #79 from zamlty/development
...
Fix artifact & weapon generation by give command
2022-04-21 09:00:30 -07:00
Benjamin Elsdon
66b5ed8a83
Should probably remove this as well...
2022-04-21 23:04:02 +08:00
Benjamin Elsdon
72355dd3c5
Removed class left over from testing
2022-04-21 23:00:36 +08:00
Jaida Wu
dee3105763
Add list command
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 22:55:32 +08:00
Benjamin Elsdon
63e008cbcf
DatabaseManager clean up
2022-04-21 22:50:06 +08:00
Benjamin Elsdon
a36f29cdf1
Fixed null pointer exception in game only mode
...
PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.
2022-04-21 22:38:01 +08:00
zamlty
1d54084317
Fix artifact & weapon generation by give command
2022-04-21 22:21:39 +08:00
xmplay
66c956d10e
bring back the jade chamber and other old scene tags
2022-04-21 15:04:47 +01:00
Jaida Wu
65e0799e79
Drop independent log server
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 21:41:30 +08:00
Benjamin Elsdon
585187bebe
Fixed null pointer exception in hybrid mode.
2022-04-21 19:20:49 +08:00
Benjamin Elsdon
e97e124460
Merge branch 'development' of https://github.com/Melledy/Grasscutter into development
2022-04-21 18:11:51 +08:00
Benjamin Elsdon
6a091b254c
Multi-server dispatch support and server run modes
2022-04-21 18:04:00 +08:00
Melledy
56415b7fbc
Merge pull request #70 from Grasscutters/dev-fixes
...
Dev fixes
2022-04-21 00:31:01 -07:00
Melledy
3a0997bb5a
Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players
2022-04-21 00:29:06 -07:00
Melledy
c0e859b17c
Add config entry for OverseaLogPort (default: 8888)
2022-04-21 00:28:28 -07:00
Melledy
e10d554db8
Merge pull request #69 from Grasscutters/dev-fixes
...
Dev fixes
2022-04-21 00:09:12 -07:00
KingRainbow44
cc231b812d
why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING
2022-04-21 02:07:05 -04:00
Benjamin Elsdon
75719c5b3b
Restructured the config file in preperation for server run modes
2022-04-21 13:53:50 +08:00
Melledy
ea91276736
Merge pull request #66 from labalityowo/development
...
Remove stella constellation appeareance in gacha pull
2022-04-20 22:09:56 -07:00
Melledy
262ca08679
Merge pull request #65 from fengyuecanzhu/development
...
args check for setstats command
2022-04-20 22:05:58 -07:00
Melledy
75cea5bc48
More refactoring (player id -> player uid)
2022-04-20 21:50:33 -07:00
fengyuecanzhu
9c136859eb
add args check
2022-04-21 12:49:23 +08:00
labalityowo
7b43e9a6d8
Remove the stella appearance
2022-04-21 11:42:21 +07:00
Melledy
35925903a1
Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries
2022-04-20 21:33:58 -07:00
Melledy
252fa6b958
Fix weapon skills (and artifact sets) not working when you equip them
2022-04-20 21:03:18 -07:00
KingRainbow44
c3da897e01
Fix command detection
2022-04-20 23:56:27 -04:00
fengyuecanzhu
56ee7b719a
change description
2022-04-21 11:52:53 +08:00
fengyuecanzhu
636d9ff206
add description and permission to setstats command
2022-04-21 11:43:31 +08:00
Yazawazi
639eba528f
folder check
2022-04-21 10:37:24 +08:00
Melledy
434573115c
Fix not being able to join friend's world
2022-04-20 18:48:26 -07:00
Melledy
268a0f94ce
Fix player location updates in co-op
2022-04-20 18:44:02 -07:00
Melledy
eb466ffec0
Fix water and the visual map in archipelago
2022-04-20 18:37:07 -07:00
KingRainbow44
d7ffcd1636
Update Morphia to 2.x
2022-04-20 21:11:57 -04:00
KingRainbow44
48ee0be3a9
Fix merge conflict
2022-04-20 18:55:01 -04:00
KingRainbow44
6be98b61e4
Magix sanity.
2022-04-20 18:48:24 -04:00
Melledy
c1df3d1ed8
Merge pull request #60 from Yazawazi/development
...
Adding a `Teleport to Waypoint` Function
2022-04-20 14:31:14 -07:00
Yazawazi
48cb32f280
session send sorry
2022-04-21 04:59:42 +08:00
