Commit Graph

41 Commits

Author SHA1 Message Date
BaiSugar
2074933e96 Add the god statue's blood return display and stamina system (#520)
* Fix announcement display

* Approaching StatuesOfTheSeven will restore all health of the current team

* Added god statue's blood return display and stamina system

* fix error

fix error

* fix file
2022-05-04 11:45:20 -07:00
Melledy
c930c637e4 Add languages folder to config as well 2022-05-03 03:19:43 -07:00
方块君
0eab44f51f Add multilingual support
Add multilingual support
2022-05-03 02:38:37 -07:00
Melledy
10bfb6976d Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Magix
be507310a5 Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
Benjamin Elsdon
947d3e5745 Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
筱傑
7b991d7b4e Update Welcome Mail Items Type (#369) 2022-04-30 11:46:23 +02:00
omg-xtao
7fdf74986c Merge branch 'development' into tp 2022-04-29 21:38:45 +08:00
xtaodada
eaed1aa038 Change NickName to ServerNickname 2022-04-29 19:37:51 +08:00
xtaodada
62f0be4966 Support custom server in-game nickname 2022-04-29 18:59:24 +08:00
xtaodada
0136425628 Support custom server avatar 2022-04-29 18:04:20 +08:00
Melledy
60cfa40d7f Merge branch 'development' into dungeon-scripts 2022-04-28 22:21:26 -07: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
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
275fcc7dd6 shop improvement 2022-04-28 13:30:50 -07:00
Kengxxiao
0559cc4e0b official shop support 2022-04-28 13:30:50 -07:00
memetrollsXD
0c665d940e Add default permissions 2022-04-27 15:42:25 -07:00
memetrollsXD
5e9f497614 Add default permissions 2022-04-28 00:10:46 +02:00
KingRainbow44
3ba8c42b42 Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
KingRainbow44
e3d6b86dd9 Basic plugin manager 2022-04-22 21:45:44 -04:00
xtaodada
4605c6506e Add PublicPort field to server 2022-04-23 01:42:04 +08:00
xtaodada
104d10352b Add PublicPort field to Dispatch server 2022-04-23 01:16:55 +08:00
Jaida Wu
e02917a527 Add FrontHTTPS field to Dispatch server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 21:25:58 +08:00
Benjamin Elsdon
9eca5123a5 Merge remote-tracking branch 'upstream/development' into development 2022-04-22 01:04:03 +08:00
Jaida Wu
54856147ef Listens to all addresses by default
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:03 +08:00
Jaida Wu
23226ad464 Refact code
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:54 +08:00
Jaida Wu
e242e72b2d Drop independent log server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 21:41:30 +08:00
Benjamin Elsdon
1500d2e885 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Benjamin Elsdon
9ce436022d Multi-server dispatch support and server run modes 2022-04-21 18:04:00 +08:00
Melledy
29f6d77e2f Add config entry for OverseaLogPort (default: 8888) 2022-04-21 00:28:28 -07:00
Benjamin Elsdon
83fe5818dc Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Benjamin Elsdon
22781ac6e7 Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 17:18:51 +08:00
Benjamin Elsdon
d59799ce55 Update gradle + Work gacha reload (gs broken atm) 2022-04-20 16:05:53 +08:00
KingRainbow44
f58c590aa3 Add config option 2022-04-20 00:10:32 -04:00
Melledy
06a50365d1 Merge branch 'dev-scene' 2022-04-19 04:12:53 -07:00
Melledy
d9fc159550 Refactor some commands and move inventory/team limits to the config 2022-04-19 02:22:21 -07:00
naufal
0ff6ea427a feat: added configuration for change upload port
feat: added configuration for use non SSL
2022-04-19 11:49:08 +07:00
ayy lmao
f769ef1858 Add support for specifying a Public IP 2022-04-18 12:10:39 +03:00
KingRainbow44
8b5f7dd06f Refactor existing code 2022-04-18 01:11:27 -04:00
Melledy
7925d1cda3 Initial commit 2022-04-17 05:43:07 -07:00