Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 23:14:09 +00:00
Code Issues Projects Releases Wiki Activity
897 Commits 7 Branches 22 Tags 136 MiB
fadda64699
Commit Graph

628 Commits

Author SHA1 Message Date
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
mingjun97
1c8f272fee Carry to new line for messages in MessageHandler 2022-05-03 02:16:44 -07:00
mingjun97
0adafd6076 Enable plugins to hook server message response 
* Add message handler so that the plugin can hook inside the `dropMessage` method for `Player` instance.
 2022-05-03 02:16:44 -07:00
krrr
dab34fcd0d avoid compile error caused by encoding 2022-05-02 22:05:21 -07:00
xtaodada
70b5124ecf Implement food heal function 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-02 22:02:11 -07:00
KingRainbow44
b778b97788
Initialize ServerHook 2022-05-02 21:20:24 -04:00
dogdie233
9c358744e7 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
LDA
05de77fd70 load photo mode pose and expression fetters 2022-05-02 10:47:27 -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
BaiSugar
2661cc5ef3 Fix announcement display 2022-05-02 02:50:32 -07:00
xtaodada
e8aaee6515 implement shopMail giftPackage function 
Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>
 2022-05-02 02:50:24 -07:00
Benjamin Elsdon
29b5157d42 Custom Authentication Handler 2022-05-02 02:50:14 -07:00
DancingSnow
50740b3560 fix World level not in 0-8 2022-05-02 02:26:11 -07:00
Melledy
89bd8a10ef Fix gacha rate for weapons 2022-05-02 02:01:24 -07:00
Melledy
63c7f8d62d Move player mail to MailHandler class 
This is so we dont have to save the entire player to the db every time we send mail
 2022-05-02 02:01:01 -07:00
KingRainbow44
e60cf79309
Merge remote-tracking branch 'origin/development' into development 2022-05-01 20:15:27 -04:00
mingjun97
8cf4ef59ec Implement gacha history record subsystem 
* Frontend is not very beautiful yet
* Didn't include too much `some anime game` data in the page to avoid being DMCA'd
 2022-05-01 13:47:17 -07:00
xtaodada
22a651b4aa Fix goods limit bug 2022-05-01 13:42:01 -07:00
xtaodada
6d96906484 Show shopmall 2022-05-01 13:42:01 -07:00
筱傑
29c95cb1b6
Add /setstats mhp to set Max HP (#407) 
* Fixed `/setstats hp` without changing the max hp.

The Max HP should be modified.

* Add `/setstats mhp` to set Max HP
 2022-05-01 20:22:29 +02:00
JimWails
2c0576f697 Fixed can set avatar level more than 90 and cause game to freeze 
Limit the avatar level given by "/givechar" command.
If avatar level >90, the game will freeze if open the character interface.
 2022-05-01 10:05:28 -07:00
coooookies
1e166960d2 Improve registration methods. 2022-05-01 10:02:57 -07:00
coooookies
59d5f4feec GameServerPacketHandler need to be added a registration interface for plugin developers 2022-05-01 10:02:57 -07:00
Kinesis
d4e1b265e3 fix McoinExchangeHcoinRsp packet structure 2022-05-01 10:02:47 -07:00
筱傑
ec09bc28f2
Fixed can set talent level to 16 bug (#408) 
Level should be **lower than 16**
 2022-05-01 16:42:02 +02:00
4Benj_
d484ba7ed6
Cleaned up dispatch iOS fixes (#396) 
* Attempting to fix crashing on iOS devices

plus I forgot a thing in string.format

* Removed unnecessary things
 2022-04-30 23:31:39 -07:00
KingRainbow44
d31695b033
Merge remote-tracking branch 'origin/development' into development 2022-05-01 02:14:35 -04:00
mingjun97
15d2795686 Should fix all crashes when login for iOS client 2022-04-30 23:03:47 -07:00
mingjun97
8a655c16eb Fix crash and revise route 
* Fix another point which will trigger iOS client to crash
* Revise `compareProtocolVersion` route to handle all method
 2022-04-30 23:03:47 -07:00
Melledy
65c63ac34a Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Melledy
66ccd30416 Fix possible exploit with mcoin exchange 2022-04-30 22:51:21 -07:00
Kinesis
7b22b575b7 implement McoinExchange packet Handler 2022-04-30 22:03:44 -07:00
mingjun97
1ac5aeb286 Revert changes for debugging purpose 2022-04-30 21:43:46 -07:00
mingjun97
582d91227c Fix crash when login 
* Prevent email to be `null` to avoid crash in certain client setup.
 2022-04-30 21:43:46 -07:00
Melledy
dd0f8f8d49 Fix constellations that give an extra charge to skills 
Fix #228
 2022-04-30 19:34:50 -07:00
KingRainbow44
b703a32544
QoL changes 2022-04-30 21:52:30 -04:00
KingRainbow44
6fb0b5494f
Implement a handler for logging routes 2022-04-30 20:38:18 -04:00
muhammadeko
d47c9e1f98 Add getter for innerclass RegionData 2022-04-30 16:41:19 -07:00
Muhammad Eko Prasetyo
14c4673d48
Fix DispatchHttpJson handler and add setHttpServer because Express doesn't support removing defined route. (#388) 2022-05-01 00:43:50 +02:00
Magix
eb5b8fa966
Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
Magix
0b0e8991b1
Merge pull request #381 from Coooookies/development 
Show the player's UID with the `/list` command
 2022-04-30 16:16:18 -04:00
Magix
78f6e6b7cf
Forgot to add to null execution 2022-04-30 16:15:39 -04:00