Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 16:45:23 +00:00
Code Issues Projects Releases Wiki Activity
940 Commits 7 Branches 22 Tags 133 MiB
63eed41dd5
Commit Graph

673 Commits

Author SHA1 Message Date
Melledy
bd7fb76b1d Fix crash on login if the player didnt have a TowerManager 2022-05-06 19:12:54 -07:00
KingRainbow44
6ab1a4f43e
Merge remote-tracking branch 'origin/development' into development 2022-05-06 21:53:03 -04:00
KingRainbow44
a93371a0d0
Fix for translation errors 2022-05-06 21:52:10 -04:00
Magix
5744fc60d4
Merge branch 'stable' into development 2022-05-06 21:39:30 -04:00
Magix
c8779fec3c Update Tools.java 2022-05-06 18:25:35 -07:00
mingjun97
6c7b94c127 Auto fill name of the event from TextMap 2022-05-06 18:25:35 -07:00
mingjun97
eb391b3833 Prompt for user language option for the Tools 
* GM Handbook
* Gacha Map
 2022-05-06 18:25:35 -07:00
Magix
217166822b
Merge branch 'development' into development 2022-05-06 21:08:19 -04:00
Magix
4455072db1
Merge pull request #567 from Grasscutters/localization 
Implement a proper language system
 2022-05-06 21:05:29 -04:00
KingRainbow44
e6cb97a437
Bug fixes 2022-05-06 21:04:39 -04:00
KingRainbow44
59b24aa481
Rename en-US locale 2022-05-06 20:18:50 -04:00
Bwly999
c5bf5ecd69 roll back to timer 2022-05-07 08:00:31 +08:00
KingRainbow44
4264ca0485
Update Utils.java 2022-05-06 19:47:30 -04:00
KingRainbow44
80c9119ca2
Merge development into localization 2022-05-06 19:40:32 -04:00
gentlespoon
82a88c8573 fix/runningAndDashingStamina 2022-05-06 16:11:51 -07:00
KingRainbow44
686df18b74
Ensure we have a fallback for localization 2022-05-06 18:57:49 -04:00
KingRainbow44
57a3d535a7
Add the zh-TW language. 2022-05-06 18:56:19 -04:00
KingRainbow44
7899a6069b
Add the en-US language. 2022-05-06 18:50:43 -04:00
KingRainbow44
438f845e3a
Convert to the superior language system. (pt. 3) 2022-05-06 18:50:18 -04:00
gentlespoon
c582814bc1 Fix #593: Accidental death of character 2022-05-06 15:22:00 -07:00
gentlespoon
1d4a41fd61 Allow walking away from the statue within 2.5s to stop auto heal. 2022-05-06 14:49:33 -07:00
wulf
71095786b8 fix scence block loading bug 2022-05-06 13:43:42 -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
cfuncode
2b58d69534
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
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
22df34606c a little fix 2022-05-07 00:31:48 +08:00
Akka
321a2a3537
Merge branch 'tower' into development 2022-05-07 00:19:51 +08:00
Akka
81ca86092c Add some lua functions 2022-05-07 00:15:23 +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
098cf372c9 Fix morphia error when saving player to db 2022-05-06 01:19:39 -07:00
Melledy
092dee8e2b Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development 2022-05-06 01:17:19 -07:00
Melledy
5968ed3a71 Remove the red exclamation mark from achievements 2022-05-06 01:17:16 -07:00
gentlespoon
e319fd751b fix: lower logging level in SotSManager 2022-05-06 00:49:08 -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
39a49ae964 Add @Transient for temporary team 2022-05-06 00:12:33 -07:00
Akka
696f629080 Choose Avatar & Enter Tower 2022-05-06 00:12:33 -07:00
Akka
a79e00896c Add @Transient for temporary team 2022-05-06 14:46:10 +08: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
KingRainbow44
023c5baffe
Convert to the superior language system. (pt. 1) 2022-05-05 23:57:55 -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
Scirese
e01c270a52 Update CNLanguage to match with the latest EN version 2022-05-05 09:03:23 -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
a7273fd84a I honestly don't know what happened.... 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
Luke H-W
775f4cb7c1
GiveCommand: fix edge case with unspaced multiple args (#539) 
Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-05-05 15:23:48 +02:00
Melledy
b61672e046 Fix clear command causing a concurrency error 2022-05-05 02:29:43 -07:00
AnimeGitB
bc19f2da93 Add R# LVL# X# arg syntax to GiveCommand 2022-05-05 00:14:17 -07: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
AnimeGitB
2cfaeac6bc Command Targeting overhaul fixes 2022-05-05 00:03:10 -07:00
AnimeGitB
0c715f0856 Commands Targeting rework 2022-05-05 00:03:10 -07:00
AnimeGitB
e198907143 Move command prefix stripping to ChatManager 2022-05-05 00:03:10 -07:00
AnimeGitB
bf654ced36 [WIP] Command Targeting overhaul 2022-05-05 00:03:10 -07:00
hanbao233xD
821969fdd2 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
dabd700252 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
8218b1c162 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
Secretboy
c3eafa0255 Update Config.java 2022-05-04 22:57:06 -07:00
Secretboy
c63f2cfd3c Update Grasscutter.java 2022-05-04 22:57:06 -07:00
gentlespoon
491ad5b4d9 Add missing PacketOpcodes. 2022-05-04 22:54:52 -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
Scirese
d52fa0a989
Fix CNLanguage.java (#505) 
* Fix CNLanguage.java

@Melledy 
Keep an eye on the file encodeing next time,please.

* Update CNLanguage.java

* Fix a little bug
 2022-05-04 16:56:50 +02:00
EtherealAO
be4f178b8e Dungeon challenge success/fail notify should only be triggered once (when server spawned mob more than score) 2022-05-04 01:48:56 -07:00
Melledy
f08b8b1e09 Fix equip swapping 2022-05-04 01:45:41 -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
b6fa6fe2d7 Move languages to languages package 2022-05-04 00:44:33 -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
Melledy
bf3e5566c8 Weapons/artifacts should not have a count of more than 1 2022-05-03 23:24:18 -07:00
Melledy
1ea24be087 Fix jline in eclipse 2022-05-03 23:24:02 -07:00
Scirese
590c111c96
Optimize Chinese Translations (#498) 
* Add Chinese Translation

* Optimize Chinese Translations

* Fix a dumb error
 2022-05-03 23:15:04 -07:00
方块君
bddc46f172 Modify Chinese language files 2022-05-03 22:17:41 -07:00
方块君
085ebf61cc Add some text to language file 2022-05-03 22:17:41 -07:00
方块君
8451f960d4 Optimize multilingualism (using variables) 
Optimize multilingualism (using variables)
 2022-05-03 22:17:41 -07:00
DancingSnow
1452c0565b fix giveart command when times about 200, account will crash 2022-05-03 10:45:11 -07:00
AnimeGitB
f456460185 Refactor SetStatsCommand, add target UID and all FightProperty stats 2022-05-03 10:37:32 -07:00
BaiSugar
ec27c47db4 Approaching StatuesOfTheSeven will restore all health of the current team 2022-05-03 10:24:10 -07:00
mzfqy
8485ba5789 fix path 2022-05-03 10:23:29 -07:00
mzfqy
58962ba212 add zh_cn translate. 2022-05-03 10:23:29 -07:00
Presiareen
3cc67a849d
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
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
Melledy
5af7b8d2e8 Fix mail not sending to offline players 2022-05-03 02:27:18 -07:00