Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-02 11:21:21 +00:00
Code Issues Projects Releases Wiki Activity
1,482 Commits 7 Branches 22 Tags 136 MiB
f45e01d0f9
Commit Graph

1482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tesutarin
794750827d Command: Add permissionTargeted or targetRequirement 2022-06-12 17:55:19 -07:00
ImmuState
52e9c05440 Add alternate name for tranSceneId, and fix inconsistent indentation. 2022-06-11 19:42:11 -07:00
zhaodice
7126b1569e
make sure towerData is not null (#1240) 
* make sure towerData is not null

* Update Player.java

* add notice
 2022-06-11 04:34:25 -07:00
Tesutarin
ef9d96b6d8 Language: Update translation 2022-06-10 21:20:50 -07:00
Magix
2c54d1dac6
Change the version to 1.2.1-dev 2022-06-10 15:56:38 -04:00
zhaodice
f67649e56f
Fix inconformity of Player Object at TowerManager (#1226) 
* Fix inconformity of Player Object at TowerManager

Fix inconformity of Player Object at TowerManager class from GameSession

* fix with a reasonable resolution

* Make sure towerManager'player is online player

* Make sure towerManager'player is online player

* Obsolete storage

* Fix build

* fix build

* fix build

* add @Entity

* set record map

* replace tab with space

* add Entity to TowerData

* make infomater more accurate

* move player register to onLogin
 2022-06-09 13:38:53 -07:00
Kurtivan2223
992742d746 Proxy Update 
Now you can Finally open sites, use apps that requires internet access which typically mitmproxy intercepts
 2022-06-08 05:44:01 -07:00
ImmuState
6149e326ba Make UI for blueprint unlocking behave. 2022-06-08 05:43:38 -07:00
ImmuState
51637ab01e Make calculation for partial claims better. 2022-06-08 05:43:38 -07:00
ImmuState
840bea2b0f Make the UI behave. 2022-06-08 05:43:38 -07:00
ImmuState
e30516d698 Send periodic notifications to the client for ongoing forges. 2022-06-08 05:43:38 -07:00
ImmuState
36e7e028f7 Add ForgeQueueDataNotify, unwhack UI. 2022-06-08 05:43:38 -07:00
ImmuState
e193781f0c Cancel forging and refund items. 2022-06-08 05:43:38 -07:00
ImmuState
5a58a0b765 Obtain forging results (UI is broken though). 2022-06-08 05:43:38 -07:00
ImmuState
8a3c25ff8e Consume material. 2022-06-08 05:43:38 -07:00
ImmuState
8840f22bba Check materials and mora 2022-06-08 05:43:38 -07:00
ImmuState
aae799f9a7 Start a new forge (no checking for now). 2022-06-08 05:43:38 -07:00
ImmuState
4ffda39b12 Add handling for ForgeExcelConfigData. 2022-06-08 05:43:38 -07:00
ImmuState
d7a4209138 Change active forges in player to list. 2022-06-08 05:43:38 -07:00
ImmuState
47bcfe96f6 Add missing forging protos, add data for ongoing forges to player, handler for ForgeStartReq. 2022-06-08 05:43:38 -07:00
ImmuState
0c0719bd2a Move forging stuff to ForgingManager, make client respond to ForgeGetQueueDataReq and actually display forging queues. 2022-06-08 05:43:38 -07:00
Melledy
662c9d4ec2
Merge pull request #1215 from Grasscutters/stable 
oooo dev branch forgor this 💀
 2022-06-07 03:46:09 -07:00
Melledy
610d24d84c
Merge branch 'development' into stable 2022-06-07 03:35:32 -07:00
Melledy
1136a5dd4f Delete BuildConfig.java 2022-06-07 03:27:43 -07:00