Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 08:36:38 +00:00
Code Issues Projects Releases Wiki Activity
866 Commits 7 Branches 22 Tags 133 MiB
1ed0511cd7
Commit Graph

615 Commits

Author SHA1 Message Date
Benjamin Elsdon
db1ddd0630 I honestly don't know what happened.... 2022-05-05 09:02:10 -07:00
Benjamin Elsdon
3395c76dbc Removed GCStatic. Cleaned up GachaRecordHandler. 2022-05-05 09:02:10 -07:00
Akka
a21fc116ee Support of Enter Room Scene 2022-05-05 22:00:11 +08:00
Luke H-W
15dca5a04d 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
e693612ed1 Fix clear command causing a concurrency error 2022-05-05 02:29:43 -07:00
AnimeGitB
3a28e741d0 Add R# LVL# X# arg syntax to GiveCommand 2022-05-05 00:14:17 -07:00
gentlespoon
7d85c53e68 Restrict to MP prop only. 2022-05-05 00:03:42 -07:00
gentlespoon
5c275c2e3c SetPlayerPropReq Handler and player.setProperty() sanity check. 2022-05-05 00:03:42 -07:00
AnimeGitB
37c2ee5e2c Command Targeting overhaul fixes 2022-05-05 00:03:10 -07:00
AnimeGitB
d8b2e787e5 Commands Targeting rework 2022-05-05 00:03:10 -07:00
AnimeGitB
5aba7da7ef Move command prefix stripping to ChatManager 2022-05-05 00:03:10 -07:00
AnimeGitB
82ec63c4e4 [WIP] Command Targeting overhaul 2022-05-05 00:03:10 -07:00
hanbao233xD
4e0ebe56a6 Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
3f02afb46b Update CNLanguage.java 2022-05-04 22:57:33 -07:00
hanbao233xD
fb05a3711d Update CNLanguage.java 2022-05-04 22:57:33 -07:00
Secretboy
a7b9b1f923 Update Config.java 2022-05-04 22:57:06 -07:00
Secretboy
08c01ab15d Update Grasscutter.java 2022-05-04 22:57:06 -07:00
gentlespoon
6fc4065fa0 Add missing PacketOpcodes. 2022-05-04 22:54:52 -07:00
Angda Song
5a2d25e4eb Update teleport docs and allow overriding Y coord when teleporting 2022-05-04 14:50:49 -07:00
BaiSugar
2074933e96 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
aa06583a45 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
48d1e026ef 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
06983e9e84 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
4220b6b88d 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
5e0e65123e 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
3d52964112 Fix equip swapping 2022-05-04 01:45:41 -07:00
Melledy
787f3fd45e Fix damage number not showing up if it was the killing blow 2022-05-04 01:21:34 -07:00
Melledy
57285885dc Move languages to languages package 2022-05-04 00:44:33 -07:00
Melledy
1b97b4afa0 Fixed dungeon challenge scoreboard and implement dungeon drops 
Also fixed a few dungeon script handlers
 2022-05-03 23:24:43 -07:00
