Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 15:49:20 +00:00
Code Issues Projects Releases Wiki Activity
2,336 Commits 7 Branches 22 Tags 133 MiB
d5756f2559
Commit Graph

1858 Commits

Author SHA1 Message Date
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
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
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
github-actions
7845c54570 Format code [skip actions] 2023-09-09 03:07:29 +00: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
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
github-actions
88d7be86da Format code [skip actions] 2023-09-02 23:06:00 +00: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
hamusuke
97138d8c84
feat: implement home animals (#2329) 2023-09-02 01:46:58 -04:00
KingRainbow44
314bccb7a2
Add command description for debug 2023-09-01 20:50:37 -04:00
github-actions
c1045103ed Format code [skip actions] 2023-09-02 00:37:43 +00:00
Moistcrafter
1831d5c81f
SerializedName MonsterSpecialName (#2331) 
* SerializedName MonsterSpecialName

* uh add space back

* remove space

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-09-01 20:35:54 -04:00
github-actions
717a358636 Format code [skip actions] 2023-09-02 00:33:12 +00:00
hamusuke
0db69882a3
fix: sync home avatar costume (#2326) 2023-09-01 20:31:55 -04:00
KingRainbow44
12da46b5ee
Re-order troubleshooting info 2023-09-01 20:29:25 -04:00
Magix
6fc4859f31
Merge pull request #2313 from Grasscutters/dev-4.0 
Upgrade to REL4.0.x
 2023-08-31 22:05:36 -07:00
KingRainbow44
89efa35f83
Disable LOG_MISSING_ABILITY_HANDLERS 2023-09-01 00:52:30 -04:00
KingRainbow44
e04df0526a
Run formatter & update protocol 2023-08-31 23:46:55 -04:00
KingRainbow44
541433c01b
Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0 
# Conflicts:
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/player/TeamManager.java
#	src/main/java/emu/grasscutter/game/world/Scene.java
 2023-08-31 21:06:13 -04:00
KingRainbow44
9295d79bc2
Reflections change & Start HTTP before game server 2023-08-31 20:59:38 -04:00
KingRainbow44
58b3570f27
De-obfuscate definitions & run formatter 2023-08-31 19:29:31 -04:00
KingRainbow44
d43e5ca608
Compile scripts to replace require with script content 2023-08-31 01:09:53 -04:00
KingRainbow44
67c0e82dfb
Logging changes (move levels down & add toString for some objects) 2023-08-30 23:28:54 -04:00
KingRainbow44
aad4529b0e
Run formatter & 'protogen' 2023-08-30 19:36:58 -04:00
hamusuke
e8f4949836
feat: add more home mark point (#2323) 2023-08-30 19:32:47 -04:00
KingRainbow44
1ca451559c
Add PlayerNpcTalkEvent 2023-08-29 23:54:34 -04:00
KingRainbow44
dbc45f36f0
Add PlayerSwitchAvatarEvent 2023-08-29 23:48:51 -04:00
KingRainbow44
e3f15bca47
Add PlayerLevelStatueEvent & PlayerUseSkillEvent 2023-08-29 23:35:58 -04:00
hamusuke
7049cfdb58
fix: player profile changes are not reflected cuz Java is object-oriented (#2322) 
* fix: player profile changes are not reflected.
fix: deob FriendBrief.proto

* fix: tentatively sync profile when log out

* fix: allow offline player

* Update src/main/java/emu/grasscutter/game/friends/PlayerProfile.java

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

* Update src/main/java/emu/grasscutter/game/player/Player.java

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

* Update src/main/java/emu/grasscutter/game/player/Player.java

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

* fix: server friend

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
 2023-08-29 23:23:46 -04:00
hamusuke
8e4e3dd89e
fix: redundant packet 'PacketTakeAchievementRewardReq' in login req (#2321) 2023-08-29 21:12:38 -04:00
hamusuke
8563d4b574
feat: support multiplayer mode in teapot (#2317) 2023-08-29 21:12:21 -04:00
KingRainbow44
48439e7e5d
Add PlayerPropertyChangeEvent 2023-08-29 17:25:48 -04:00
hamusuke
667008ecf1
fix: sync team avatar changes (#2320) 2023-08-29 12:20:17 -04:00
hamusuke
b72f81e720
just sync it! (#2319) 2023-08-29 12:18:39 -04:00
hamusuke
666b87636a
just sync it! (#2318) 2023-08-29 12:18:07 -04:00
Thoronium
f54432a89a
Bug fixes (#2314) 
* Match resources names

* Fix loading with no skill

* Stop overriding common command alias

* Fix discord link in version check popup

* Forgot to add rotation fix

* Remove unnecessary set
 2023-08-29 12:15:19 -04:00
KingRainbow44
4f2d3f9b30
Run formatter on wish event 2023-08-28 19:34:30 -04:00
KingRainbow44
3436e0a3a8
Add PlayerFinishBattlePassMission 2023-08-28 19:34:04 -04:00
KingRainbow44
ee33fed721
Add PlayerWishEvent 2023-08-28 13:59:30 -04:00
KingRainbow44
b7855c3487
Run formatter on previous changes 2023-08-28 11:30:04 -04:00
KingRainbow44
6269f0e168
Add ExecuteCommandEvent 2023-08-28 09:31:11 -04:00
KingRainbow44
8c0032fc75
Run formatter on new events 2023-08-27 23:36:41 -04:00
KingRainbow44
0ad8eb443b
Add PlayerObtainItemEvent 2023-08-27 23:29:21 -04:00
KingRainbow44
9c8a29c864
Add PlayerObtainAvatarEvent 2023-08-27 23:27:33 -04:00
KingRainbow44
76b27df622
Add PlayerLevelItemEvent 2023-08-27 23:26:51 -04:00
KingRainbow44
314b90e936
Add PlayerLevelAvatarEvent 2023-08-27 23:26:01 -04:00
KingRainbow44
4bd0fbf657
Add PlayerCompleteAchievementEvent 2023-08-27 23:23:55 -04:00
KingRainbow44
9bb3ec8916
Change the result of call to a boolean 
Returns true if logic execution should continue, false if logic condition should terminate
 2023-08-27 23:23:42 -04:00
KingRainbow44
154ace3d7e
Run formatter on code 2023-08-27 23:23:01 -04:00
KingRainbow44
40887b17fe
Add PlayerForgeItemEvent 2023-08-27 23:22:35 -04:00
KingRainbow44
9b84deaab3
Add PlayerCompleteQuestEvent 2023-08-27 23:22:18 -04:00