Commit Graph

2485 Commits

Author SHA1 Message Date
KingRainbow44
34c3c6229f
Merge branch 'development' into unstable-quests
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
2023-04-24 21:00:03 -04:00
KingRainbow44
18124bd053
Merge branch 'development' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
2023-04-24 20:58:14 -04:00
KingRainbow44
52ac9cd75e
Remove obsolete code 2023-04-24 20:56:20 -04:00
Moistcrafter
60e8106b01
use intstream instead of silly list in prop cmd (#2128) 2023-04-24 20:55:08 -04:00
KingRainbow44
3e6b38c407
Catch LuaError when loading scene groups 2023-04-24 03:11:47 -04:00
KingRainbow44
9c77ddc42e
Move cache hit to trace 2023-04-24 03:11:26 -04:00
KingRainbow44
66b0e6f3c6
Fix issue with serialized GridPositions 2023-04-24 03:11:09 -04:00
KingRainbow44
25c72a19e0
Fix main quest data loading issue 2023-04-24 03:10:22 -04:00
KingRainbow44
486582b81c
Revert previous; fix data parsing issue 2023-04-24 02:26:00 -04:00
KingRainbow44
fb686b2afc
Add sub-quest data only in BinOutput
could fix things sometimes
2023-04-24 02:01:17 -04:00
KingRainbow44
1a8d7e901a
Apply additional data from specific main quest lines 2023-04-24 01:44:58 -04:00
KingRainbow44
0d680a6310
Fix quest domains not showing up 2023-04-24 00:09:59 -04:00
KingRainbow44
40b23ec4a4
Add new protocol definitions 2023-04-23 23:12:20 -04:00
KingRainbow44
e85d269518
Run spotlessApply on previous commit 2023-04-23 23:12:01 -04:00
KingRainbow44
c9d6225194
Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests) 2023-04-23 22:51:08 -04:00
KingRainbow44
d608831594
Update quest line documentation 2023-04-20 01:12:25 -04:00
KingRainbow44
375bb77abe
Attempt to keep parity with Grasscutter-Quests & Fix add trial avatar issue 2023-04-20 00:58:23 -04:00
KingRainbow44
ae45177ed5
Fixing the starting world time
the proper start time should be 9 game hours
2023-04-20 00:40:13 -04:00
KingRainbow44
84c5a76e5d
Fix quests always showing dungeon IDs 2023-04-20 00:26:35 -04:00
KingRainbow44
a53328346a
Fix avatar trial status being saved to the database 2023-04-20 00:22:29 -04:00
Colleiflower
016eae9b44
Update the README (#2126)
* Update the README

1. GNUify to maintain consistency 
2. Update troubleshooting

* Per Magix
2023-04-19 23:08:54 -04:00
KingRainbow44
de19116191
Check for custom server resources 2023-04-18 17:43:10 -04:00
KingRainbow44
ee298235c2
Run spotlessApply 2023-04-18 17:17:55 -04:00
KingRainbow44
75f163f704
Fix avatar type values 2023-04-18 16:01:29 -04:00
KingRainbow44
de0217f435
Send avatar type to client
also switch to lambda reference
2023-04-18 15:56:19 -04:00
KingRainbow44
361620de6d
Merge branch 'development' into unstable-quests
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
2023-04-18 15:36:29 -04:00
KingRainbow44
c11b8a53a3
Merge branch 'development' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
2023-04-18 15:32:50 -04:00
FlourishingWorld
8c6b166a42
fix co-op mode avatar animation interrupt (#2124) 2023-04-18 15:19:34 -04:00
dragon
0dd41f9350
implement getCachePath (#2121)
* implement getCachePath

for further use like grids cache.

* Update src/main/java/emu/grasscutter/utils/FileUtils.java

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-04-18 15:19:29 -04:00
Moistcrafter
abcabc9861
Parse dungeon entry info req from payload instead of player scene (#2122) 2023-04-17 01:08:08 -04:00
KingRainbow44
6989d49080
Remove the first area from being auto-unlocked when questing is enabled 2023-04-15 13:33:30 -04:00
KingRainbow44
c672a2d9cb
Move gadget controller loaded message to debug 2023-04-15 13:17:09 -04:00
SpikeHD
b302c2b73b
forever engraved (#2120) 2023-04-15 02:35:15 -04:00
KingRainbow44
d8f90b26cf
Fix entity controllers not loading
elemental monuments should now work
2023-04-15 01:41:19 -04:00
KingRainbow44
2b4feba86f
Fix issue with Amber not being added
the field for an item's `useOnGain` was final!
2023-04-15 01:23:32 -04:00
KingRainbow44
f2019aa88a
Fix drop system error 2023-04-15 00:50:03 -04:00
KingRainbow44
f08ba95071
Remove forEach on group replacements 2023-04-14 23:56:42 -04:00
KingRainbow44
fcc68891be
Remove .gitattributes
this should fix some line separator issues
2023-04-14 23:33:54 -04:00
KingRainbow44
55118c802d
Load custom server resources 2023-04-14 23:27:08 -04:00
KingRainbow44
a8a78547a1
Fix level entity data loading 2023-04-14 22:59:57 -04:00
KingRainbow44
6b492656a1
Set dungeon manager when entering a dungeon 2023-04-14 22:44:59 -04:00
KingRainbow44
e93175621b
Use the player's selected main character when setOwner is called 2023-04-14 22:01:09 -04:00
KingRainbow44
7bdcf4e0d2
Merge packet handlers from quests/quests 2023-04-14 21:59:15 -04:00
KingRainbow44
b5190bca45
Update quest line documentation 2023-04-14 02:39:15 -04:00
KingRainbow44
c08633aa46
Fix issue with trial teams 2023-04-14 02:37:15 -04:00
KingRainbow44
ae56b33265
Fix avatar skill behavior when changing elements 2023-04-14 01:54:43 -04:00
KingRainbow44
3224bbeb4f
Fix setOrFetch on 0 values 2023-04-14 01:02:11 -04:00
KingRainbow44
2a5c7bf75c
Temporarily fix issue with all quests being added at once 2023-04-14 00:35:16 -04:00
KingRainbow44
6c1cff38b4
Fix default Traveler 2023-04-14 00:31:46 -04:00
KingRainbow44
8687e60b92
Merge branch 'development' into unstable
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
2023-04-13 22:45:15 -04:00