Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-20 19:04:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
885 Commits 7 Branches 22 Tags
cc104a6a1f0adfc1759e6a0a4e75527325588a19
Commit Graph

279 Commits

Author SHA1 Message Date
Melledy
4cf4d37738 Move server profile away from GameConstants 2022-05-06 19:16:36 -07:00
KingRainbow44
a93371a0d0 Fix for translation errors 2022-05-06 21:52:10 -04:00
Magix
217166822b Merge branch 'development' into development 2022-05-06 21:08:19 -04:00
KingRainbow44
e6cb97a437 Bug fixes 2022-05-06 21:04:39 -04:00
Bwly999
c5bf5ecd69 roll back to timer 2022-05-07 08:00:31 +08:00
KingRainbow44
80c9119ca2 Merge development into localization 2022-05-06 19:40:32 -04:00
KingRainbow44
438f845e3a Convert to the superior language system. (pt. 3) 2022-05-06 18:50:18 -04:00
gentlespoon
1d4a41fd61 Allow walking away from the statue within 2.5s to stop auto heal. 2022-05-06 14:49:33 -07:00
Scald
c4e11088da 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
Melledy
6d89477120 Merge pull request #594 from Akka0/tower 
Tower Dungeons Handoff between levels
 2022-05-06 13:37:30 -07:00
Kinesis
19a2c9b7ea 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
63a37acc1b add config option to enable cors for dispatchserver (#579) 2022-05-06 13:23:26 -07:00
Akka
321a2a3537 Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
6144f47127 Tower Dungeons Handoff between level and floor 2022-05-07 00:11:54 +08:00
Bwly999
613366516d Merge branch 'development' of github.com:Grasscutters/Grasscutter into development 2022-05-06 22:38:04 +08:00
4Benj_
da99140d20 Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582) 2022-05-06 15:48:16 +02:00
gentlespoon
0102a3ce1e 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
98e1189deb fix the problem that the reference of serverHook in Plugin object is null 2022-05-06 18:16:07 +08:00
Melledy
5968ed3a71 Remove the red exclamation mark from achievements 2022-05-06 01:17:16 -07:00
gentlespoon
39c932b041 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
696f629080 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
gentlespoon
744aa478a9 Add drowning. Better movement ticking. 2022-05-05 23:42:34 -07:00
Akka
7d51e0deb5 Merge pull request #1 from Akka0/development 
Updated
 2022-05-06 14:16:44 +08:00
Akka
d32d4014cd Choose Avatar & Enter Tower 2022-05-06 14:10:23 +08:00
KingRainbow44
f7311968d6 Convert to the superior language system. (pt. 2) 2022-05-06 00:57:45 -04:00
memetrollsXD
2dc6a48403 Customise sender and title too. Add statement of use 2022-05-05 19:49:28 -07:00
Melledy
414fad9079 Kick player if they use an invalid resources folder 2022-05-05 17:17:27 -07:00
gentlespoon
18b1c50d0a 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
Akka
9ee9d7e686 Support of Enter Room Scene 2022-05-05 09:02:54 -07:00
Benjamin Elsdon
243db37fd6 No misleading 404 error 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
b313d8567a Removed GCStatic. Cleaned up GachaRecordHandler. 2022-05-05 09:02:10 -07:00
Akka
32c70cc83f Support of Enter Room Scene 2022-05-05 22:00:11 +08:00
gentlespoon
080ba33cc9 Restrict to MP prop only. 2022-05-05 00:03:42 -07:00
gentlespoon
94c1de66b9 SetPlayerPropReq Handler and player.setProperty() sanity check. 2022-05-05 00:03:42 -07:00
Angda Song
3edbed463b Update teleport docs and allow overriding Y coord when teleporting 2022-05-04 14:50:49 -07:00
BaiSugar
d62be2d1d7 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
ShigemoriHakura
022dcf60ad fix achievement proto (#507) 
* fix achievement proto

TakeAchievementRewardReq tells client the achievements achieved or not and it's progress.

* add import
 2022-05-04 10:06:33 -07:00
Akka
823040be56 Add Support of Item Combine (#513) 
* Add Support of Item Combine

* Add Support of Item Combine

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-04 10:06:13 -07:00
Angda Song
6943360f4a Implement map marking features 
Teleport still exists on fish hook mark.
Added mapMark-related protos.
Map marking data is stored in players collection.
 2022-05-04 10:01:46 -07:00
Melledy
50a8db213d Fix damage number not showing up if it was the killing blow 2022-05-04 01:21:34 -07:00
Melledy
e7276a75d3 Fixed dungeon challenge scoreboard and implement dungeon drops 
Also fixed a few dungeon script handlers
 2022-05-03 23:24:43 -07:00
方块君
8451f960d4 Optimize multilingualism (using variables) 
Optimize multilingualism (using variables)
 2022-05-03 22:17:41 -07:00
BaiSugar
ec27c47db4 Approaching StatuesOfTheSeven will restore all health of the current team 2022-05-03 10:24:10 -07:00
Melledy
145feb62d1 Add languages folder to config as well 2022-05-03 03:19:43 -07:00
方块君
9407e6374b Add multilingual support 
Add multilingual support
 2022-05-03 02:38:37 -07:00
xtaodada
51a6152afc Support giftPackage BatchUse 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-03 02:29:04 -07:00
Melledy
90787c659b Fix extra skill charges being removed if you teleport 
Close #404
 2022-05-03 02:27:18 -07:00
krrr
dab34fcd0d avoid compile error caused by encoding 2022-05-02 22:05:21 -07:00
4Benj_
1df5574b2e Removed debug message and fixed NullPtrException (#434) 
* Removed a debug message from Auth Handler changes

Kill me

* Also forgot to use the getter :/
 2022-05-02 12:47:29 +02:00
mingjun97
d912b59d93 Utils for gacha history record subsystem 
* Auto generate mapping files with command `java -jar grasscutter.jar -gachamap`

* Static file provider
  * For gacha record webpage
  * All static files should be stored at `GRASSCUTTER_RESOURCE/gcstatic/`
  * Can benefit other subsystem in future when webpages involved
 2022-05-02 02:53:28 -07:00