Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-03 19:14:28 +00:00
Code Issues Projects Releases Wiki Activity
1,305 Commits 7 Branches 22 Tags 136 MiB
6d59159b8b
Commit Graph

1305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zhaodice
db039cc35b 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
eb170bcb15 Language: Update translation 2022-06-10 21:20:50 -07:00
Magix
93d49a7a2c Change the version to 1.2.1-dev 2022-06-10 15:56:38 -04:00
zhaodice
052e70e488 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
2b88487cd2 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
a8d972c0c0 Make UI for blueprint unlocking behave. 2022-06-08 05:43:38 -07:00
ImmuState
4309e96253 Make calculation for partial claims better. 2022-06-08 05:43:38 -07:00
ImmuState
443cc8fc4b Make the UI behave. 2022-06-08 05:43:38 -07:00
ImmuState
9a313e50eb Send periodic notifications to the client for ongoing forges. 2022-06-08 05:43:38 -07:00
ImmuState
4b77e84e81 Add ForgeQueueDataNotify, unwhack UI. 2022-06-08 05:43:38 -07:00
ImmuState
0e1c8dc526 Cancel forging and refund items. 2022-06-08 05:43:38 -07:00
ImmuState
0cc4bad18c Obtain forging results (UI is broken though). 2022-06-08 05:43:38 -07:00
ImmuState
28a8475cea Consume material. 2022-06-08 05:43:38 -07:00
ImmuState
a668bd6ec1 Check materials and mora 2022-06-08 05:43:38 -07:00
ImmuState
5db5c90a8b Start a new forge (no checking for now). 2022-06-08 05:43:38 -07:00
ImmuState
e5498e373e Add handling for ForgeExcelConfigData. 2022-06-08 05:43:38 -07:00
ImmuState
9d6bc2a910 Change active forges in player to list. 2022-06-08 05:43:38 -07:00
ImmuState
8db0500e9d Add missing forging protos, add data for ongoing forges to player, handler for ForgeStartReq. 2022-06-08 05:43:38 -07:00
ImmuState
3fc63c2c4b Move forging stuff to ForgingManager, make client respond to ForgeGetQueueDataReq and actually display forging queues. 2022-06-08 05:43:38 -07:00
Melledy
899a87a2ae Merge pull request #1215 from Grasscutters/stable 
oooo dev branch forgor this 💀
 2022-06-07 03:46:09 -07:00
Melledy
a8293102cf Merge branch 'development' into stable 2022-06-07 03:35:32 -07:00
Melledy
304b9cb8ed Delete BuildConfig.java 2022-06-07 03:27:43 -07:00