Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 03:37:38 +00:00
Code Issues Projects Releases Wiki Activity
1,816 Commits 7 Branches 22 Tags 133 MiB
5bb43ac074
Commit Graph

1816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benj
d8816911a6 Make PointData compatible with alternative PointData 
Original Commit Message: Make PointData compatible with windied scene points.
Gitea Author: GanyusLeftHorn

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
 2022-08-24 11:34:26 +09:30
Benj
cb97ac8250 Fixed Gadget Spawning 
Original Commit Message: fixed gadget spawning ty MJDerp
Gitea Author: yh0Nathan

Co-authored-by: yh0Nathan <yhonathancaleb@gmail.com>
 2022-08-24 11:34:26 +09:30
Benj
da06982d5d 3.0 Opcodes 2022-08-24 11:34:26 +09:30
Benj
e8e3fcbc9c Fix RegionHandler versions 2022-08-24 11:34:26 +09:30
Benj
c096d255fd Update classes to match protos 2022-08-24 11:34:26 +09:30
Benj
d575d1ccea Update 3.0 protos 2022-08-24 11:34:26 +09:30
omg-xtao
5db73d2849
Fix QuestEncryptionKeys Path (#1696) 
* Fix QuestEncryptionKeys Path

* Load resources QuestEncryptionKeys
 2022-08-23 23:29:52 +09:30
AwayJob
1dd84d69b3
Update README.md (#1695) 
* a lot

fixed action embed, embed to mitm & fiddler, small fixes and clarifications

* no more confusion

fixed the hosts file embed

* Revert Java SE

* Minor fix
 2022-08-23 20:10:11 +09:30
Alexander
b23c07a102 More literate README_ru-RU.md 
Add note about Discord Community ("On English")
And somewhere changed the spelling
 2022-08-23 17:26:10 +09:30
AnimeGitB
5aaa1bda2a Avoid potential NPE on WL0 (#1693) 2022-08-23 17:24:17 +09:30
AnimeGitB
6e35625f1a Make lint workflows ignore generated folder 
But run them on linter and workflow changes
 2022-08-23 10:33:32 +09:30
AnimeGitB
36b71d0198 Clean up some Position usage to avoid unneccessary unpacks 2022-08-22 17:08:34 +09:30
Melledy
dbf2b91d03
Fix healing skills being able to heal dead characters 2022-08-21 22:35:05 -07:00
Melledy
513924af7c
Fix null pointer in Avatar if skill level map didnt already contain skill id 2022-08-21 22:20:54 -07:00
Melledy
1e649cd804
Delete quests from the player if there are errors loading them from the db 2022-08-21 22:19:34 -07:00
2y8e9h22
c53697da82
update zh-CN.json (#1684) 
* update

* update
 2022-08-22 11:05:34 +09:30
Abdul
20692cc4f8 Update ru-RU.json 2022-08-22 09:53:50 +09:30
AnimeGitB
30b20c8664 Rename lint_commit's job, don't fail on no changes 2022-08-22 01:58:55 +09:30
AnimeGitB
e38c6251f6 Fix lint commit reference 2022-08-22 01:49:50 +09:30
AnimeGitB
d9f85ba2a7 Allow adding constellations to playerless avatars 
Fixes #1682
 2022-08-22 01:35:11 +09:30
github-actions
c517b8a2c9 Fix whitespace [skip actions] 2022-08-21 11:33:54 +00:00
AnimeGitB
a746d11b6f Don't lint src/generated 2022-08-21 21:02:44 +09:30
AnimeGitB
3fca950050 Make TalentCommand show off new Translate function 2022-08-21 20:53:37 +09:30
AnimeGitB
955004343f Improve translate function 
Make commands pass ints and floats instead of manually casting them to string first
 2022-08-21 20:53:37 +09:30
AnimeGitB
4b03770ec1 Hide resin from map when disabled 2022-08-21 19:38:38 +09:30
Melledy
a436ae9fe1 Replace protos with generated protos 
Protos can still be auto compiled from the `./proto/` folder.
 2022-08-21 00:37:36 -07:00
akatatsu27
77f2bcf5bf small quest fixes (#1677) 
* small quest fixes

* uncomment hack
 2022-08-21 00:08:37 -07:00
赵怡然
abd1e7569e Blossom Implement (#1606) 
* Blossom!

* rename

* delete SpawnBlossomEntry.java

* use MAP

* use List

* use LIST

* use List

* useCondensedResin

* useCondensedResin

* fix build

* enhance

* fix bug

* REMOVE BOSS

* fix condensed resin

* fix condensed resin

* use POSITIVE_INFINITY

* use RewardPreviewData

* fix build

* fix resources

* add BLOSSOM_MONSTER_FIGHTING_VOLUME

* edit monster score

* edit monster score

* fix bug

* fix bug

* improve logic

* fix monsters level

* Deleted comment blocks

* nitpick

* Fix compilation problems

* nitpick

* Refactor + nitpick

* Clean up overall diff to develop

* Clean up other usage of condensed resin

* Clean up overall diff to develop

* Lombokify Scene.java

* Missed an odd getter name

* Unhardcode reward previews

* EDIT NAME

* remove leyline 1

* remove leyline 2

* Update BlossomManager.java

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-20 23:19:59 -07:00
Magix
957296fa2d Merge pull request #1680 from 4Benj/development 
Remove uncompiled protos from compiled jar
 2022-08-20 20:45:22 -07:00
Benj
825517c2ec Remove uncompiled protos from compiled jar 2022-08-21 11:39:21 +08:00
AnimeGitB
b3a7cde76c Remove crazy high AEXP drops from default chest rewards 2022-08-20 14:06:28 +09:30
AnimeGitB
48d31e45ed Fix talentcommand message key 2022-08-19 16:52:02 +09:30
AnimeGitB
fb1bacb0f8 Refactor avatar skilldepot and constellation/talent changing 
Ensures Traveler retains talent levels and constellations on inactive elements when switching elements.
Relevant for any other skillDepot-changing activities like Windtrace too, though keeping those in the db might not be as useful.

Refactor avatar talent upgrade and access
Refactor skillExtraCharges
 2022-08-19 16:43:57 +09:30
J
78b7fb70ac Add README_fil-PH.md (#1675) 
* Add README_fil-PH.md

* Add README_fil-PH.md

* Update README_fil-PH.md

Co-authored-by: J <jcatrdev@gmail.com>
 2022-08-19 15:37:02 +09:30
AnimeGitB
7d523efd41 Avoid allocations on Map::putIfAbsent usage 
Map::computeIfAbsent only runs the passed constructors when it needs to
 2022-08-19 12:47:50 +09:30
AnimeGitB
0cb75aeb5f Add iterable payItems methods 
Shame they could never be fully generic, but oh well
 2022-08-18 23:02:26 +09:30
AnimeGitB
efa69c007d Change unlocked scenes from lists to sets 2022-08-18 22:38:55 +09:30
AnimeGitB
c3450e8905 Handbooks: use some sorted maps 2022-08-18 22:06:08 +09:30
AnimeGitB
b3c80db417 Stop vendoring fastutil 2022-08-18 22:05:51 +09:30
AnimeGitB
9e0d6538e9 Lombokify some more getters 2022-08-17 21:11:40 +09:30
AnimeGitB
02deeb2852 Remove erroneous references to excel skilldata instead of avatar skilldata 
Refactor team resonances and correct login behaviour and less-than-full-party behaviour
 2022-08-17 21:07:29 +09:30
1chanuser
b4a2fe37e3 Add README_ko-KR.md (#1673) 
* Add files via upload

Add README_ko-KR.md

* Update README.md

Add ko_KR

* Update README_HE.md

Add ko_KR

* Update README_es-ES.md

Add ko_KR

* Update README_fr-FR.md

Add ko_KR

* Update README_id-ID.md

Add ko_KR

* Update README_pl-PL.md

Add ko_KR

* Update README_ru-RU.md

Add ko_KR

* Update README_zh-CN.md

Add ko_KR

* Update README_zh-TW.md

Add ko_KR

* Update README_ko-KR.md

Add README_ko-KR.md

* Update README_HE.md
 2022-08-17 16:20:11 +09:30
AnimeGitB
48cd9f6be2 Don't use UIDs as initial capacity for chat history 2022-08-17 03:20:06 +09:30
AnimeGitB
fab7e4a461 ChatSystem nitpick 2022-08-17 00:17:41 +09:30
GanyusLeftHorn
dc153572dd Fix chat welcome messages and some slight refactoring. 2022-08-17 00:12:27 +09:30
AnimeGitB
97779fd35a Fix deprecated chat references 2022-08-16 15:13:51 +09:30
2y8e9h22
c115fe1abe update zh-CN.json (#1662) 
Original commits:
* .
* Apply suggestions from code review
 2022-08-16 10:11:26 +09:30
Luke H-W
dc9cef8ab7 Refactoring (#1660) 
* Refactor a couple of iterators

* Use side-effect instead of second iterator

* Make World::onTick return shouldDelete instead of success

* Replace Shop iterator with side effects

* Scene

* Clean up Expeditions

* Refactor Expeditions

* Clean up Expeditions, Player

* Limit Expeditions by AR

* Lombokify props

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
 2022-08-15 23:19:13 +09:30
Zxilly
bccf516ca7 chore: typo fix 2022-08-15 22:54:31 +09:30
Magix
3ec411b11a Bump config version. 2022-08-14 11:00:29 -04:00