Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-05 01:45:29 +00:00
Code Issues Projects Releases Wiki Activity
671 Commits 7 Branches 22 Tags 136 MiB
ba97dfe7d9
Commit Graph

446 Commits

Author SHA1 Message Date
memetrollsXD
31764fe5d9 Merge branch 'development' into startMail 2022-04-28 22:45:23 +02:00
memetrollsXD
5c02fee7e2 Customisable welcome mail 2022-04-28 22:42:59 +02:00
Kengxxiao
fcb4894387 fix shop config issue 2022-04-28 13:30:50 -07:00
Kengxxiao
275fcc7dd6 shop improvement 2022-04-28 13:30:50 -07:00
Kengxxiao
0559cc4e0b official shop support 2022-04-28 13:30:50 -07:00
Kengxxiao
027bd28afb Add command /coop and /tpall 2022-04-28 21:23:20 +02:00
ayy lmao
0c02ce9f63 Implement HandlerVehicleInteractReq & Rsp and HandlerVehicleSpawnReq & Rsp 
Also added opcodes related to vehicles, added LODPatternName to GadgetData and added EntityVehicle class
 2022-04-28 21:21:08 +02:00
omg-xtao
31b0dd30e2 Ignore item not found error 2022-04-28 08:43:17 -07:00
Melledy
53cc1822f6 Implement dungeon entry 2022-04-28 08:20:37 -07:00
Kengxxiao
9133742eb0 fix companionship exp 
my IDEA lint is not happy on my change
 2022-04-28 06:50:37 -07:00
Kengxxiao
7bacd8ab70 do not save virtual item 2022-04-28 06:50:37 -07:00
Kengxxiao
ed98ab152d fix exp drop issue 2022-04-28 06:50:37 -07:00
BaiSugar
a5601e8409 Update the command format of the usage (including source code) 2022-04-28 13:47:32 +02:00
Melledy
9d75c25085 Fix missing player tick function 2022-04-27 19:37:25 -07:00
Melledy
d3925e8c6e Merge pull request #318 from Yazawazi/development 
Implementing the `Player Show Avatars`
 2022-04-27 15:50:53 -07:00
memetrollsXD
96dbc2fbfd God damn forgot I was in java for a sec 2022-04-27 15:42:25 -07:00
memetrollsXD
b80b8aedd9 Remove default permissions from account command 2022-04-27 15:42:25 -07:00
memetrollsXD
eaf2982ebc Apply to account command 2022-04-27 15:42:25 -07:00
memetrollsXD
0c665d940e Add default permissions 2022-04-27 15:42:25 -07:00
Yazawazi
0cbfcddae4 Should be OK 2022-04-28 06:40:25 +08:00
memetrollsXD
28a0844860 God damn forgot I was in java for a sec 2022-04-28 00:30:04 +02:00
memetrollsXD
8d332614b7 Remove default permissions from account command 2022-04-28 00:28:16 +02:00
memetrollsXD
90df06edd7 Apply to account command 2022-04-28 00:18:59 +02:00
memetrollsXD
5e9f497614 Add default permissions 2022-04-28 00:10:46 +02:00
Yazawazi
02ce62422f kill me plz 2022-04-28 03:46:24 +08:00
Yazawazi
982cbbe5d2 no headimage okay 2022-04-28 03:45:17 +08:00
Yazawazi
e55160dad6 Headimage 2022-04-28 03:40:32 +08:00
Yazawazi
363dae9fa6 Next time I'll never use github.dev again 2022-04-28 03:37:09 +08:00
Yazawazi
9092c9b3f9 import 2022-04-28 03:31:36 +08:00
Yazawazi
f16d33b413 Player show avatar list 2022-04-28 03:21:51 +08:00
Melledy
f6db39926d Fix co-op requests not showing up 2022-04-27 11:23:33 -07:00
Melledy
10e5851a59 Add message about the server being free 2022-04-27 11:23:33 -07:00
Melledy
555937d2aa Fixed concurrency issue in killall 2022-04-27 11:23:33 -07:00
Melledy
8bf17a8bdc Fixed genesis crystals not being given to player 2022-04-27 11:23:33 -07:00
Melledy
1586bab5d7 Gacha banner tweaks 
Removed min/maxItemType
Added configurable base weight values for banners
 2022-04-27 11:23:33 -07:00