Melledy
ae31e4fd98 Weapons/artifacts should not have a count of more than 1 2022-05-03 23:24:18 -07:00
Melledy
de75b56d6c Fix jline in eclipse 2022-05-03 23:24:02 -07:00
Scirese
09125f8e91 Optimize Chinese Translations (#498) 
* Add Chinese Translation

* Optimize Chinese Translations

* Fix a dumb error
 2022-05-03 23:15:04 -07:00
方块君
09b306f6a0 Modify Chinese language files 2022-05-03 22:17:41 -07:00
方块君
e297a29adb Add some text to language file 2022-05-03 22:17:41 -07:00
方块君
b8f5299995 Optimize multilingualism (using variables) 
Optimize multilingualism (using variables)
 2022-05-03 22:17:41 -07:00
DancingSnow
f6d5fb1945 fix giveart command when times about 200, account will crash 2022-05-03 10:45:11 -07:00
AnimeGitB
29eedb5075 Refactor SetStatsCommand, add target UID and all FightProperty stats 2022-05-03 10:37:32 -07:00
BaiSugar
1288273c12 Approaching StatuesOfTheSeven will restore all health of the current team 2022-05-03 10:24:10 -07:00
mzfqy
c0acf8b1ba fix path 2022-05-03 10:23:29 -07:00
mzfqy
70507c34c9 add zh_cn translate. 2022-05-03 10:23:29 -07:00
Presiareen
050784dfab 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
c930c637e4 Add languages folder to config as well 2022-05-03 03:19:43 -07:00
方块君
0eab44f51f Add multilingual support 
Add multilingual support
 2022-05-03 02:38:37 -07:00
xtaodada
86e6eef4e2 Support giftPackage BatchUse 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-03 02:29:04 -07:00
Melledy
a93d7c579f Fix extra skill charges being removed if you teleport 
Close #404
 2022-05-03 02:27:18 -07:00
Melledy
7395a268ef Fix mail not sending to offline players 2022-05-03 02:27:18 -07:00
mingjun97
509f62e7cd Carry to new line for messages in MessageHandler 2022-05-03 02:16:44 -07:00
mingjun97
0421d912fd 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
5b6da38160 avoid compile error caused by encoding 2022-05-02 22:05:21 -07:00
xtaodada
b253e779a2 Implement food heal function 
Co-authored-by: pris <lilch1022@hotmail.com>
 2022-05-02 22:02:11 -07:00
KingRainbow44
765f569e55 Initialize ServerHook 2022-05-02 21:20:24 -04:00
dogdie233
16f77ee520 Add EnterDungeonCmd, fix error when enter dungeon by changescene, import spawn cmd 2022-05-02 10:50:08 -07:00
LDA
1d36fd8f2a load photo mode pose and expression fetters 2022-05-02 10:47:27 -07:00
4Benj_
f7b8d9b45f 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
a102613313 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
6a20e383f7 Fix announcement display 2022-05-02 02:50:32 -07:00
xtaodada
7b591a2da0 implement shopMail giftPackage function 
Co-authored-by: Kinesis <CCasusensa@users.noreply.github.com>
 2022-05-02 02:50:24 -07:00
Benjamin Elsdon
73fc9fe4cc Custom Authentication Handler 2022-05-02 02:50:14 -07:00
DancingSnow
186c6bcf89 fix World level not in 0-8 2022-05-02 02:26:11 -07:00
Melledy
fba26d2da9 Fix gacha rate for weapons 2022-05-02 02:01:24 -07:00
Melledy
19396a63c7 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
afa8fb7a51 Merge remote-tracking branch 'origin/development' into development 2022-05-01 20:15:27 -04:00
mingjun97
98122f3c55 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
eb703f9f72 Fix goods limit bug 2022-05-01 13:42:01 -07:00
xtaodada
bd560785ba Show shopmall 2022-05-01 13:42:01 -07:00
筱傑
3cc1139aa1 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
4adc983832 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
a8b808ba2e Improve registration methods. 2022-05-01 10:02:57 -07:00
coooookies
dde5a609fb GameServerPacketHandler need to be added a registration interface for plugin developers 2022-05-01 10:02:57 -07:00
Kinesis
677aa2d2c4 fix McoinExchangeHcoinRsp packet structure 2022-05-01 10:02:47 -07:00
筱傑
b9e27828b8 Fixed can set talent level to 16 bug (#408) 
Level should be **lower than 16**
 2022-05-01 16:42:02 +02:00
4Benj_
0d262e2d07 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
72b5ec210c Merge remote-tracking branch 'origin/development' into development 2022-05-01 02:14:35 -04:00
mingjun97
049086b21a Should fix all crashes when login for iOS client 2022-04-30 23:03:47 -07:00
mingjun97
d3ac090daa 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
10bfb6976d Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Melledy
eac82f3c01 Fix possible exploit with mcoin exchange 2022-04-30 22:51:21 -07:00
Kinesis
da3eb3d26c implement McoinExchange packet Handler 2022-04-30 22:03:44 -07:00
mingjun97
fb547c17ca Revert changes for debugging purpose 2022-04-30 21:43:46 -07:00
mingjun97
8b8777e932 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
3169e87c60 Fix constellations that give an extra charge to skills 
Fix #228
 2022-04-30 19:34:50 -07:00
KingRainbow44
e898384532 QoL changes 2022-04-30 21:52:30 -04:00
KingRainbow44
a044448af7 Implement a handler for logging routes 2022-04-30 20:38:18 -04:00
muhammadeko
80659f27a8 Add getter for innerclass RegionData 2022-04-30 16:41:19 -07:00
Muhammad Eko Prasetyo
55793867d3 Fix DispatchHttpJson handler and add setHttpServer because Express doesn't support removing defined route. (#388) 2022-05-01 00:43:50 +02:00
Magix
be507310a5 Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
Magix
a62520f922 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
8ce79ed3ca Forgot to add to null execution 2022-04-30 16:15:39 -04:00
Magix
f4de4a6aeb Change to () and add space 2022-04-30 16:14:40 -04:00
KingRainbow44
86b8f4549f Merge remote-tracking branch 'origin/api' into api 2022-04-30 16:11:12 -04:00
KingRainbow44
b5c277234c Move join & quit to player event 2022-04-30 16:11:00 -04:00
Magix
63d41fd79e Merge branch 'development' into api 2022-04-30 16:07:54 -04:00
KingRainbow44
f73a713fac Create player creation event & move join event to player 2022-04-30 16:07:12 -04:00
coooookies
ba97dfe7d9 Uids will not be showed until the parameter <uid> is added, 
like this: /list uid
 2022-05-01 03:43:41 +08:00
LDA
d133e55666 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07:00
Benjamin Elsdon
28025a8198 Small fix 2022-05-01 00:51:09 +08:00
Benjamin Elsdon
947d3e5745 Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
coooookies
c0b7859f93 List command should show player uid 2022-05-01 00:17:08 +08:00
赤座あかり
eac9c04e4e 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
d6fa05915f 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