-
-
Notifications
You must be signed in to change notification settings - Fork 109
Rework partial GameModeMap and GameLobby codes #719
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
Open
SadPencil
wants to merge
29
commits into
CnCNet:develop
Choose a base branch
from
SadPencil:rework-gamemodemap-gamelobby
base: develop
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.
+639
−402
Conversation
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
Nightly build for this pull request:
|
@SadPencil Please, resolve the conflict with |
Thanks for the remind. Updated. |
MahBoiDeveloper
approved these changes
May 29, 2025
* Improve `ChatListBox` link handling * Update message box text * Add trusted links feature * Add `gamesurge.net` and `dronebl.org` to the trusted links regexp * Update msgbox text Co-authored-by: Metadorius <[email protected]> * Remove link from class field * Add `HardcodeTrustedLinksRegExp` * Refactor naming * Improve regexps * Add mentioning in docs * Rework user-defined allowed links * Add `https://mapdb.cncnet.org` to the always trusted links * Add suggested changes to the doc * Remove MMB links handler * Rework PR * Fix typo in DroneBL domain * Fix bug and improve performance * Replace the regex with Uri.Host property * Allow subdomains * Correct subdomain determination * Correct subdomain determination * Apply suggestions from code review Co-authored-by: Kerbiter <[email protected]> * Update the indent --------- Co-authored-by: Metadorius <[email protected]> Co-authored-by: SadPencil <[email protected]>
…CnCNet#738) * Fix UTF-8 BOM is introduced in the generated spawnmap.ini file * Provide UTF-8 without BOM encoding into EncodingExt class
* Refactoring the ranks from private constants to enum * Replace `enum` with `class` to reduce `(int)` calls * Move ranks to `GameLobbyBase` * Replace enum with struct to reduce `(int)` and `(Rank)` casts * Replace struct with record * Make `rank` field private
…s not working with multiple random selectors, favorite maps storage improvements) (CnCNet#744) * Add DisallowJoiningIncompatibleGames to ClientConfiguration * CnCNet#465 non host cannot select America/Cuba with random selectors and disallowed side settings. * Move favorite maps to its own section * CnCNet#502 - players cannot select Germany faction with "No Yuri/No France" * Warn host and eventually close if inactive * Event handler null checks * Check for enabled on inactive host kick timer * Check for "default" updateconfig.ini file to copy * Proper onmousemove, stop timer after lobby leave * Consolidate inactive timer check, move logic into containing class * build on yr/** branches * Skip inactive timer for password games * Rewords privacy notice as per CnCNet#427 (CnCNet#459) * post merge fixes * Update version text * Disable #cncnet channel from dropdowon * Bump version * Turn off development mode for yr/develop branch * Update commit hash * Bump xna version * Bump version * Change XNA client version info * Add steam * Update commit hash * Update client version * Update client version * Update client version 2.12.0, develop/80d08c66 * Update client version 2.12.2, develop/0718826 * Add abscent fields * Remove `yr/**` branches from build workflow * Refactor title and text for inactive host warning message to be translatable * Remove `yr/develop` code from `ClientCore/CnCNet5/GameCollections.cs` * Refactor `CnCNetLobby.cs` * Revert changes in `Directory.Build.targets` * Remove `updateconfig.default.ini` feature that never used * Refactor `GameHostInactiveCheck.cs` * Refactor handling `gameHostInactiveCheck` * Refactor `disallowedSides` code * Refactor `UserINISettings.cs` * Rename `dttmStart` to `startTime` * Rename `GameHostInactiveCheck` to `GameHostInactiveChecker` * Refactoring `IsGameFiltersApplied` * Fix spacing * Remove extra space * Another spacing fix * Move `random` lower --------- Co-authored-by: devo1929 <[email protected]> Co-authored-by: Grant Bartlett <[email protected]> Co-authored-by: SadPencil <[email protected]>
* Add issue templates * Adjust template * Replace link to `#xna-client-chat`
…le` class (CnCNet#749) * Implement `GetListValue` and rework get list values from IniFile class * Rename `GetListValue` to `GetStringListValue` * Update ClientCore/Extensions/IniFileExtensions.cs Co-authored-by: Kerbiter <[email protected]> * Rework `GetStringListValue` * Refactor `Updater.cs` Co-authored-by: Kerbiter <[email protected]> --------- Co-authored-by: Kerbiter <[email protected]>
Note that I can't separate |
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.
GameMode
andMap
. For example,MultiplayerOnly
is a setting that can be either defined inGameMode
andMap
. Now, the duplicated codes are merged. Priority:Map
>GameMode
.ForceRandomStartLocations
setting can also be turned on with co-op missions (IsCoop
)Forced Random Teams
has been renamed toForced No Teams
in UI and source codes, because the original meaning seems wrong.IsCoop
)AllowedStartingLocations
. For example, in a co-op mission based on a 4P map, the players might be positioned in 1 and 3 instead of 1 and 2, while MaxPlayers=2. The AIs are provided in co-op related settings instead of regular AI players.Note: I can't separate the features, refactors, and bug fixes as separate PRs, because: (a) they rely on one others, and (b) we don't merge PRs in time -- so it will be much painful maintaining many PRs that depend on one others.