Melledy
1130138a4f Fix internal server error when changing characters 2022-04-27 11:23:33 -07:00
Yazawazi
2ba16cf8b2 comment & mooncard 2022-04-27 08:42:48 -07:00
Yazawazi
32d322b0be onEnable & onDisable 2022-04-27 08:42:48 -07:00
Yazawazi
5b6ecc7219 Task Improvement 2022-04-27 08:42:48 -07:00
Kengxxiao
669e58d9f3 Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
ee3a0c32fc use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
3e0ccbbbde implement npc shop 2022-04-27 07:35:31 -07:00
ayy lmao
0e3a80407e Added missing isGiftMail section to GetAllMailRsp 2022-04-27 15:11:57 +02:00
Kengxxiao
57e408012b reset drop table in reload command 2022-04-27 17:44:12 +08:00
Kengxxiao
8b614d8df8 implement simple drop system 2022-04-27 17:42:02 +08:00
Melledy
d1fc8c1faa Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
1c36f0785b Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Melledy
6b8902bee2 Deprecate getServer() in DispatchServer, use getHttpServer() instead 2022-04-26 21:27:35 -07:00
Melledy
9afa32928a Cleanup https server creation in dispatch server 2022-04-26 21:27:35 -07:00
Melledy
cdb08195ee Fix cherry pick issues from drown packets 2022-04-26 21:27:35 -07:00
TheLostTree
a0ed13182c git doesnt like me 2022-04-26 21:27:35 -07:00
TheLostTree
687bc7ce87 drowning added 2022-04-26 21:27:35 -07:00
Melledy
d81895543f Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
4420918f9c Rename handler 2022-04-26 21:27:35 -07:00
Melledy
7cf0e448cd World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
9b7293272b Fix white screen after logging in 2022-04-26 21:27:35 -07:00
Benjamin Elsdon
cebc140228 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
Benjamin Elsdon
0917f516ea Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
ed3f88f013 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
Melledy
2935f0a6d3 Merge pull request #270 from Yazawazi/development 
Add `bless of moon` feature
 2022-04-26 16:39:57 -07:00
Benjamin Elsdon
b9f7c657ac Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
aa4b88d762 cron expression comments 2022-04-27 07:19:30 +08:00
Yazawazi
e8b34b6179 comments del 2022-04-27 07:14:02 +08:00
Yazawazi
ac796675f2 comments 2022-04-27 07:08:33 +08:00
Yazawazi
420f544d68 DateHelper 2022-04-27 07:01:05 +08:00
Magix
71524b0b66 Merge pull request #178 from BaiSugar/development 
Added command to get all items
 2022-04-26 18:45:08 -04:00
Yazawazi
aab6627203 del outerclass 2022-04-27 06:25:00 +08:00
Yazawazi
49854e4514 utils 2022-04-27 06:15:59 +08:00
Yazawazi
43470a384d date helper 2022-04-27 06:12:35 +08:00
Yazawazi
748e64a60c Moon Card 2022-04-27 06:04:21 +08:00
WetABQ
addfb5eb5d [BREAKING CHANGE] proto auto compiled by gradle (#226) 
* [BREAK] proto auto compiled by gradle

* [BREAK] move proto to submodule

* update gitmodules

* [BREAK] move proto to submodule

* move proto to submodule

* fix merge conflict

* fix github action after merging

* fix merge conflicts and del submodule

* upload the proto
 2022-04-26 14:44:30 -07:00
Magix
627a2f1ee8 Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
Magix
fe055af5e0 Merge pull request #262 from exzork/plugin-system 
load all classes from plugin
 2022-04-26 10:27:36 -04:00
muhammadeko
9fb5b69ddd load all classes from plugin 2022-04-26 19:45:23 +07:00
BaiSugar
3c5f3d4157 remove test avatar 2022-04-26 16:35:06 +08:00
Benjamin Elsdon
3db1a86609 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
KingRainbow44
e27bdd9bb6 Add more events 2022-04-26 02:07:00 -04:00
KingRainbow44
502fe7ed13 Reimplement the region list event 2022-04-26 00:45:42 -04:00
KingRainbow44
e681453a15 Begin on plugin API 2022-04-26 00:39:43 -04:00
KingRainbow44
d23050ffa5 Bug fix & Cleanup 2022-04-26 00:39:30 -04:00
KingRainbow44
2369f92cb4 Fix command issue 2022-04-26 00:39:05 -04:00
KingRainbow44
03988414ce Refactor classes 2022-04-26 00:04:03 -04:00
Benjamin Elsdon
a2069c0084 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 11:59:16 +08:00
Benjamin Elsdon
a5677a8e34 Improvements and send all mail fix 
Mail ID no longer exists and is handled by it's position in the mail array
 2022-04-26 11:57:55 +08:00
Melledy
b2f1142116 Add getter for DispatchServer's HttpServer 2022-04-25 14:34:37 -07:00
Melledy
614477181f Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2228332f9d Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
c3f9fd3ce3 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
1c691748f5 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
f28f21b061 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
711e6eabd0 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Magix
dce13cf6af Merge branch 'development' into plugin-system 2022-04-25 17:08:18 -04:00
xtaodada
b6fedcf262 Support kill from console 2022-04-25 11:01:18 -07:00
xtaodada
dc6702eb5c Add a new alias to the command killcharacter 2022-04-25 11:01:18 -07:00
xtaodada
00a40a84bb Add killcharacter command 2022-04-25 11:01:18 -07:00
alt3ri
5dd5f70903 Merged /clearartifacts and /clearweapons 
I merged ClearArtifactsCommand and ClearWeaponsCommand to ClearCommand with UID parameter. Still no send from console cuz I forgor 💀
Usage: /clear <wp | art | mat | all> [uid]
 2022-04-25 11:00:10 -07:00
alt3ri
56eb711055 Delete ClearArtifactsCommand.java 2022-04-25 11:00:10 -07:00
alt3ri
c1ef679e30 Delete ClearWeaponsCommand.java 2022-04-25 11:00:10 -07:00
Benjamin Elsdon
c68c75e8ce Send Mail Command! 
Almost done! Wooooo!
 2022-04-25 21:53:10 +08:00
Benjamin Elsdon
e30352a667 Forgot to implement levels into GetMailItemRsp 
Also added promoteLevels
 2022-04-25 16:42:56 +08:00