Grasscutters/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2024-11-23 12:29:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,252 Commits 7 Branches 22 Tags 152 MiB
92bd09eeed
Commit Graph

2252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions
92bd09eeed Format code [skip actions] 2023-09-16 23:00:20 +00:00
KingRainbow44
30f7580184
Merge remote-tracking branch 'origin/development' into development 2023-09-16 18:59:02 -04:00
KingRainbow44
65eaaa96f2
Apply changes from #2310 2023-09-16 18:58:36 -04:00
github-actions
70a961e167 Format code [skip actions] 2023-09-16 22:44:16 +00:00
KingRainbow44
dd78addc29
Fix ability modifier serialization 2023-09-16 18:36:16 -04:00
KingRainbow44
43467ebc85
Factor fight properties into healing calculation 2023-09-16 18:32:01 -04:00
github-actions
1f15d6219b Format code [skip actions] 2023-09-16 21:40:49 +00:00
Simplxs
fb0c2dbc84
Merge pull request #2341 
* enableRandomEncryptSeed

* update config version

* Merge branch 'Grasscutters:development' into random-seed

* make the codes more beautiful

* move KahnsSort to algorithms

* rename variables

* Merge branch 'development' into random-seed
 2023-09-16 14:38:39 -07:00
github-actions
b8f7aea168 Format code [skip actions] 2023-09-16 21:33:36 +00:00
github-actions
cf8092e8ba Update languages [skip actions] 2023-09-16 21:32:21 +00:00
Thoronium
0e44d18ae9
Better SceneTags (#2361) 
* Add scene tag handling

* Move warns to debug

* Move to PlayerProgressManager

* Add success message

* Inline check

* Improve per-scene handling

* Update src/main/java/emu/grasscutter/command/commands/SetSceneTagCommand.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/command/commands/SetSceneTagCommand.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Fix types

* Small fix

* Update ScriptLib.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-16 17:31:59 -04:00
Magix
5bd8f532c1
i forgot to add ` 2023-09-16 17:23:54 -04:00
github-actions
ad62b6b11d Format code [skip actions] 2023-09-16 00:53:28 +00:00
github-actions
c9a43a5e98 Format code [skip actions] 2023-09-16 00:52:37 +00:00
hamusuke
5458d36102
fix: HomeModuleManager isnt ticked unless player changes module (#2365) 2023-09-15 20:51:16 -04:00
Nazrin
c4dbb6851b
Implement passJumpDungeon. Make dungeons kick you out to the correct scene (#2366) 2023-09-15 20:50:56 -04:00
github-actions
2643c6b3b7 Format code [skip actions] 2023-09-15 00:45:41 +00:00
Nazrin
84e1371499
Fixes for alchemy dude's quest part 2 (#2362) 
* Make platforms able to reset

platforms apparently are able to run again once reaching the last point. As well, canceling a timer seems to return a 0, not a 1

* Fix Seelies

Added HandlerClientScriptEventNotify (shoutouts to Hartie!) and cleaned up the platform stuff in ScriptLib.

There is a problem with HandlerClientScriptEventNotify where the client seems to only pass 0 into param1 instead of the configId. I coded in a workaround, but someone with greater access to things should check up on what is going on
 2023-09-14 20:44:30 -04:00
Nazrin
f955bb1e16
Little update to item giving handling (#2363) 
* Little update to HandlerItemGivingReq.java

GIVING_METHOD_GROUP is used in cooking girl's quest

* Send the giving packet at the start of relogs, even if encountered before.

* Make item checking not exact

You can have more items in your inventory than what you are submitting.
 2023-09-14 20:44:08 -04:00
hamusuke
2b64814534
fix: home worlds are ticked twice (#2360) 2023-09-14 01:22:29 -04:00
KingRainbow44
ea5ee075a7
Merge remote-tracking branch 'origin/development' into development 2023-09-13 21:03:44 -04:00
KingRainbow44
6108a3bb37
Handbook documentation & build flow fixes 2023-09-13 21:03:32 -04:00
Ceris White
98a83b649e
Add more precise instructions for the handbook (#2359) 
* Add more precise instructions for the handbook

* Reformat Building section
 2023-09-13 21:02:20 -04:00
TotallyNotOndre
4f62e484ad
Update ru-RU.json (#2356) 
translation & typo
 2023-09-12 11:56:31 -04:00
Thoronium
5fd31aece8
Fix home nulls (#2355) 
* Add null checking

* Sanity check for moduleManager
 2023-09-12 01:07:17 -04:00
github-actions
8de281d4da Format code [skip actions] 2023-09-10 23:21:44 +00:00
Nazrin
fbe2b138ee
Fixes for alchemy dude's quest (#2352) 
* Add drops for gadgets

Gadgets only have drop_id when they are not chests (chest_drop_id). When drop_id is not set (0), handleChestDrop quickly exits

* Implement QUEST_COND_ITEM_GIVING_FINISHED

Took the oppertunity to Rename ContentFinishGivingItem to ItemGiving

* Store accept conditions like fail and finish content are

Took the oppertunity to clean up some old code as well

conditions are stored in QuestManager

* Update src/main/java/emu/grasscutter/game/quest/QuestManager.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update ConditionItemGivingFinished.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-10 19:20:28 -04:00
Nazrin
47c96fd964
Regular ScriptLib update! (#2349) 
* Regular ScriptLib update!

* Move RefreshGroup down to debug

* Update SetGadgetEnableInteract
 2023-09-09 20:49:22 -04:00
CJYKK
04370f1a21
Update CN README to game REL 4.0 (#2350) 2023-09-09 20:48:32 -04:00
github-actions
7845c54570 Format code [skip actions] 2023-09-09 03:07:29 +00:00
Pradeep
818b638bed
Added Hindi Language Support (#2347) 
* Added Hindi Language Support 

Please review the code

* Update README_HE.md

* Update README_NL.md

* Update README_es-ES.md

* Update README_fil-PH.md

* Update README_fr-FR.md

* Update README_id-ID.md

* Update README_it-IT.md

* Update README_ja-JP.md

* Update README_ko-KR.md

* Update README_pl-PL.md

* Update README_ru-RU.md

* Update README_vi-VN.md

* Update README_zh-CN.md

* Update README_zh-TW.md
 2023-09-08 23:07:18 -04:00
Nazrin
a9402f487f
Implement RegionShape.POLYGON and RegionShape.CYLINDER (#2348) 
Also took the opportunity to sort them in order and use multiplication instead of pow.
 2023-09-08 23:06:14 -04:00
github-actions
cdcdf924bd Format code [skip actions] 2023-09-08 03:35:28 +00:00
hamusuke
fc42f665a7
feat: implement teapot suite (#2344) 
* feat: implement teapot suite

* fix: home animals, check respawn, etc

* fix: NPE and cancel summon events

* fix: forgot to send eventId also
 2023-09-07 23:34:03 -04:00
Nazrin
83602f78ae
Update readme to 4.0 from 3.7 (#2343) 2023-09-07 23:33:13 -04:00
github-actions
8db1f597ce Format code [skip actions] 2023-09-02 23:51:35 +00:00
KingRainbow44
c08ab19d84
Various removals of '&' for Javadoc to be happy 2023-09-02 19:49:38 -04:00
KingRainbow44
34589d0128
Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:48:39 -04:00
KingRainbow44
70ee3ed1a6
Remove protocol definitions from Javadoc generation 2023-09-02 19:31:58 -04:00
github-actions
88d7be86da Format code [skip actions] 2023-09-02 23:06:00 +00:00
KingRainbow44
d6abb2288d
Bump version to v1.7.1 2023-09-02 19:05:34 -04:00
KingRainbow44
416ef56101
Bump down the plugin API version 
nothing major was *removed*, meaning all existing v2 plugins should still work
 2023-09-02 19:05:30 -04:00
KingRainbow44
ed0e89074b
Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:04:09 -04:00
hamusuke
1894296ed4
fix: home transfer (#2327) 
* fix: home transfer

* Update HomeSceneItem.java
 2023-09-02 19:04:02 -04:00
KingRainbow44
69a223949b
Merge remote-tracking branch 'origin/development' into development 2023-09-02 19:02:41 -04:00
github-actions
f8fb6732de Format code [skip actions] 2023-09-02 15:55:11 +00:00
hamusuke
ed97201473
fix: arrangement of main house is duplicated even if player changes module (#2325) 
* fix: arrangement of main house is duplicated even if player change module

* removeIf

* Update src/main/java/emu/grasscutter/game/home/GameHome.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-02 11:52:56 -04:00
github-actions
decf494234 Format code [skip actions] 2023-09-02 05:49:00 +00:00
github-actions
9c25060c78 Format code [skip actions] 2023-09-02 05:48:12 +00:00
hamusuke
a49f37edb3
feat: finish home avatar talk (#2328) 2023-09-02 01:47:06 -04:00