Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 11:26:07 +00:00
Code Issues Projects Releases Wiki Activity
1,406 Commits 7 Branches 22 Tags 133 MiB
f32fc500f1
Commit Graph

1406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miralyn
53e8a7ac91
Fixed some mistakes in the ru json (#1312) 
* 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

* accidentally messed up some escape characters. translated a bit more
 2022-06-18 23:28:07 -07:00
Magix
664d660082
Remove unwanted name from proxy script 
Censorship
 2022-06-18 14:58:36 -04:00
zhaodice
d10cdb26fd
Censorship 2022-06-19 00:02:08 +08:00
Akka
fe2799c1fd MonsterInvestigation (boss icon in map) 2022-06-18 08:04:06 -07:00
Miralyn
d1606eb7d0
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
6a1f39529c
fix disconnection (#1309) 2022-06-18 15:01:46 +00:00
诗音澄鸢 镜苑芳依
af6c27a002
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
45438cd2a7 2.7 Merge 2022-06-17 23:36:16 -07:00
Melledy
4501db1135 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Melledy
9daf89b953 Move ban check to GetPlayerTokenReq 2022-06-17 19:42:42 -07:00
Yazawazi
50f0a38e21 no more bin 2022-06-17 19:42:42 -07:00
Yazawazi
51df48ee14 2nd null check 2022-06-17 19:42:42 -07:00
Yazawazi
1ebd8f6810 feat(ban): Implementing ban. 
Rough code, not based on permission.
 2022-06-17 19:42:42 -07:00
Akka
1b9e39dcab a little fix 2022-06-17 18:15:49 -07:00
Akka
89ba8f5d01 a little fix 2022-06-17 18:15:49 -07:00
Akka
148395de67 fix the rot of furniture 2022-06-17 18:15:49 -07:00
Akka
d35ff068cf implement furniture make system 2022-06-17 18:15:49 -07:00
Akka
a695d0c33e npc/animals arrangement & support enter room scene 2022-06-17 18:15:49 -07:00
Akka
1c0d869ee5 Implement the Home System (Serenitea Pot) 2022-06-17 18:15:49 -07:00
Miralyn
99bcd2af70
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
0b672f9a17 Fix friend request pending list 2022-06-16 23:45:40 -07:00
Melledy
ac3214f10a Refactor gacha banner proto creation to not do a lookup on the database 2022-06-16 08:18:24 -07:00
CamChua_VN
8f4f1887d9
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_
802fb09e1d
Custom Permission Handler (#1282) 
Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-16 08:00:03 -07:00
Melledy
0e6e950734 Cleanup package names 2022-06-16 07:57:57 -07:00
Melledy
8fdf9bfddf Add embryos for all skill depots for the main characters 2022-06-16 07:54:53 -07:00
Tesutarin
00bd23873f Update README 2022-06-16 06:50:57 -07:00
Tesutarin
0a56245b84 Gacha Records: Support multiple languages 2022-06-15 23:44:57 -07:00
Magix
4c1971d7f0
Revert Patreon Link 
it lasted a total of 13 hours
 2022-06-16 02:35:50 -04:00
Paimon2022
1644040370 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
34b6caafa8 Fix giveall and givechar giving broken characters. 2022-06-15 23:10:04 -07:00
Magix
e876894bca
Merge pull request #1271 from loulou310/development 
Translated readme in French
 2022-06-15 13:34:27 -04:00
Magix
715ec01eda
Patreon Link 
thanks ben for hosting an email
 2022-06-15 13:33:18 -04:00
loulou310
d76216b764
Merge branch 'Grasscutters:development' into development 2022-06-15 16:26:10 +02:00
loulou310
e8c34bc12f Translated readme in FRENCH 2022-06-15 16:24:17 +02:00
zhaodice
b3f1103292
[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
2d4bfa7c31 Update README.md 2022-06-15 04:11:04 -07:00
plex
94c940401b Update README_zh-CN.md 2022-06-15 04:10:46 -07:00
yuyuko
a329b3bdac Fix multi server function 2022-06-14 18:28:35 -07:00
ImmuState
bba7afa24e Don't show internal server error on gacha with full inventory. 2022-06-14 18:09:02 -07:00
ImmuState
ed290b6a39 Only send full clear notification on burst cast. 2022-06-14 18:08:55 -07:00
ImmuState
b9f6d7f70b Adapt protocol for clearing energy. 2022-06-14 18:08:55 -07:00
xlpmyxhdr
73013eb497 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
5925619b40
Merge pull request #1263 from loulou310/development 
Added french translation for server
 2022-06-14 16:27:43 -04:00
loulou310
2a03aaff5e Added fr-FR.json 2022-06-14 21:44:42 +02:00
saucebing
f10dc1cf8d
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
64d74387a2
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
f2f6993b3d KickCommand: Remove unnecessary subpermission 2022-06-14 01:14:33 -07:00
ImmuState
ded7ce1dcf
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
2560b14557 Partial revert of #1245 2022-06-12 21:49:47 -07:00