Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-28 08:30:30 +00:00
Code Issues Projects Releases Wiki Activity
2,336 Commits 7 Branches 22 Tags 133 MiB
d5756f2559
Commit Graph

100 Commits

Author SHA1 Message Date
KingRainbow44
19d81463bc Merge remote-tracking branch 'origin/development' into development 2022-06-26 12:33:03 -04:00
KingRainbow44
3447d5e91e Change 'injectGitHash' task to properly format 'BuildConfig' 2022-06-26 12:22:10 -04:00
AnimeGitB
40dcde66e4 Add more lombok to keep VSCode happy 2022-06-25 22:19:29 -07:00
Magix
3585fd597b Merge branch 'development' into plugin-priority 2022-06-23 00:06:31 -04:00
Benj
b5c6b4795e Set up publishing to 4benj-maven for dev builds 2022-06-22 19:23:51 +08:00
KingRainbow44
aa43943025 Bump server version 2022-06-22 00:21:12 -04:00
Melledy
30c7bb9443 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Akka
e16633e34b Implement the Home System (Serenitea Pot) 2022-06-17 18:15:49 -07:00
Magix
93d49a7a2c Change the version to 1.2.1-dev 2022-06-10 15:56:38 -04:00
Akka
5a3e9bc34e Fixed excessive memory usage of Spatial Index 2022-05-25 00:42:52 -07:00
Akka
593de83847 optimized the lua serializer 2022-05-16 21:30:04 -07:00
Akka
6dc30e4def Enable script in big world (#884) 
* add docs for tower

* fix: LEAK: ByteBuf.release() was not called

* enableScriptInBigWorld

* not print log when loaded scripts from cache

* revert the change of server tick

* revert the change of server tick

* fix

* optimize the performance: lazy load & cache

* fix the refresh group

* fix NPE

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-15 04:19:24 -07:00
KingRainbow44
a2ff8c8470 Merge development into plugin-auth 2022-05-14 12:08:33 -04:00
KingRainbow44
0b21a43900 Update project to 1.1.2-dev 2022-05-13 11:37:49 -04:00
KingRainbow44
e131c3c5ed Add lombok 2022-05-13 11:37:17 -04:00
Hotaru
f441d0665a Allow to override final jar filename using project property 2022-05-12 14:54:27 -07:00
mingjun97
c105c71e53 Fix building error 2022-05-11 11:52:56 -07:00
mingjun97
41de6bd229 Make injectGitHash as a task 2022-05-11 11:52:56 -07:00
mingjun97
170db70b6f Fix github action build issue 
* Move `BuildConfig.java` from `/src/generated`to `/src/main` to accomplish the building pipeline

* Add BuildConfig.java to the .gitignore
 2022-05-11 11:52:56 -07:00
mingjun97
a77ae0bc3c Introduce -version argument to display version 2022-05-11 11:52:56 -07:00
真心
01a33906d3 Update build.gradle 2022-05-09 23:15:01 -07:00
Akka
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Magix
1beddf16c1 Update build.gradle (in prep for 1.1.0) 2022-05-07 18:17:32 -04:00
KingRainbow44
7a084100c6 Convert to the superior language system. (pt. 1) 2022-05-05 23:57:55 -04:00
Presiareen
050784dfab improve server side command line input (#415) 
* improve server side command line input

* prevent multiline logs from covering typed commands

* reduce text in console

* resolve conflicts caused by multilanguage

Co-authored-by: Magix <kobedo11@gmail.com>
 2022-05-03 14:44:52 +02:00
krrr
5b6da38160 avoid compile error caused by encoding 2022-05-02 22:05:21 -07:00
KingRainbow44
19e59bf2e0 Change to xyz.grasscutters from tech.xigam as publish group id 2022-05-01 20:14:47 -04:00
KingRainbow44
5f0c9203fa Fix SLF4j issue 2022-04-30 20:37:43 -04:00
KingRainbow44
1908a9fd92 Update to 1.0.3-dev 2022-04-30 18:02:19 -04:00
Magix
be507310a5 Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
KingRainbow44
a82ec3e328 Update to 1.0.2-dev 2022-04-30 16:11:35 -04:00
Benjamin Elsdon
947d3e5745 Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
KingRainbow44
4db1724d06 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
 2022-04-29 19:31:33 -04:00
Melledy
d71b7abfc3 Implement script support needed for dungeons 
Only a few are supported right now
You will need certain script files in ./resources/Scripts
 2022-04-28 22:19:14 -07:00
KingRainbow44
d32f706cf3 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java
 2022-04-27 14:05:34 -04:00
Melledy
0387992c42 Fix eclipse gradle support 2022-04-26 21:27:35 -07: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
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
KingRainbow44
35ff35039b Fix Javadoc & Update version 2022-04-26 14:08:48 -04:00
Magix
627a2f1ee8 Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
KingRainbow44
c9299d8444 Publish to Maven central 2022-04-26 11:14:05 -04:00
Melledy
711e6eabd0 Natural spawn test 
(without luas)
 2022-04-25 14:28:44 -07:00
真心
f78e018029 Update Java to 17 2022-04-25 16:55:21 +08:00
雪碧
46d89f5f5c Update build.gradle 
fix three cve.
 2022-04-24 21:32:48 +08:00
KingRainbow44
0a96012f2c why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04:00
KingRainbow44
d7328dda50 Update Morphia to 2.x 2022-04-20 21:11:57 -04:00
Benjamin Elsdon
d59799ce55 Update gradle + Work gacha reload (gs broken atm) 2022-04-20 16:05:53 +08:00
Melledy
7925d1cda3 Initial commit 2022-04-17 05:43:07 -07:00