-
Notifications
You must be signed in to change notification settings - Fork 51
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.
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
WIP: Kingdom decision sync #755
Draft
WakooMan
wants to merge
17
commits into
Bannerlord-Coop-Team:development
Choose a base branch
from
WakooMan:features/Kingdom-Decision-Sync
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
WIP: Kingdom decision sync #755
WakooMan
wants to merge
17
commits into
Bannerlord-Coop-Team:development
from
WakooMan:features/Kingdom-Decision-Sync
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
garrettluskey
requested changes
Feb 9, 2024
source/Coop.Core/Client/Services/Kingdoms/Handlers/ClientKingdomDecisionHandler.cs
Outdated
Show resolved
Hide resolved
source/GameInterface/Services/Kingdoms/Patches/KingdomPatches.cs
Outdated
Show resolved
Hide resolved
source/GameInterface/Services/Kingdoms/Patches/KingdomPatches.cs
Outdated
Show resolved
Hide resolved
source/GameInterface/Services/Kingdoms/Patches/KingdomPatches.cs
Outdated
Show resolved
Hide resolved
source/GameInterface/Services/Kingdoms/Patches/KingdomPatches.cs
Outdated
Show resolved
Hide resolved
WakooMan
force-pushed
the
features/Kingdom-Decision-Sync
branch
from
February 9, 2024 16:51
446cc56
to
e000b27
Compare
2 tasks
garrettluskey
requested changes
Mar 2, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also fix conflicts and good to go
Allow origianl has been condensed to the following
// Skip if we called it
if (CallOriginalPolicy.IsOriginalAllowed()) return true;
source/GameInterface/Services/Kingdoms/Messages/LocalDecisionAdded.cs
Outdated
Show resolved
Hide resolved
source/GameInterface/Services/Kingdoms/Messages/LocalDecisionRemoved.cs
Outdated
Show resolved
Hide resolved
source/GameInterface/Services/Kingdoms/Messages/RemoveDecision.cs
Outdated
Show resolved
Hide resolved
source/GameInterface/Services/Kingdoms/Extentions/KingdomDecisionExtensions.cs
Outdated
Show resolved
Hide resolved
MaxDorob
requested changes
Mar 2, 2024
WakooMan
force-pushed
the
features/Kingdom-Decision-Sync
branch
from
June 14, 2024 05:13
0404ddb
to
828b900
Compare
WakooMan
force-pushed
the
features/Kingdom-Decision-Sync
branch
from
June 22, 2024 09:45
7aa8c56
to
d506858
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Checklist
Please check if your PR fulfills the following requirements:
PR Type
What kind of change does this PR introduce?
What is the current behaviour?
What is the new behaviour?
Resolves #748 #671
Other information