Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 14:28:22 +00:00
Code Issues Projects Releases Wiki Activity
1,194 Commits 7 Branches 22 Tags 133 MiB
ce07f56f9d
Commit Graph

1194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
真心
5d54136969 fix .gitignore 2022-05-03 22:17:51 -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
memetrollsXD
ded4c76e68
Update .gitignore for languages (#488) 
* improve server side command line input

* prevent multiline logs from covering typed commands

* reduce text in console

* resolve conflicts caused by multilanguage

* Update .gitignore for languages
 2022-05-03 23:31:30 +02: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
dogdie233
87fd388be9
Update README about #439 (#473) 2022-05-03 14:47:45 +02: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
98af9b2433 Update spawns, also removed the monster spawns that were too close to newly created players 2022-05-03 02:27:18 -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
Melledy
f4e8baf187 Update kcp netty 
See https://github.com/Melledy/kcp-netty
 2022-05-02 15:24:09 -07:00
dogdie233
9c358744e7 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
蓝云Reyes
e83e985bbc Fix 2022-05-02 10:49:53 -07:00
蓝云Reyes
216c899ec2 Update gacha_records.html 
Change the colour scheme to make it look more comfortable.
 2022-05-02 10:49:53 -07:00
蓝云Reyes
dae442872c Update gacha_records.html 
Fix a problem where the switch page button was difficult to reach
 2022-05-02 10:49:53 -07:00
蓝云Reyes
ee0a246471 Update gacha_records.html 2022-05-02 10:49:53 -07:00
蓝云Reyes
db3af8e3ee Update gacha_records.html 2022-05-02 10:49:53 -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