Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 10:55:56 +00:00
Code Issues Projects Releases Wiki Activity
271 Commits 7 Branches 22 Tags 133 MiB
a326581efd
Commit Graph

271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Elsdon
1969d38e06 DatabaseManager clean up 2022-04-21 22:50:06 +08:00
Benjamin Elsdon
77fcce6510 Fixed null pointer exception in game only mode 
PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.
 2022-04-21 22:38:01 +08:00
zamlty
bce3e256cf Fix artifact & weapon generation by give command 2022-04-21 22:21:39 +08:00
xmplay
77b33377d8 bring back the jade chamber and other old scene tags 2022-04-21 15:04:47 +01:00
Jaida Wu
e242e72b2d Drop independent log server 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-21 21:41:30 +08:00
Jaida Wu
b38d5b19bb Add port & SSL options to proxy script 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-21 21:41:07 +08:00
Benjamin Elsdon
1275592747 Fixed null pointer exception in hybrid mode. 2022-04-21 19:20:49 +08:00
Benjamin Elsdon
1500d2e885 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Benjamin Elsdon
9ce436022d Multi-server dispatch support and server run modes 2022-04-21 18:04:00 +08:00
Melledy
4c1dc34c1f Merge pull request #70 from Grasscutters/dev-fixes 
Dev fixes
 2022-04-21 00:31:01 -07:00
Melledy
bc07fa77b2 Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players 2022-04-21 00:29:06 -07:00
Melledy
29f6d77e2f Add config entry for OverseaLogPort (default: 8888) 2022-04-21 00:28:28 -07:00
Melledy
9cebd7be9a Merge pull request #69 from Grasscutters/dev-fixes 
Dev fixes
 2022-04-21 00:09:12 -07:00
Melledy
85453c4837 Merge pull request #67 from labalityowo/development 
Fix Ayaka and weapon banner titles not showing up
 2022-04-21 00:03:38 -07:00
labalityowo
1b1e272dac Fix Ayaka and weapon banner titles not showing up 2022-04-21 14:01:51 +07:00
Benjamin Elsdon
83fe5818dc Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Melledy
74bce2fe18 Merge pull request #66 from labalityowo/development 
Remove stella constellation appeareance in gacha pull
 2022-04-20 22:09:56 -07:00
Melledy
24b1fd2045 Merge pull request #65 from fengyuecanzhu/development 
args check for setstats command
 2022-04-20 22:05:58 -07:00
Melledy
fc6f2441d2 Merge pull request #64 from Yazawazi/development 
Scene points folder check
 2022-04-20 22:02:55 -07:00
Melledy
af1ecca963 More refactoring (player id -> player uid) 2022-04-20 21:50:33 -07:00
fengyuecanzhu
7fcaa97a6a add args check 2022-04-21 12:49:23 +08:00
labalityowo
2b0831b7de Remove the stella appearance 2022-04-21 11:42:21 +07:00
Melledy
b99ca4e02f Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries 2022-04-20 21:33:58 -07:00
Melledy
1250194480 Fix weapon skills (and artifact sets) not working when you equip them 2022-04-20 21:03:18 -07:00
fengyuecanzhu
f3ede17d4d change description 2022-04-21 11:52:53 +08:00
fengyuecanzhu
4ab12f418e add description and permission to setstats command 2022-04-21 11:43:31 +08:00
Yazawazi
f6df468e47 folder check 2022-04-21 10:37:24 +08:00
Melledy
8a8906098e Fix not being able to join friend's world 2022-04-20 18:48:26 -07:00
Melledy
7f2de4fab8 Fix player location updates in co-op 2022-04-20 18:44:02 -07:00
Melledy
b9876fc056 Fix water and the visual map in archipelago 2022-04-20 18:37:07 -07:00
JuliusP
708ee0214c Delete add-to-wiki directory 2022-04-21 08:57:32 +08:00
JuliusP
e100410d4e Update README.md 2022-04-21 08:56:15 +08:00
JuliusP
da8ee0c521 Merge branch 'Grasscutters:stable' into main 2022-04-21 08:52:29 +08:00
Melledy
1be01b5263 Update README.md 2022-04-20 16:14:46 -07:00
Melledy
1456cd9903 Merge pull request #61 from lunaticwhat/main 
resolved issue #56 and cleaned up readme
 2022-04-20 16:13:56 -07:00
KingRainbow44
415f22d956 Fix merge conflict 2022-04-20 18:55:01 -04:00
KingRainbow44
652a2154ce Magix sanity. 2022-04-20 18:48:24 -04:00
lunaticwhat
6d82016c17 resolved issue #56 and cleaned up readme 2022-04-21 05:40:53 +07:00
lunaticwhat
0812da181a gran 2022-04-21 05:37:16 +07:00
Melledy
a506117053 Merge pull request #60 from Yazawazi/development 
Adding a `Teleport to Waypoint` Function
 2022-04-20 14:31:14 -07:00
Yazawazi
ec438dc16e session send sorry 2022-04-21 04:59:42 +08:00
Melledy
8fe1ae3a17 Merge pull request #59 from alt3ri/patch-5 
Edited a bit
 2022-04-20 13:58:03 -07:00
Yazawazi
d470cf76d8 rsp sorry 2022-04-21 04:51:45 +08:00
alt3ri
d33ab09e5f Added Elemental Bonus 
Usage: /stats <epyro | ecryo | ehydro | egeo | edend | eelec | ephys> <amount> for elemental bonus
 2022-04-21 03:47:17 +07:00
Yazawazi
6f43c0765f teleports 2022-04-21 04:45:38 +08:00
alt3ri
d0529641b3 Adding Elemental DMG Bonus 
Added Elemental DMG Bonus command. 
> /stats <epyro | ecryo | ehydro | egeo | edend | eelec | ephys> <amount>
 2022-04-21 03:43:57 +07:00
Melledy
19572f46e3 Merge pull request #55 from memetrollsXD/development 
Custom Y position on MarkMapReq
 2022-04-20 12:36:42 -07:00
Magix
f35f76f372 Events, Gradle Update, and Gacha Reload 
Update gradle, Implemented live gacha reloading, and game server event buses
 2022-04-20 12:47:38 -04:00
Benjamin Elsdon
482c174ee7 Reload command now reloads gacha config (again) 2022-04-21 00:28:14 +08:00
Benjamin Elsdon
41b4965aef Merge remote-tracking branch 'upstream/development' 2022-04-21 00:25:47 +08:00