2472 Commits

This Branch

This Branch

All Branches

• Quick fix for questing, needs more investigation

  This would make the questing work again

  StartForKiller · 2023-05-31 22:30:49 -04:00
  6448bb1b9b
• Merge remote-tracking branch 'origin/unstable' into unstable
  KingRainbow44 · 2023-05-31 22:29:09 -04:00
  8840e2b574
• Add default open state ignore list
  KingRainbow44 · 2023-05-31 22:28:25 -04:00
  3e2607af4c
• Require plugins to specify an API version and match with the server
  KingRainbow44 · 2023-05-31 22:20:01 -04:00
  e7f30f4d43
• Load activity config on server startup
  KingRainbow44 · 2023-05-31 22:11:58 -04:00
  44a557a1dc
• Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met
  KingRainbow44 · 2023-05-31 22:11:45 -04:00
  4113b42707
• Format code [skip actions]
  github-actions · 2023-06-01 01:06:12 +00:00
  b1b8abc627
• Fix new avatar weapons being null
  KingRainbow44 · 2023-05-31 21:04:38 -04:00
  73c23707b4
• Format code [skip actions]
  github-actions · 2023-05-31 23:57:51 +00:00
  bcf54dd6ba
• Merge remote-tracking branch 'origin/unstable' into unstable

  # Conflicts:
  #	src/main/java/emu/grasscutter/game/entity/EntityWeapon.java

  KingRainbow44 · 2023-05-31 19:56:14 -04:00
  77a70c7880
• Implement handbook request limiting
  KingRainbow44 · 2023-05-31 19:55:13 -04:00
  8e11f53a2e
• Fix unnecessary warning for first-time setup
  KingRainbow44 · 2023-05-31 19:40:09 -04:00
  a575a2b7f6
• Remove deprecated API & Fix resource checking
  KingRainbow44 · 2023-05-31 19:38:12 -04:00
  28da66fff4
• Fix EntityWeapon
  KingRainbow44 · 2023-05-31 19:29:26 -04:00
  7db45a0a12
• Format code [skip actions]
  github-actions · 2023-05-31 23:26:53 +00:00
  36dee424ee
• Fix something and implement weapon entities
  StartForKiller · 2023-05-31 19:25:26 -04:00
  815ba3e3e3
• Merge remote-tracking branch 'origin/unstable' into unstable

  # Conflicts:
  #	src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
  #	src/main/java/emu/grasscutter/game/ability/AbilityManager.java

  KingRainbow44 · 2023-05-31 19:18:13 -04:00
  16ec2e3d40
• more trace
  KingRainbow44 · 2023-05-31 19:17:41 -04:00
  25b75b9691
• Format code [skip actions]
  github-actions · 2023-05-31 22:20:31 +00:00
  36a5661a21
• Move more logs to trace
  KingRainbow44 · 2023-05-31 18:18:06 -04:00
  1269a0430e
• Format code [skip actions]
  github-actions · 2023-05-31 06:12:06 +00:00
  07205d9a3a
• Merge remote-tracking branch 'origin/unstable' into unstable
  KingRainbow44 · 2023-05-31 02:10:35 -04:00
  f277f59725
• Use the headers provided by a context to get the IP address

  should acknowledge #1975

  KingRainbow44 · 2023-05-31 02:10:25 -04:00
  ff421c01f9
• Format code [skip actions]
  github-actions · 2023-05-31 05:36:13 +00:00
  c719076f87
• Lint Code [skip actions]
  github-actions · 2023-05-31 05:35:46 +00:00
  3563d05685
• Merge remote-tracking branch 'origin/unstable' into unstable
  KingRainbow44 · 2023-05-31 01:35:00 -04:00
  6c97da3715
• Fix handbook server details
  KingRainbow44 · 2023-05-31 01:32:23 -04:00
  d6d854cdd3
• Format code [skip actions]
  github-actions · 2023-05-31 04:54:33 +00:00
  006490a540
