Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 21:56:09 +00:00
Code Issues Projects Releases Wiki Activity
476 Commits 7 Branches 22 Tags 133 MiB
748e64a60c
Commit Graph

476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Magix
f574ce0164 Merge pull request #100 from MlgmXyysd/patch-1 
Update README.md
 2022-04-21 23:48:20 -04:00
Jaida Wu
198bdcc63c Update README.md 2022-04-22 11:46:55 +08:00
Magix
6e81dc3989 Update Grasscutter to v1.0.0 
Merge development into stable (and all the support hell that comes with it).
 2022-04-21 23:42:04 -04:00
Magix
4e1ea6abb6 Merge pull request #98 from MlgmXyysd/mongodb 
Integrate MongoDB into C2R
 2022-04-21 23:38:46 -04:00
Jaida Wu
725851f5a1 Allow configuration overrides 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 11:34:22 +08:00
Jaida Wu
b336d89962 Integrate MongoDB into C2R 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 11:33:54 +08:00
Jaida Wu
7bc944544d Make proxy daemon run imperceptibly 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 11:32:49 +08:00
Magix
1cf1a951dd Merge pull request #94 from Yazawazi/development 
Try to show characters' stories and voices
 2022-04-21 23:12:02 -04:00
Magix
fc45d08170 Merge pull request #93 from fengyuecanzhu/development 
add heal command
 2022-04-21 23:11:23 -04:00
Yazawazi
123fc263ba cache fetters 2022-04-22 10:39:25 +08:00
Magix
09c8ed34ee Changes for Morphia 2.x upgrade 
Morphia call fixes; add `@Entity` to more classes
 2022-04-21 22:26:41 -04: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
fengyuecanzhu
b31dab04eb change fhp to heal 2022-04-22 08:45:46 +08:00
Yazawazi
376c668dd9 no more NullPointerException pls 2022-04-22 08:30:02 +08:00
fengyuecanzhu
ff778914cb remove revive command 2022-04-22 08:26:48 +08:00
fengyuecanzhu
28db79876b add fullfp command 2022-04-22 08:08:47 +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
Magix
b09d8a2a4a Merge pull request #63 from JuliusPtolemy/main 
Update development readme
 2022-04-21 18:51:08 -04:00
Magix
a572097329 Merge branch 'development' into main 2022-04-21 18:50:57 -04:00
Melledy
16318b3793 Merge pull request #74 from 4Benj/development 
Server run modes and multi-server dispatch support
 2022-04-21 15:06:57 -07:00
Melledy
8b5d78557f Merge pull request #92 from Grasscutters/account-fix 
Fixes for the error in the revive command
 2022-04-21 14:48:18 -07:00
Melledy
04791b68be 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
e884970ac4 Merge branch 'development' into account-fix 2022-04-21 14:46:07 -07:00
Melledy
58535dd1ce Save config everytime you load so the new options show up 2022-04-21 14:44:55 -07:00
Melledy
db1c4cd462 Merge pull request #88 from alt3ri/development 
Added /revive command
 2022-04-21 14:05:09 -07:00
Melledy
5bef297df2 Merge pull request #90 from Grasscutters/account-fix 
Fix account dupe key error after selecting starting character
 2022-04-21 14:04:10 -07:00
Melledy
e10bad5b17 Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
alt3ri
abe05a9b5d Added /revive command 
Now it's more convenient to revive character without food :>
 2022-04-22 02:28:52 +07:00
Melledy
c8100394d9 Merge pull request #86 from alt3ri/patch-7 
Fix typo
 2022-04-21 11:47:30 -07:00
Melledy
4431469334 Merge pull request #84 from yarik0chka/development 
Add a changing weather id
 2022-04-21 11:47:13 -07:00
Melledy
3ae30e3c79 Merge pull request #87 from Yazawazi/development 
Teleport Small Fix
 2022-04-21 11:46:51 -07:00
Yazawazi
069cb1c6d3 Teleport Small Fix 2022-04-22 02:23:02 +08:00
alt3ri
452e89b4db 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 0e7976f906/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131) in scene folder there is a typo name "BinOutPut" it should be "BinOutput" so scene file can't be found." - [Yuki#4985](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
0480f10a1a Add a changing weather id 2022-04-21 22:21:24 +05:00
Benjamin Elsdon
23caf994c7 Forgot a dispatch prefix on error while merging 2022-04-22 01:15:05 +08:00
Benjamin Elsdon
9eca5123a5 Merge remote-tracking branch 'upstream/development' into development 2022-04-22 01:04:03 +08:00
Melledy
0e7976f906 Merge pull request #78 from MlgmXyysd/dispatch-refactor 
Refact dispatch server
 2022-04-21 09:03:53 -07:00
Jaida Wu
54856147ef Listens to all addresses by default 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:02:03 +08:00
Jaida Wu
d11413c017 Add dispatch server log prefix 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:02:02 +08:00
Jaida Wu
1143886b09 Add some log to dispatch server 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:02:00 +08:00
Jaida Wu
12674f6cec 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
23226ad464 Refact code 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:01:54 +08:00
Melledy
dccee2dfde 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
bf61d6fb10 Merge pull request #79 from zamlty/development 
Fix artifact & weapon generation by give command
 2022-04-21 09:00:30 -07:00
Melledy
bfdb0aa55d Merge pull request #81 from MlgmXyysd/list-command 
Add list command
 2022-04-21 08:59:07 -07:00
Melledy
edfcf1653a Merge pull request #82 from alt3ri/patch-6 
Update README.md
 2022-04-21 08:58:27 -07:00
alt3ri
d6377fb215 Update README.md 
Removed !sethp, added !setstats, !pos, !weather
 2022-04-21 22:45:02 +07:00
Benjamin Elsdon
beb8675190 Should probably remove this as well... 2022-04-21 23:04:02 +08:00