Added multiplayer voting, lobby improvements, and clipboard paste support#87
Open
xcomcoopdev wants to merge 2 commits into
Open
Added multiplayer voting, lobby improvements, and clipboard paste support#87xcomcoopdev wants to merge 2 commits into
xcomcoopdev wants to merge 2 commits into
Conversation
Collaborator
|
Overall this looks pretty good! We'd just need to figure out the CI test failures and the cause of the client crash during CI testing |
Collaborator
Author
|
I am not going to add anything else to this pull request, so it is ready from my side. @NonPolynomialTim, could you check, when you have time, that the tests pass and then merge it into main? :) |
Collaborator
|
@xcomcoopdev would you like me to fix the test failures and add some more test to get this merged, or are you planning on coming back to it? |
This file contains hidden or 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
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.
Fixes #24
Added vote timeout, cooldown, and custom battle craft locking (v2.0)
Summary
This pull request improves the multiplayer voting system and the Custom Battle craft equipment flow.
Voting system
CONNECTION LOST - VOTE CANCELLEDCLOSEbutton.Custom Battle craft locking
EQUIP CRAFTbutton immediately.EQUIP CRAFTin the Mission Generator, a confirmation screen is shown.EQUIP CRAFTafter the host has confirmed and entered the equipment screen.Regression tests
Expanded
test_vote_system.pyto verify:The test can be run from the project root with:
Test result:
Added multiplayer voting, lobby improvements, and clipboard paste support (v1.0)
Summary
This pull request adds a multiplayer voting system, improves the Custom Battle lobby, adds clipboard paste support to multiplayer connection fields, removes obsolete pause helper functions, and introduces regression tests for the voting implementation.
Multiplayer Vote System
VoteMenufor multiplayer decisions.WAITINGYESNOPLAYER 1,PLAYER 2, etc. labels with the actual multiplayer player names.vote_requestvote_startvote_castvote_updatevote_resultVote Result Synchronization Fix
vote_result.EndCoopBattle()to prevent repeatedly callingpopState()when the referencedBattlescapeStatehas already been removed.Test Harness and Regression Tests
TestServer.cpp.friend class TestServer.PLAYER 1andPLAYER 2labels.The test can be run from the project root with:
Expected final output:
Custom Battle Lobby
Clipboard Paste Support
TextEdit.Ctrl+VCommand+VPause Cleanup
Build System
OpenXcom.2010.vcxproj.OpenXcom.2010.vcxproj.filters.