2059 Commits

This Branch

This Branch

All Branches

• Merge branch 'development' into unstable-quests

  # Conflicts:
  #	src/main/java/emu/grasscutter/command/commands/SetPropCommand.java

  KingRainbow44 · 2023-04-24 21:00:03 -04:00
  34c3c6229f
• Remove obsolete code
  KingRainbow44 · 2023-04-24 20:56:20 -04:00
  52ac9cd75e
• use intstream instead of silly list in prop cmd (#2128)
  Moistcrafter · 2023-04-24 20:55:08 -04:00
  60e8106b01
• Catch LuaError when loading scene groups
  KingRainbow44 · 2023-04-24 03:11:47 -04:00
  3e6b38c407
• Move cache hit to trace
  KingRainbow44 · 2023-04-24 03:11:26 -04:00
  9c77ddc42e
• Fix issue with serialized GridPositions
  KingRainbow44 · 2023-04-24 03:11:09 -04:00
  66b0e6f3c6
• Fix main quest data loading issue
  KingRainbow44 · 2023-04-24 03:10:22 -04:00
  25c72a19e0
• Revert previous; fix data parsing issue
  KingRainbow44 · 2023-04-24 02:26:00 -04:00
  486582b81c
• Add sub-quest data only in BinOutput

  could fix things sometimes

  KingRainbow44 · 2023-04-24 02:01:17 -04:00
  fb686b2afc
• Apply additional data from specific main quest lines
  KingRainbow44 · 2023-04-24 01:44:58 -04:00
  1a8d7e901a
• Fix quest domains not showing up
  KingRainbow44 · 2023-04-24 00:09:59 -04:00
  0d680a6310
• Add new protocol definitions
  KingRainbow44 · 2023-04-23 23:12:20 -04:00
  40b23ec4a4
• Run spotlessApply on previous commit
  KingRainbow44 · 2023-04-23 23:12:01 -04:00
  e85d269518
• Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests)
  KingRainbow44 · 2023-04-23 22:51:08 -04:00
  c9d6225194
• Update quest line documentation
  KingRainbow44 · 2023-04-20 01:12:25 -04:00
  d608831594
• Attempt to keep parity with Grasscutter-Quests & Fix add trial avatar issue
  KingRainbow44 · 2023-04-20 00:58:23 -04:00
  375bb77abe
• Fixing the starting world time

  the proper start time should be 9 game hours

  KingRainbow44 · 2023-04-20 00:40:13 -04:00
  ae45177ed5
• Fix quests always showing dungeon IDs
  KingRainbow44 · 2023-04-20 00:26:35 -04:00
  84c5a76e5d
• Fix avatar trial status being saved to the database
  KingRainbow44 · 2023-04-20 00:22:29 -04:00
  a53328346a
• Update the README (#2126)

  * Update the README
  
  1. GNUify to maintain consistency 
  2. Update troubleshooting
  
  * Per Magix

  Colleiflower · 2023-04-19 23:08:54 -04:00
  016eae9b44
• Check for custom server resources
  KingRainbow44 · 2023-04-18 17:43:10 -04:00
  de19116191
• Run spotlessApply
  KingRainbow44 · 2023-04-18 17:17:55 -04:00
  ee298235c2
• Fix avatar type values
  KingRainbow44 · 2023-04-18 16:01:29 -04:00
  75f163f704
• Send avatar type to client

  also switch to lambda reference

  KingRainbow44 · 2023-04-18 15:56:19 -04:00
  de0217f435
• 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

  KingRainbow44 · 2023-04-18 15:36:29 -04:00
  361620de6d
• fix co-op mode avatar animation interrupt (#2124)
  FlourishingWorld · 2023-04-18 15:19:34 -04:00
  8c6b166a42
• 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>

  dragon · 2023-04-18 15:19:29 -04:00
  0dd41f9350
• Parse dungeon entry info req from payload instead of player scene (#2122)
  Moistcrafter · 2023-04-17 01:08:08 -04:00
  abcabc9861
• Remove the first area from being auto-unlocked when questing is enabled
  KingRainbow44 · 2023-04-15 13:33:30 -04:00
  6989d49080
• Move gadget controller loaded message to debug
  KingRainbow44 · 2023-04-15 13:17:09 -04:00
  c672a2d9cb
• forever engraved (#2120)
  SpikeHD · 2023-04-15 02:35:15 -04:00
  b302c2b73b
• Fix entity controllers not loading

  elemental monuments should now work

  KingRainbow44 · 2023-04-15 01:41:19 -04:00
  d8f90b26cf
• Fix issue with Amber not being added

  the field for an item's `useOnGain` was final!

  KingRainbow44 · 2023-04-15 01:23:32 -04:00
  2b4feba86f
• Fix drop system error
  KingRainbow44 · 2023-04-15 00:50:03 -04:00
  f2019aa88a
• Remove forEach on group replacements
  KingRainbow44 · 2023-04-14 23:56:42 -04:00
  f08ba95071
• Remove .gitattributes

  this should fix some line separator issues

  KingRainbow44 · 2023-04-14 23:33:54 -04:00
  fcc68891be
• Load custom server resources
  KingRainbow44 · 2023-04-14 23:27:08 -04:00
  55118c802d
• Fix level entity data loading
  KingRainbow44 · 2023-04-14 22:59:57 -04:00
  a8a78547a1
• Set dungeon manager when entering a dungeon
  KingRainbow44 · 2023-04-14 22:44:59 -04:00
  6b492656a1
• Use the player's selected main character when setOwner is called
  KingRainbow44 · 2023-04-14 22:01:09 -04:00
  e93175621b
• Merge packet handlers from quests/quests
  KingRainbow44 · 2023-04-14 21:59:15 -04:00
  7bdcf4e0d2
• Update quest line documentation
  KingRainbow44 · 2023-04-14 02:39:15 -04:00
  b5190bca45
• Fix issue with trial teams
  KingRainbow44 · 2023-04-14 02:37:15 -04:00
  c08633aa46
• Fix avatar skill behavior when changing elements
  KingRainbow44 · 2023-04-14 01:54:43 -04:00
  ae56b33265
• Fix setOrFetch on 0 values
  KingRainbow44 · 2023-04-14 01:02:11 -04:00
  3224bbeb4f
• Temporarily fix issue with all quests being added at once
  KingRainbow44 · 2023-04-14 00:35:16 -04:00
  2a5c7bf75c
• Fix default Traveler
  KingRainbow44 · 2023-04-14 00:31:46 -04:00
  6c1cff38b4
• Add data for new drop system
  KingRainbow44 · 2023-04-13 22:44:50 -04:00
  af01282594
• Set CRLF as the default line separator

  this will be changed back to LF after unstable-quests is finished

  KingRainbow44 · 2023-04-13 22:43:46 -04:00
  84713d9b2e
• Implement a new item drops system (#2112)

  * 1
  
  * Delete .gitattributes
  
  * implement
  
  * Update PacketDropHintNotify.java
  
  * Update PacketWorldChestOpenNotify.java
  
  * Update FileUtils.java
  
  * Update PacketDropHintNotify.java
  
  * Update WorldDataSystem.java
  
  ---------
  
  Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

  dragon · 2023-04-13 22:28:54 -04:00
  f71b29c00a