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

910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KingRainbow44
362cfe1e7b Ensure we have a fallback for localization 2022-05-06 18:57:49 -04:00
KingRainbow44
f39cc9e01f Add the zh-TW language. 2022-05-06 18:56:19 -04:00
KingRainbow44
647922ff01 Add the en-US language. 2022-05-06 18:50:43 -04:00
KingRainbow44
b3a917007b Convert to the superior language system. (pt. 3) 2022-05-06 18:50:18 -04:00
gentlespoon
58cb60299c Fix #593: Accidental death of character 2022-05-06 15:22:00 -07:00
gentlespoon
3f91fdcb71 Allow walking away from the statue within 2.5s to stop auto heal. 2022-05-06 14:49:33 -07:00
wulf
542a3cfc9b fix scence block loading bug 2022-05-06 13:43:42 -07:00
Scald
afa3747fad Add config option to change console server's signature, namecard, level and world level (#586) 
* Add files via upload

* Add files via upload

* Update GameConstants.java

* Update Config.java

* Update PacketGetPlayerFriendListRsp.java
 2022-05-06 13:41:29 -07:00
cfuncode
0152b146c5 Improved fault tolerance for json file deserialization (#595) 
* 修复一个Gson发序列化json文件的空值问题

* Improved fault tolerance for json file deserialization
 2022-05-06 13:39:37 -07:00
Melledy
ad84635540 Merge pull request #594 from Akka0/tower 
Tower Dungeons Handoff between levels
 2022-05-06 13:37:30 -07:00
Kinesis
8abd3ace6c Implement Avatar Expedition System 
Co-Authored-By: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com>
Co-Authored-By: KanyeWestc <104547412+KanyeWestc@users.noreply.github.com>
Co-Authored-By: QAQ 天小络 <72185326+XTL676@users.noreply.github.com>
Co-Authored-By: nkxingxh <25559053+nkxingxh@users.noreply.github.com>
Co-Authored-By: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Co-Authored-By: wuwuwu223 <81224214+wuwuwu223@users.noreply.github.com>
Co-Authored-By: omg-xtao <100690902+omg-xtao@users.noreply.github.com>
Co-Authored-By: Sakura <104815797+Sakura@users.noreply.github.com>
Co-Authored-By: NewNeko-2022 <104819344+NewNeko-2022@users.noreply.github.com>
Co-Authored-By: JimWails <30657653+JimWails@users.noreply.github.com>
Co-Authored-By: buttercookies <19878609+ButterCookies@users.noreply.github.com>
 2022-05-06 13:28:26 -07:00
Muhammad Eko Prasetyo
deee32a0a1 add config option to enable cors for dispatchserver (#579) 2022-05-06 13:23:26 -07:00
Akka
f2231349bd a little fix 2022-05-07 00:31:48 +08:00
Akka
ff0e1c64cd Merge pull request #3 from Akka0/development 
Development
 2022-05-07 00:19:59 +08:00
Akka
c2d2a37fc5 Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
a7312ce054 Merge pull request #2 from Grasscutters/development 
Development
 2022-05-07 00:17:08 +08:00
Akka
17242a24ed Add some lua functions 2022-05-07 00:15:23 +08:00
Akka
b58bcda0c8 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
Bwly999
6149c6f0e3 Merge branch 'development' of github.com:Grasscutters/Grasscutter into development 2022-05-06 22:38:04 +08:00
4Benj_
3ede7523b0 Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582) 2022-05-06 15:48:16 +02:00
gentlespoon
2e68578525 The statues will now automatically regen their HP volume over time. 
Max is currently set to 85000 for everyone. Will update after implementing statue levels.
 2022-05-06 03:26:38 -07:00
Bwly999
2d325e1847 fix the problem that the reference of serverHook in Plugin object is null 2022-05-06 18:16:07 +08:00
Melledy
b760fb1b26 Fix morphia error when saving player to db 2022-05-06 01:19:39 -07:00
Melledy
000b10983b Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 01:17:19 -07:00
Melledy
796201e8b7 Remove the red exclamation mark from achievements 2022-05-06 01:17:16 -07:00
gentlespoon
221668570e fix: lower logging level in SotSManager 2022-05-06 00:49:08 -07:00
gentlespoon
198214ec53 Implementes auto HP recovery at the statues. 
- Respects player setting.
- SP + MP.
- Statue has unlimited HP volume (to be updated)
 2022-05-06 00:17:18 -07:00
Akka
2ad6f5934b Add @Transient for temporary team 2022-05-06 00:12:33 -07:00
Akka
c912b8d857 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
Akka
f683b222fc Add @Transient for temporary team 2022-05-06 14:46:10 +08:00
gentlespoon
93b3265d72 Add drowning. Better movement ticking. 2022-05-05 23:42:34 -07:00
Akka
833ea1b791 Merge pull request #1 from Akka0/development 
Updated
 2022-05-06 14:16:44 +08:00
Akka
3d3f36cf56 Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
KingRainbow44
c0b1ec1b9e Convert to the superior language system. (pt. 2) 2022-05-06 00:57:45 -04:00
KingRainbow44
7a084100c6 Convert to the superior language system. (pt. 1) 2022-05-05 23:57:55 -04:00
memetrollsXD
81998b9cf9 Customise sender and title too. Add statement of use 2022-05-05 19:49:28 -07:00
Melledy
a045142a41 Kick player if they use an invalid resources folder 2022-05-05 17:17:27 -07:00
ShiroSaki
b2955274ab Add all AvatarExpedition protos 
Expedition system has almost done but still has some bug so it will be uploaded later
 2022-05-05 16:52:48 -07:00
gentlespoon
bafde8693d Fixes #529: fixed stamina abnormal. added fall to death. 
Stamina is still WIP.
- Currently stamina consumption is not affected by the use of foods, talents, or the environment.
- Charged attacks do no require stamina yet.
- Will be fixed tomorrow.
 2022-05-05 15:37:15 -07:00
Ljzd-PRO
224a60de1b Change the usage of command permission in README.md (#557) 
* Change the command `permission` usage

* Change the command `permission` usage
 2022-05-05 22:32:09 +02:00
Scirese
128f767002 Update CNLanguage to match with the latest EN version 2022-05-05 09:03:23 -07:00
Akka
3f34aa0460 Support of Enter Room Scene 2022-05-05 09:02:54 -07:00
Benjamin Elsdon
782c9bfb6b No misleading 404 error 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
db1ddd0630 I honestly don't know what happened.... 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
3395c76dbc Removed GCStatic. Cleaned up GachaRecordHandler. 2022-05-05 09:02:10 -07:00
Akka
a21fc116ee Support of Enter Room Scene 2022-05-05 22:00:11 +08:00
Luke H-W
15dca5a04d GiveCommand: fix edge case with unspaced multiple args (#539) 
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-05 15:23:48 +02:00
66Leo66
6b81b888a1 Allow overriding config with ENV (#506) 
Allow overriding config with ENV (handy when running with docker or debugging without modifying script)
Also log proxy config for easier debugging (when sharing screenshots)
 2022-05-05 15:22:29 +02:00
Melledy
e693612ed1 Fix clear command causing a concurrency error 2022-05-05 02:29:43 -07:00
Melledy
3ee619a1d7 Remove link to personal site 2022-05-05 00:16:39 -07:00