Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-03 20:18:23 +00:00
Code Issues Projects Releases Wiki Activity
843 Commits 7 Branches 22 Tags 136 MiB
71095786b8
Commit Graph

597 Commits

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
方块君
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
Magix
3a45a5b5c4
Change to () and add space 2022-04-30 16:14:40 -04:00
KingRainbow44
9902f39306
Merge remote-tracking branch 'origin/api' into api 2022-04-30 16:11:12 -04:00
KingRainbow44
e8d60c6edf
Move join & quit to player event 2022-04-30 16:11:00 -04:00
Magix
a1a36dc7a7
Merge branch 'development' into api 2022-04-30 16:07:54 -04:00
KingRainbow44
a3e22dd7e1
Create player creation event & move join event to player 2022-04-30 16:07:12 -04:00
coooookies
1d6916bca1 Uids will not be showed until the parameter <uid> is added, 
like this: /list uid
 2022-05-01 03:43:41 +08:00
LDA
64930b9ba9 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07:00
Benjamin Elsdon
ee9b84149d Small fix 2022-05-01 00:51:09 +08:00
Benjamin Elsdon
f8248ff74b Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
coooookies
caffe859b8 List command should show player uid 2022-05-01 00:17:08 +08:00
赤座あかり
2fd73e043a
Give Artifact: Fix error & Rename alias (#370) 
* Give Artifact: Fix error & Rename alias

* Update README.md
 2022-04-30 13:19:22 +02:00
Aru
dd38814209
Monsters should drop items in world (#373) 
* Monsters should drop items in world

fix the typo introduced in f1934c3a47

* Determine whether in dungeon scene
 2022-04-30 13:18:09 +02:00
筱傑
86f72a5f7a
Update Welcome Mail Items Type (#369) 2022-04-30 11:46:23 +02:00
Scirese
13aaebd9e8
Add Android Client fix by @BaiSugar (#105) 2022-04-30 11:45:24 +02:00
omg-xtao
a7b0880d02
Merge branch 'development' into tp 2022-04-30 16:48:24 +08:00
lhhxxxxx
f31fda2e16 Update Account.hasPermission() 
Add wildcard characters to permission nodes under the same namespace. (simple implementation)
 2022-04-30 01:30:38 -07:00
Melledy
3bdf93f503 Monsters should not drop items inside dungeons 2022-04-30 01:20:44 -07:00
Melledy
b140c7f5bf Implement script region check 2022-04-30 01:20:44 -07:00
Melledy
202361f2bf Move script constants to globals 2022-04-30 01:20:44 -07:00
Melledy
a61e1916a0 Temporary fix for scripts that call require 2022-04-30 01:20:44 -07:00
Melledy
bea9a76895 Optimize GetOnlinePlayerListRsp 2022-04-30 01:20:44 -07:00
Melledy
d64c26d4f5 Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
lhhxxxxx
c2b45a7a0d Update GiveAllCommand.java 
giveall command nomore give arts
 2022-04-30 01:04:10 -07:00
筱傑
b5582099f9 Fix Give Command Promote Level Bug 
Should be <=40, just change the order
 2022-04-30 01:02:39 -07:00
muhammadeko
d37a326e9a Give Artifact: Clear random props first before adding all picked props 2022-04-29 17:11:12 -07:00
KingRainbow44
47cf1e5898
Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
 2022-04-29 19:31:33 -04:00
lilmayofuksu
69381f393d
Limit the amount of vehicles that a player can spawn (#340) 2022-04-29 21:01:07 +02:00
BaiSugar
cacba61b79
Added interface display for multiplayer games (#360) 2022-04-29 18:20:46 +02:00
赤座あかり
d99493149a
Add command to get reliquary with specific props (#300) 2022-04-29 16:31:22 +02:00
omg-xtao
6d77cd8952
Merge branch 'development' into tp 2022-04-29 21:38:45 +08:00
真心
0a6c98d134 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
b1439819fa Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
9e1f356a0c Delete GiveWeaponCommand.java 2022-04-29 15:20:28 +02:00