Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 03:53:50 +00:00
Code Issues Projects Releases Wiki Activity
2,261 Commits 7 Branches 22 Tags 136 MiB
564e4e496b
Commit Graph

2261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
KingRainbow44
0a96012f2c why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04: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
KingRainbow44
b902fa6f48 Fix command detection 2022-04-20 23:56:27 -04: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
KingRainbow44
d7328dda50 Update Morphia to 2.x 2022-04-20 21:11:57 -04: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
KingRainbow44
757b9c9d02 Merge branch 'MlgmXyysd-patch-1' into development 2022-04-20 12:18:18 -04:00
KingRainbow44
69aa6130e9 Fix command map 2022-04-20 12:17:56 -04:00
memetrollsXD
d5d9056452 Custom Y position on MarkMapReq 2022-04-20 17:55:33 +02:00
Melledy
6e14676abf Merge pull request #54 from Grasscutters/auto-account 
Fix permission issues when new users create an account
 2022-04-20 07:53:24 -07:00
Melledy
1ed04d32cf Fix account not found issue when logging in 2022-04-20 07:51:00 -07:00
Benjamin Elsdon
cb104ac79a Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 21:38:59 +08:00
Melledy
cff73cd6b9 Merge pull request #52 from iTruth/development 
Fix playerOpt is always throw an exception when it's null
 2022-04-20 06:25:00 -07:00
Jaida Wu
4d8a16ece8 Add setstats command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:15:37 +08:00
iTruth
de0a14a589 Fix playerOpt is always throw an exception when it's null 2022-04-20 21:14:18 +08:00
Jaida Wu
54faab8f0d Add restart command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:06:59 +08:00