Merge XPEvo fixed/changes into main repository #317
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
araszka
approved these changes
Oct 27, 2024
|
Because commit history seems to be lost, please create a list of changes in the description. |
As requested, I've updated the description of the pull request with an abbreviated list of changes and also added a link to compare the fork to the current master branch. |
|
The last commit resolves the comment by @AtomicLiquid about the |
snixtho
requested changes
Nov 9, 2024
|
|
||
| namespace EvoSC.Modules.Official.RoundRankingModule.Models; | ||
|
|
||
| public class CheckpointData |
|
|
||
| public class CheckpointsRepository : Dictionary<string, CheckpointData> | ||
| { | ||
| public List<CheckpointData> GetSortedData() |
| @@ -0,0 +1,23 @@ | |||
| namespace EvoSC.Modules.Official.RoundRankingModule.Models; | |||
|
|
|||
| public class PointsRepartition : List<int> | |||
| pos="{{ rowInnerHeight * 3.0 + columnSpacing * 2.0 }} 0" | ||
| size="{{ w / 3.0 }} {{ rowHeight }}" | ||
| valign="center2" | ||
| textsize="{{ Theme.UI_FontSize*2 }}" |
There was a problem hiding this comment.
Use the text-xl utility class instead and for the others too.
Ref:
text-xs:Theme.UI_FontSize*0.8text-normal:Theme.UI_FontSize(ortext-primaryfor default colors + normal size)text-md:Theme.UI_FontSize*1.2text-lg:Theme.UI_FontSize*1.5text-xl:Theme.UI_FontSize*2text-2xl:Theme.UI_FontSize*4text-3xl:Theme.UI_FontSize*6text-4xl:Theme.UI_FontSize*8
| </template> | ||
|
|
||
| <script once="true"> | ||
| <!-- |
| valign="center" | ||
| halign="center" | ||
| text="{{ Icons.VideoCamera }}" | ||
| textsize="{{ Theme.UI_FontSize*2 }}" |
| pos='{{ (width-(Theme.ScoreboardModule_PositionBox_ShowAccent=="True" ? accentBarWidth : 0)) / 2.0 + (Theme.ScoreboardModule_PositionBox_ShowAccent=="True" ? accentBarWidth : 0) }} {{ height / -2.0 + 0.25 }}' | ||
| valign="center" | ||
| halign="center" | ||
| textsize="{{ Theme.UI_FontSize*2 }}" |
| </template> | ||
|
|
||
| <script> | ||
| <!-- |
Co-authored-by: snixtho <[email protected]>
Co-authored-by: snixtho <[email protected]>
…repository' into 316-merge-xpevo-fixes-into-main-repository
- Add more doc comments
This reverts commit 699c66c.
…repository' into 316-merge-xpevo-fixes-into-main-repository
|
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.
This pull request includes all the changes that were made to the XPEvo branch of EvoSC#, without the additions of ContactAdminModule, ToornamentModule and ServerSyncModule.
Changes to the required dependencies (namely NATS and toornamentapi) have been reverted.
New modules: RoundRankingModule
Updated modules: ScoreboardModule, GameModeUiModule
Full list of changes compared to
masterbranch can be seen here: master...EvoEsports:EvoSC-sharp-XPEvo:master - keep in mind that some of these changes already have been merged intomasterbranch here and were merged into the forked repository after the fact.Abbreviated list of changes since August 20th:
CurrentMapModuleby @araszkaSpectatorTargetInfoModuleby @araszkaSpectatorCamModeModuleby @araszka - replaces Nadeo's default Spec Cam Mode switcher in the bottom rightScoreboardtoScoreboardModuleScoreboardModule(incl. themability, nickname support, showing current/max rounds, etc)RoundRankingModuleby @araszka - similar functionality as SmallScoresTable in TMWT/Teams_Matchmaking modesGameModeUiModuleforSmallScoresTableUILayerDockerfileto make sure EvoSC runs as user id9999instead of root.