Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 04:48:05 +00:00
Code Issues Projects Releases Wiki Activity
531 Commits 7 Branches 22 Tags 133 MiB
63d0db376a
Commit Graph

531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Elsdon
63d0db376a Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
98bb7e9bc4 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
Melledy
34da64b462
Merge pull request #270 from Yazawazi/development 
Add `bless of moon` feature
 2022-04-26 16:39:57 -07:00
Benjamin Elsdon
2ed6fbc1da Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
8afdc90f58 cron expression comments 2022-04-27 07:19:30 +08:00
Yazawazi
00e88be464 comments del 2022-04-27 07:14:02 +08:00
Yazawazi
4d23d90252 comments 2022-04-27 07:08:33 +08:00
Yazawazi
ca3d8b44d1 Merge remote-tracking branch 'origin/development' into development 
# Conflicts:
#	src/main/java/emu/grasscutter/server/packet/send/PacketCardProductRewardNotify.java
 2022-04-27 07:02:38 +08:00
Yazawazi
619b84027f DateHelper 2022-04-27 07:01:05 +08:00
Yazawazi
d1036df34c
packet 2022-04-27 06:57:57 +08:00
Magix
7c0efccfe6
Merge pull request #254 from RealHeart/java-17 
Update README.md
 2022-04-26 18:46:16 -04:00
Magix
9f7c52c45e
Merge pull request #178 from BaiSugar/development 
Added command to get all items
 2022-04-26 18:45:08 -04:00
Yazawazi
f28926c645
del outerclass 2022-04-27 06:25:00 +08:00
Yazawazi
c3f25edff3
utils 2022-04-27 06:15:59 +08:00
Yazawazi
3ed20338ed
date helper 2022-04-27 06:12:35 +08:00
Yazawazi
383356deb0
Moon Card 2022-04-27 06:04:21 +08:00
WetABQ
b392849577
[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
30d4fec9d4
Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
KingRainbow44
9809b6b31d
Ignore gradle.properties 2022-04-26 11:14:39 -04:00
KingRainbow44
27378f0788
Publish to Maven central 2022-04-26 11:14:05 -04:00
Magix
7739fc1aeb
Merge pull request #262 from exzork/plugin-system 
load all classes from plugin
 2022-04-26 10:27:36 -04:00
muhammadeko
2bd470c574
load all classes from plugin 2022-04-26 19:45:23 +07:00
BaiSugar
0132ad66ab remove test avatar 2022-04-26 16:35:06 +08:00
Benjamin Elsdon
e142c62c44 Didn't mean to push the handbook 2022-04-26 16:06:28 +08:00
Benjamin Elsdon
a2b6633797 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
Melledy
aa4b65dbf1
Merge pull request #256 from Grasscutters/dev-entity 
Implement natural spawns
 2022-04-26 00:40:53 -07:00
KingRainbow44
9fd5aef687
Add more events 2022-04-26 02:07:00 -04:00
KingRainbow44
3f8e1ea9d2
Reimplement the region list event 2022-04-26 00:45:42 -04:00
KingRainbow44
9ee8974fea
Begin on plugin API 2022-04-26 00:39:43 -04:00
KingRainbow44
f176408d41
Bug fix & Cleanup 2022-04-26 00:39:30 -04:00
KingRainbow44
779ea8cdb1
Fix command issue 2022-04-26 00:39:05 -04:00
真心
461cdf8f84
Update README.md 2022-04-26 12:37:14 +08:00
KingRainbow44
9af4cc2446
Refactor classes 2022-04-26 00:04:03 -04:00
Benjamin Elsdon
028c7e5604 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 11:59:16 +08:00
Benjamin Elsdon
7015905991 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
658c050873 Merge branch 'dev-entity' of https://github.com/Grasscutters/Grasscutter into dev-entity 2022-04-25 14:39:07 -07:00
Melledy
459d3c2699 Add getter for DispatchServer's HttpServer 2022-04-25 14:34:37 -07:00
Melledy
f0ae673091 Fix concurrency related error while spawning monsters 2022-04-25 14:28:45 -07:00
Melledy
2b75cda6df Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
080fdeeef6 Synchronize scene entity map 2022-04-25 14:28:45 -07:00
Melledy
a9b7a5a5f6 Make monsters scale off world level 2022-04-25 14:28:45 -07:00
Melledy
b0322fa3e5 Dont deregister scenes if the player is going to tp back into them 2022-04-25 14:28:44 -07:00
Melledy
3b414cda38 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
Melledy
cdfa78a62c Fix concurrency related error while spawning monsters 2022-04-25 14:27:54 -07:00
Melledy
b6300cafec Call checkSpawns from World instead of from Player 2022-04-25 14:12:35 -07:00
Magix
adb1831155
Merge pull request #232 from RealHeart/java-17 
Update Java to 17
 2022-04-25 17:09:46 -04:00
Magix
0022818508
Merge pull request #135 from Grasscutters/plugin-system 
Implement a plugin system
 2022-04-25 17:08:38 -04:00
Magix
b857601b78
Merge branch 'development' into plugin-system 2022-04-25 17:08:18 -04:00
Melledy
803ad40821 Synchronize scene entity map 2022-04-25 13:59:42 -07:00
xtaodada
dbb7350f6f Support kill from console 2022-04-25 11:01:18 -07:00