Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge unstable into development #2173

Merged
merged 535 commits into from
Jun 1, 2023
Merged

Merge unstable into development #2173

merged 535 commits into from
Jun 1, 2023

Conversation

KingRainbow44
Copy link
Member

@KingRainbow44 KingRainbow44 commented May 30, 2023 •
edited
Loading

Description

The biggest feature merge in a long time!
Includes:

  • Natural progression for quests
  • ConfigAbility framework
  • Various bug fixes
  • Multi-server dispatching solution
  • Better GM Handbook in the browser

The entire Prologue Act 1 can be completed with this PR!

Issues fixed by this PR

#165 #2171

Type of changes

  • Bug fix
  • New feature
  • Enhancement
  • Documentation

Checklist:

  • My code follows the style guidelines of this project
  • My pull request is unique and no other pull requests have been opened for these changes
  • I have read the Contributing note and Code of conduct
  • I am responsible for any copyright issues with my code if it occurs in the future.

KingRainbow44 and others added 30 commits May 10, 2023 22:21
@KingRainbow44
Remove more scene synchronized
e32aea4
@KingRainbow44
Fix worktop options not appearing
f51fd55
@github-actions
Format code [skip actions]
f9906c4
@KingRainbow44
Fix delay with server tasks
42e6e4c
@github-actions
Format code [skip actions]
c78f9f2
@scooterboo
Fully fix fairy clock (#2146)
5e3acab 
* Fix scene transition

* fully fix fairy clock
@KingRainbow44
Re-add call to Player#updatePlayerGameTime
de5fd49
@github-actions
Format code [skip actions]
77e048b
@KingRainbow44
Merge remote-tracking branch 'origin/unstable' into unstable
4eaaa50
@KingRainbow44
Initialize the script loader in ResourceLoader#loadAll
5cd9d3a
@KingRainbow44
Fix region removal checking
e514095
@github-actions
Format code [skip actions]
45f4a92
@KingRainbow44
Use Lombok's EqualsAndHashCode for comparing scene regions
780674e
@github-actions
Format code [skip actions]
6d3dc1a
@KingRainbow44
Move 'invalid gather object' to trace
02a9c55
@KingRainbow44
Add more information to the 'unknown condition handler' message
82b1939
@KingRainbow44
Move invalid ability action to trace
0fb0b59
@KingRainbow44
Make KcpTunnel public
9c0b9af
@KingRainbow44
Validate the NPC being talked to
db1cc78
@github-actions
Format code [skip actions]
3f4578c
@KingRainbow44
NPCs are not spawned server side; change logic to handle it
6516e4b
@KingRainbow44
Merge remote-tracking branch 'origin/unstable' into unstable
2017bc5 
# Conflicts:
#	src/main/java/emu/grasscutter/game/talk/TalkManager.java
@github-actions
Format code [skip actions]
c425fb1
@scooterboo @KingRainbow44
unload scene when there are no players (#2147)
ef263cb 
* unload scene when there are no players

* Update src/main/java/emu/grasscutter/game/world/Scene.java

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

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
@KingRainbow44
Check if a command should be copied or HTTP should be used
564e4e4
@github-actions
Lint Code [skip actions]
757dc9f
@KingRainbow44
Fix character names rendering incorrectly
e3accda
@KingRainbow44
Merge remote-tracking branch 'origin/unstable' into unstable
63488f8
@KingRainbow44
Add basic troubleshooting command
f8054a8
@KingRainbow44
Implement handbook teleporting
78ee3e8 
also a few formatting changes and sort data by logical sense
github-actions bot and others added 25 commits May 31, 2023 23:57
@github-actions
Format code [skip actions]
bcf54dd
@KingRainbow44
Fix new avatar weapons being null
73c2370
@github-actions
Format code [skip actions]
b1b8abc
@KingRainbow44
Fix issue with 35303 being un-completable & Try to fix fulfilled ques…
4113b42 
…t conditions being met
@KingRainbow44
Load activity config on server startup
44a557a
@KingRainbow44
Require plugins to specify an API version and match with the server
e7f30f4
@KingRainbow44
Add default open state ignore list
3e2607a
@KingRainbow44
Merge remote-tracking branch 'origin/unstable' into unstable
8840e2b
@github-actions
Format code [skip actions]
9bd833c
@StartForKiller @KingRainbow44
Quick fix for questing, needs more investigation
6448bb1 
This would make the questing work again
@KingRainbow44
Remove existing hack for 35303
5430956
@KingRainbow44
Merge remote-tracking branch 'origin/unstable' into unstable
7458d43 
# Conflicts:
#	src/main/java/emu/grasscutter/game/ability/actions/ActionAvatarSkillStart.java
#	src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
@KingRainbow44
Fix ignored open states from being set
8e9121c
@github-actions
Format code [skip actions]
2e6bfbb
@KingRainbow44
fix the stupidest bug ive ever seen
6d831a8
@KingRainbow44
Optimize player kicking on server close
8e333b3
@KingRainbow44
Merge remote-tracking branch 'origin/unstable' into unstable
fc79c72
@github-actions
Format code [skip actions]
55a0719
@KingRainbow44
Re-add hack to fix 35303
e0a2ccf
@KingRainbow44
Update GitHub actions
28cb202
@KingRainbow44
Merge remote-tracking branch 'origin/unstable' into unstable
083e9ba
@github-actions
Format code [skip actions]
53d8bdc
@KingRainbow44
Potentially fix issues with regions
84e3823
@KingRainbow44
Merge remote-tracking branch 'origin/unstable' into unstable
eaff698
@KingRainbow44
Download additional handbook data
6950e14
This was linked to issues Jun 1, 2023
Add the ability to complete quests #165
Closed
[Bug] Error group.monsters null #2171
Closed
@KingRainbow44 KingRainbow44 mentioned this pull request Jun 1, 2023
Closed
@KingRainbow44 KingRainbow44 merged commit 9e5b57a into development Jun 1, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug] Error group.monsters null Add the ability to complete quests
6 participants
@KingRainbow44 @jie65535 @scooterboo @Tesutarin @Arikatsu @StartForKiller