• Merge remote-tracking branch 'origin/unstable' into unstable

  # Conflicts:
  #	src/main/java/emu/grasscutter/server/http/documentation/HandbookHandler.java

  KingRainbow44 · 2023-05-31 00:51:39 -04:00
  959f0ad261
• Fix game-related data not saving
  KingRainbow44 · 2023-05-30 18:47:05 -04:00
  bef455d50c
• Add system for setting handbook address and port
  KingRainbow44 · 2023-05-30 17:38:13 -04:00
  31a02050cf
• Format code [skip actions]
  github-actions · 2023-05-30 20:55:44 +00:00
  bdbfb733a0
• Lint Code [skip actions]
  github-actions · 2023-05-30 20:55:09 +00:00
  9f3d859817
• Merge remote-tracking branch 'origin/unstable' into unstable
  KingRainbow44 · 2023-05-30 16:54:13 -04:00
  25b126f468
• Add system for setting handbook address and port
  KingRainbow44 · 2023-05-30 16:53:57 -04:00
  a35ce5fecb
• Format code [skip actions]
  github-actions · 2023-05-30 19:40:39 +00:00
  c69a889e66
• Use thread executors to speed up the database loading process
  KingRainbow44 · 2023-05-30 15:38:26 -04:00
  36a35c11aa
• Change the way HTML is served after authentication
  KingRainbow44 · 2023-05-30 14:29:55 -04:00
  2009a90e66
• Add properties to AbilityModifier
  KingRainbow44 · 2023-05-30 13:56:21 -04:00
  a3bbfd4c5d
• HACK: Return the avatar which holds the weapon when the weapon is referred to by ID
  KingRainbow44 · 2023-05-30 13:56:06 -04:00
  c6869aaaa2
• Implement completely useless global value copying
  KingRainbow44 · 2023-05-30 13:55:30 -04:00
  a2eba7b795
• Default debug to false; enable with -debug
  KingRainbow44 · 2023-05-30 13:28:43 -04:00
  999d3c739f
• Remove protocol definitions from Spotless
  KingRainbow44 · 2023-05-30 13:19:24 -04:00
  385b6fbd7c
• Format some code
  KingRainbow44 · 2023-05-30 13:07:49 -04:00
  01dfebf681
• Add system for sending messages between servers
  KingRainbow44 · 2023-05-30 13:06:50 -04:00
  c780fb7934
• Format code [skip actions]
  github-actions · 2023-05-30 06:43:54 +00:00
  a3c56dff7e
• Implement a proper ability system (#2166)

  * Apply fix `21dec2fe`
  
  * Apply fix `89d01d5f`
  
  * Apply fix `d900f154`
  
  this one was already implemented; updated to use call from previous commit
  
  * Ability changing commit
  
  TODO: change info to debug
  
  * Remove use of deprecated methods/fields
  
  * Temp commit v2
  (Adding LoseHP and some fixes)
  
  * Oopsie
  
  * Probably fix monster battle
  
  * Fix issue with reflecting into fields
  
  * Fix some things
  
  * Fix ability names for 3.6 resources
  
  * Improve logging
  
  ---------
  
  Co-authored-by: StartForKiller <jesussanz2003@gmail.com>

  Magix · 2023-05-30 02:40:02 -04:00
  f00c54cb95
• Fully fix fairy clock for real this time (#2167)

  * Fully fix fairy clock For real this time
  
  * Make it so relogging keeps the time lock state.
  
  * Refactor out questLockTime
  
  * Per Hartie, the client packet needs to be changed too
  
  * Update src/main/java/emu/grasscutter/game/world/World.java
  
  Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
  
  * Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
  
  * Remove all code not needed to get clock working
  
  ---------
  
  Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

  Nazrin · 2023-05-30 02:39:34 -04:00
  9b58105120
• Format code [skip actions]
  github-actions · 2023-05-30 05:53:50 +00:00
  911993084e
• Merge remote-tracking branch 'origin/unstable' into unstable

  # Conflicts:
  #	src/main/java/emu/grasscutter/data/excels/MonsterSpecialNameData.java

  KingRainbow44 · 2023-05-30 01:48:50 -04:00
  bcf15eb715