Grasscutter
/
Grasscutter
mirror of https://github.com/Grasscutters/Grasscutter.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,354 Commits 6 Branches 22 Tags 144 MiB
Commit Graph

1354 Commits

Author SHA1 Message Date
zhaodice e3c83d5828 Censorship 2022-06-19 00:02:08 +08:00
Akka 706dc5e4c7 MonsterInvestigation (boss icon in map) 2022-06-18 08:04:06 -07:00
Miralyn 80c61466e3 Add Russian translation for server software (#1304) 
* Don't know what Dispatch means and can't really find it in Russian anywhere, not a specialist anyway so decided to not invent things.

* lost some symbols accidentally
 2022-06-18 15:02:21 +00:00
zhaodice 5d6f939532 fix disconnection (#1309) 2022-06-18 15:01:46 +00:00
诗音澄鸢 镜苑芳依 79e4172c47 Fix daily dungeon didn't display in note(笔记) (#1296) 
* Fix Daily dungeon didn't display in note(笔记) -- Buggy

* 123
 2022-06-17 23:50:55 -07:00
Melledy 2915b14c1f 2.7 Merge 2022-06-17 23:36:16 -07:00
Melledy 30c7bb9443 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Melledy 8e6aa50c3a Move ban check to GetPlayerTokenReq 2022-06-17 19:42:42 -07:00
Yazawazi a2de0e2376 no more bin 2022-06-17 19:42:42 -07:00
Yazawazi 3ccaf535ef 2nd null check 2022-06-17 19:42:42 -07:00
Yazawazi aba4080b0e feat(ban): Implementing `ban`. 
Rough code, not based on permission.
 2022-06-17 19:42:42 -07:00
Akka 557298f847 a little fix 2022-06-17 18:15:49 -07:00
Akka 2d461641f1 a little fix 2022-06-17 18:15:49 -07:00
Akka 247412b17e fix the rot of furniture 2022-06-17 18:15:49 -07:00
Akka 211d7d6fbf implement furniture make system 2022-06-17 18:15:49 -07:00
Akka 7a247e70e0 npc/animals arrangement & support enter room scene 2022-06-17 18:15:49 -07:00
Akka e16633e34b Implement the Home System (Serenitea Pot) 2022-06-17 18:15:49 -07:00
Miralyn 399275e89f Add RU readme (#1298) 
* Create README_ru.MD

* Update and rename README_ru.MD to README_ru-RU.md
 2022-06-17 16:14:42 +00:00
zhaodice bddb96e3b2 Fix friend request pending list 2022-06-16 23:45:40 -07:00
Melledy 359e83596c Refactor gacha banner proto creation to not do a lookup on the database 2022-06-16 08:18:24 -07:00
CamChua_VN 2624f48a84 Update Epitomized Path (#1254) 
* Update Epitomized Path

* Update Epitomized Path

* Update Epitomized Path

* Refactor doRarePull

* Update Epitomized Path

Co-authored-by: AnimeGitUserB <AnimeGitUserB@bigblueball.in>
 2022-06-16 08:01:27 -07:00
4Benj_ bb07d9ea41 Custom Permission Handler (#1282) 
Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-16 08:00:03 -07:00
Melledy 6d59159b8b Cleanup package names 2022-06-16 07:57:57 -07:00
Melledy ac49114c45 Add embryos for all skill depots for the main characters 2022-06-16 07:54:53 -07:00
Tesutarin fa4b768d0d Update README 2022-06-16 06:50:57 -07:00
Tesutarin cc4094549e Gacha Records: Support multiple languages 2022-06-15 23:44:57 -07:00
Magix 779e0f738d Revert `Patreon Link` 
it lasted a total of 13 hours
 2022-06-16 02:35:50 -04:00
Paimon2022 37230d1274 Fix issue: skill recovery value of a character should benefit from his/her own property, 
not the character he/she treats.
 2022-06-15 23:10:17 -07:00
ImmuState 50c8f43d5b Fix giveall and givechar giving broken characters. 2022-06-15 23:10:04 -07:00
Magix 5a8a636b51 Merge pull request #1271 from loulou310/development 
Translated readme in French
 2022-06-15 13:34:27 -04:00
Magix 4ebb5647a2 Patreon Link 
thanks ben for hosting an email
 2022-06-15 13:33:18 -04:00
loulou310 584aec58a5 Merge branch 'Grasscutters:development' into development 2022-06-15 16:26:10 +02:00
loulou310 8c8f38874a Translated readme in FRENCH 2022-06-15 16:24:17 +02:00
zhaodice c056ad5cd1 [Ready]Replace deprecated KCP library (#1237) 
* Replace deprecated KCP library

support get srtt

Waiting server to establish

logicThread

Print Bad Package Information

Avoid orphan data

improve conv id security

* Improve connection subsequence
 2022-06-15 04:13:35 -07:00
plex 1814c28885 Update README.md 2022-06-15 04:11:04 -07:00
plex e498526bdb Update README_zh-CN.md 2022-06-15 04:10:46 -07:00
yuyuko 8a3d6e3db4 Fix multi server function 2022-06-14 18:28:35 -07:00
ImmuState ebab89d433 Don't show internal server error on gacha with full inventory. 2022-06-14 18:09:02 -07:00
ImmuState e0d386105a Only send full clear notification on burst cast. 2022-06-14 18:08:55 -07:00
ImmuState 0db1472195 Adapt protocol for clearing energy. 2022-06-14 18:08:55 -07:00
xlpmyxhdr 521deab4f2 Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at once 
Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at one time, so that one Ancient Rock Dragon Lizard was generated at a time, and the attributes were different
 2022-06-14 18:08:43 -07:00
Magix efb57d58db Merge pull request #1263 from loulou310/development 
Added french translation for server
 2022-06-14 16:27:43 -04:00
loulou310 57918d0344 Added fr-FR.json 2022-06-14 21:44:42 +02:00
saucebing 458aadc2ff fix healing ability of some characters to some extent (#1201) 
* fix healing ability of some characters to some extent

* using SerialName to replace replaceAll in avatar ability files reading

* add class HealAbilityManager

* move codes in onAbilityInvoke of class AbilityManager to class HealAbilityManager
 2022-06-14 04:36:53 -07:00
Theosapira 95bc88202a Minor README update (#1246) 
* Update README.md

Updated old jar link with new jar from actions

* Update README_zh-CN.md

Updated old jar link with new jar from actions
 2022-06-14 01:15:03 -07:00
Tesutarin 7c9db30bca KickCommand: Remove unnecessary subpermission 2022-06-14 01:14:33 -07:00
ImmuState 6e955c9fdb Implement Resin (#1257) 
* Basic resin usage/refresh.

* Honor resin config, move some logic to logon.

* Add resin usage to DungeonChallenge

* Make fragile and transient resin usable.

* Get resin cost from dungeon excel.

* Add ability to unlock combine diagrams.

* Refactor CombineManager to use Inventory.payItems, enabling crafting of condensed resin.

* Refactor ForgingManager to use Inventory.payItems, to prepare for eventually forging Mystic Enhancement Ores using resin.

* Remove comment

* Check resin usage in addResin
 2022-06-14 01:14:15 -07:00
Luke Hubmayer-Werner 2fd2fab54c Partial revert of #1245 2022-06-12 21:49:47 -07:00
Tesutarin c5b45358e7 Command: Add permissionTargeted or targetRequirement 2022-06-12 17:55:19 -07:00
ImmuState c4ce6caeba Add alternate name for tranSceneId, and fix inconsistent indentation. 2022-06-11 19:42:11 -07:00