-
Notifications
You must be signed in to change notification settings - Fork 105
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
12545+side controls ultimate edition #12743
Open
riverwanderer
wants to merge
83
commits into
vassalengine:master
Choose a base branch
from
riverwanderer:12545+side-controls-ultimate-edition
base: master
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.
Open
12545+side controls ultimate edition #12743
riverwanderer
wants to merge
83
commits into
vassalengine:master
from
riverwanderer:12545+side-controls-ultimate-edition
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
…12544_nextSideChoice # Conflicts: # vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java
…m/riverwanderer/vassal into 12544_nextSideChoice # Conflicts: # vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java
…m/riverwanderer/vassal into 12544_nextSideChoice # Conflicts: # vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java
…m/riverwanderer/vassal into 12544_nextSideChoice # Conflicts: # vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java
…m/riverwanderer/vassal into 12544_nextSideChoice # Conflicts: # vassal-doc/src/main/readme-referencemanual/ReferenceManual/GameModule.adoc
…ation # Conflicts: # vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java
…es in mixed-language chat.
… control functions.
… makes MutableProperty getChangeCommand Public.
… makes MutableProperty getChangeCommand Public.
… makes MutableProperty getChangeCommand Public. Blank old values to prevent undo.
This PR is ready for review. One unresolved issue is that I changed getChangeCommand from Protected to Public, as I couldn't get access to this routine working another way (lack of knowledge). I could achieve these parts of the PR using Global Option preferences instead. |
# Conflicts: # vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java
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.
Resetting PR #12736. Includes the features of PR #12732 and in addition:
Provides * Choose a random side * feature in the sides list dropdown - if at least two true player sides are available.
When retire/switch sides button or hotkey is activated:
Module Global Property VassalForceSide is checked and promptForSide() will switch to that side directly, if valid.
Module Global Property VassalRandomSide is checked; when true, random side option is automatically processed.
In each case, the special property is cleared immediately after use.
If the request cannot be satisfied, control returns to the user and a warning is logged to chat. No side change occurs.
Use cases: Connection to a randomly selected side; Ability to choose a side directly within a module.
Additional changes:
Observer role is not displayed if player is already in the role (consistent with behaviour of other sides)
Error message if no sides are available when player is switching from observer role.