Skip to content

Fix oversight in CrowdControl source file#2858

Merged
leggettc18 merged 1 commit intoHarbourMasters:develop-spockfrom
aMannus:cc-duration-correction
May 9, 2023
Merged

Fix oversight in CrowdControl source file#2858
leggettc18 merged 1 commit intoHarbourMasters:develop-spockfrom
aMannus:cc-duration-correction

Conversation

@aMannus
Copy link
Contributor

@aMannus aMannus commented May 8, 2023

Randomize Cosmetics had a duration in the .cs file which I didn't notice until after it was pushed to the CC client. This has no impact on the game's code and this PR exists to make sure the file is synced up with what the CC team is using.

Build Artifacts

@leggettc18
Copy link
Contributor

Since Crowd Control 2.0 went into develop-spock, should this fix also go to that branch? Or is there a reason for only pushing this to develop?

@aMannus aMannus changed the base branch from develop to develop-spock May 8, 2023 22:09
@aMannus
Copy link
Contributor Author

aMannus commented May 8, 2023

Since Crowd Control 2.0 went into develop-spock, should this fix also go to that branch? Or is there a reason for only pushing this to develop?

It probably doesn't matter too much but I did intend to point it to Spock and forgot to do so, woops.

Copy link
Contributor

@leggettc18 leggettc18 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, LGTM

@leggettc18 leggettc18 merged commit 23d40c1 into HarbourMasters:develop-spock May 9, 2023
@aMannus aMannus deleted the cc-duration-correction branch May 12, 2023 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants