Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 14:39:24 +00:00
Code Issues Projects Releases Wiki Activity
2,322 Commits 7 Branches 22 Tags 133 MiB
93df2d0b0e
Commit Graph

2322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nazrin
582d7af9c4
Send QUEST_COND_STATE_NOT_EQUAL and QUEST_COND_STATE_EQUAL on login (#2394) 2023-10-02 10:56:09 -04:00
Nazrin
cab3bfb5a7
Fix bug in quest cond state not equal (#2393) 
* Fix bug in ConditionStateNotEqual.java

* Do the same fix for ConditionStateEqual.java
 2023-10-02 03:25:35 -04:00
github-actions
cf574e99cb Format code [skip actions] 2023-10-01 05:41:41 +00:00
KingRainbow44
3094facb88
Bump to version 1.7.2 2023-09-30 23:16:35 -04:00
KingRainbow44
6e309b6fee
Merge remote-tracking branch 'origin/development' into development 2023-09-30 23:15:50 -04:00
KingRainbow44
b5e35f5409
Add legacy documentation on Hide and Seek 2023-09-30 18:10:10 -04:00
KingRainbow44
a3fd10c3be
Fix NullPointerException when refilling an avatar with no skill depot 2023-09-30 18:09:40 -04:00
Nazrin
b6e7d69949
Send QUEST_COND_NONE on every login (#2386) 
For players that enabled questing late
 2023-09-25 19:30:33 -04:00
github-actions
5faf39d359 Format code [skip actions] 2023-09-23 17:45:57 +00:00
Nazrin
0dd95450b1
Bare-bones Hangouts implementation (#2384) 2023-09-23 13:44:31 -04:00
Aiden Leong
0f0e7aca68
use pretty_host in domain filtering (#2382) 2023-09-22 23:33:01 -04:00
hamusuke
5ee4812ac5
fix: login too slow (#2380) 2023-09-20 21:23:08 -04:00
github-actions
ec2bfffdd1 Format code [skip actions] 2023-09-18 01:03:10 +00:00
github-actions
7f5059cb8f Format code [skip actions] 2023-09-18 01:03:02 +00:00
jie65535
43db7eba8f
tp to move directly in the same scene (#2375) 2023-09-17 21:01:21 -04:00
jie65535
ff6a51db30
Update position parameters to support rotation-based offsets (#2374) 2023-09-17 21:00:58 -04:00
github-actions
047feaf4aa Format code [skip actions] 2023-09-17 02:57:50 +00:00
github-actions
88315ec712 Format code [skip actions] 2023-09-17 02:57:38 +00:00
jie65535
fdad4218e7
Fix freeze on startup (#2368) 
* DON'T load resources in static init!!!

* Update src/main/java/emu/grasscutter/Grasscutter.java

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

* Update src/main/java/emu/grasscutter/tools/Tools.java

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-16 22:55:46 -04:00
jie65535
5f5e6c38b1
Add rotation to /spawn (#2372) 2023-09-16 22:55:25 -04:00
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