Skip to content
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

Fix for mod credits overriding engine credits #17460

Merged
merged 1 commit into from Dec 23, 2019

Conversation

@abmyii
Copy link
Contributor

abmyii commented Dec 14, 2019

Fix for #17459. Adds a bool switch to decide whether to load file from base directory or mod directory. Not sure if this would be classed as a workaround or not, but works fine.

@abmyii abmyii force-pushed the abmyii:credits_overriding_fix branch 2 times, most recently from 6c19fe1 to 4e941c2 Dec 14, 2019
@abmyii abmyii force-pushed the abmyii:credits_overriding_fix branch from 4e941c2 to c3f5c36 Dec 14, 2019
@abmyii abmyii force-pushed the abmyii:credits_overriding_fix branch 2 times, most recently from bb79712 to de5869b Dec 14, 2019
@abmyii abmyii force-pushed the abmyii:credits_overriding_fix branch from de5869b to 2e56d7d Dec 14, 2019
@abmyii abmyii force-pushed the abmyii:credits_overriding_fix branch from 2e56d7d to bfa1fa1 Dec 14, 2019
@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Dec 14, 2019

@reaperrr I don't get that error for some reason. Any idea why?

You can view those by running make check or looking at the output of the Travis build.

@abmyii

This comment has been minimized.

Copy link
Contributor Author

abmyii commented Dec 14, 2019

Thanks for the tip! I'll be sure to do that next time.

@abmyii

This comment has been minimized.

Copy link
Contributor Author

abmyii commented Dec 18, 2019

@GraionDilach Could you please test and review the fix?

@GraionDilach

This comment has been minimized.

Copy link
Contributor

GraionDilach commented Dec 18, 2019

Reviewing is a contribution and I'm explicitly disagreeing with the Code of Conduct.

@abmyii

This comment has been minimized.

Copy link
Contributor Author

abmyii commented Dec 18, 2019

@GraionDilach Eh? Either way I don't believe testing is a contribution so may I ask if the fix worked?

@GraionDilach

This comment has been minimized.

Copy link
Contributor

GraionDilach commented Dec 18, 2019

That goes against #15640.

Copy link
Member

abcdefg30 left a comment

Fix confirmed.

@pchote
pchote approved these changes Dec 23, 2019
@pchote pchote merged commit a107da0 into OpenRA:bleed Dec 23, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@pchote

This comment has been minimized.

Copy link
Member

pchote commented Dec 23, 2019

@GraionDilach The code of conduct applies to all interactions on GitHub, not just PR submission. If you are not comfortable with being held to those standards then you really shouldn't be commenting on issues or PRs.

@GraionDilach

This comment has been minimized.

Copy link
Contributor

GraionDilach commented Dec 23, 2019

I fail to see your point about the code of conduct - you hastily deployed it after jrb0001 proved you had no appropriate reasoning to moderate me out at a point then started retroactively pointing towards it as justification. The standards might sound clear in text but were always biased in practice. You know it already that I'm prouder than just bowing down and accepting that.

Considering how the things are going currently, you should be thankful that I am actually overlooking this in practice and I am indirectly still helping you afterall - it seems to me that my insight is still worthwhile for OpenRA in the short-to-middle term.

This will probably change in the near future though, since I am reaching the stage where I am fine with Valiant Hearts and with that I will drop this burden thenafter. I don't intend to stick around for long and i hope that I won't be around when Next+1 gets pushed out.

@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Dec 23, 2019

How it came into place and so on doesn't really matter, does it? Fact is we have this Code of Conduct, and it applies to the interaction here.

@Mailaender

This comment has been minimized.

Copy link
Member

Mailaender commented Dec 26, 2019

If you disagree with the code of conduct, you have the right to leave. Nobody needs you here.

@Mailaender

This comment has been minimized.

Copy link
Member

Mailaender commented Dec 26, 2019

@GraionDilach

This comment has been minimized.

Copy link
Contributor

GraionDilach commented Dec 26, 2019

@Mailaender Thank you for your interest in my Morton's Fork dilemma - since that CoC there isn't mine but coming from the ModSDK.

If I remove it, you'll accuse me with hypocrisy. If I keep it there, you'll accuse me with hypocrisy. Since both options involve the same result... I don't see what difference that artifact makes there. It is a "fun fact", indeed, but I'm certain we interpret the "fun" part differently and let's leave it there.

@pchote

This comment has been minimized.

Copy link
Member

pchote commented Dec 28, 2019

The comments above spawned public discussion in both the IRC and Discord channels about inappropriate attitudes and, more specifically, the bimodal nature of GraionDilach's interactions within the OpenRA community. The consensus from these comments was quite clear that the negative behaviour was not acceptable, and that furthermore we would be contradicting our own code of conduct by continuing to let it stand for the sake of the ongoing positive contributions.

The suggestion was raised that we should give a final ultimatum about acting in a more professional manner, or institute preventative measures. However, this ultimatum was already given earlier in 2019 following another incident, where it was made clear that the next step would be to block them from the organization if the negative behaviors continued.

Preventing people from interacting with OpenRA is not something I take lightly, but after the public discussion and a few days to reflect on the decision, there seems like little other choice.

@abmyii abmyii deleted the abmyii:credits_overriding_fix branch Jan 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.