Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-05 03:03:31 +00:00
Code Issues Projects Releases Wiki Activity
1,033 Commits 7 Branches 22 Tags 136 MiB
226a29f7c2
Commit Graph

1033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yazawazi
ac796675f2 comments 2022-04-27 07:08:33 +08:00
Yazawazi
a12309710f 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
420f544d68 DateHelper 2022-04-27 07:01:05 +08:00
Yazawazi
44f8d9d47b packet 2022-04-27 06:57:57 +08:00
Magix
782618cdca Merge pull request #254 from RealHeart/java-17 
Update README.md
 2022-04-26 18:46:16 -04: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
Melledy
79c34fc868 Merge pull request #233 from lunaticwhat/templates 
issue and pr template updated.
 2022-04-26 13:09:22 -07:00
KingRainbow44
46d897ac92 Fix handlers 2022-04-26 14:09:00 -04:00
KingRainbow44
35ff35039b Fix Javadoc & Update version 2022-04-26 14:08:48 -04:00
KingRainbow44
82bca7a612 Overhaul event handling (designed by WetABQ#3417) 2022-04-26 13:52:10 -04:00
Magix
33426fb7a4 Merge pull request #263 from Grasscutters/development 
Update API branch
 2022-04-26 11:17:20 -04:00
Magix
627a2f1ee8 Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
KingRainbow44
444270fd9c Ignore gradle.properties 2022-04-26 11:14:39 -04:00
KingRainbow44
c9299d8444 Publish to Maven central 2022-04-26 11:14:05 -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
eb49580757 Didn't mean to push the handbook 2022-04-26 16:06:28 +08:00
Benjamin Elsdon
3db1a86609 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
Melledy
57c7c704ee Merge pull request #256 from Grasscutters/dev-entity 
Implement natural spawns
 2022-04-26 00:40:53 -07: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
真心
f74b95aa71 Update README.md 2022-04-26 12:37:14 +08: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
297db2ad33 Merge branch 'dev-entity' of https://github.com/Grasscutters/Grasscutter into dev-entity 2022-04-25 14:39:07 -07: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
Melledy
0ea3edb73b Fix concurrency related error while spawning monsters 2022-04-25 14:27:54 -07:00
Melledy
5f4afc8ee9 Call checkSpawns from World instead of from Player 2022-04-25 14:12:35 -07:00
Magix
c4bdcc387c Merge pull request #232 from RealHeart/java-17 
Update Java to 17
 2022-04-25 17:09:46 -04:00
Magix
a505b041f2 Merge pull request #135 from Grasscutters/plugin-system 
Implement a plugin system
 2022-04-25 17:08:38 -04:00
Magix
dce13cf6af Merge branch 'development' into plugin-system 2022-04-25 17:08:18 -04:00
Melledy
d6544d123a Synchronize scene entity map 2022-04-25 13:59:42 -07: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