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

Avatar Clothing Fix #116

Merged
merged 1 commit into from
Jan 15, 2012
Merged

Avatar Clothing Fix #116

merged 1 commit into from
Jan 15, 2012

Conversation

Hoikas
Copy link
Member

@Hoikas Hoikas commented Jan 15, 2012

Ported from Skoader's repository @ https://bitbucket.org/Skoader/cwe-skoader/changeset/896909449d99

The original contained tabs, so I did not concern myself with preserving commit metadata. This fixes the annyoning one-frame untextured avatar when switching from 1st person to 3rd person.

@dpogue
Copy link
Member

dpogue commented Jan 15, 2012

I'm definitely in favour of this code getting in, but I don't know how I feel about making pull requests for other peoples' code.

I'd feel better if this had already been merged into OU's codebase, or if someone contacted Skoader. As far as I know, he hasn't even made a pull request to OU yet.

@Hoikas
Copy link
Member Author

Hoikas commented Jan 15, 2012

I get the impression that he's mostly playing in his own sandbox and isn't really interested in issuing pull requests to either this repository or OU's. But, then again, that's just my impression.

@cwalther
Copy link
Contributor

I just pinged him again (https://bitbucket.org/Skoader/cwe-skoader/changeset/896909449d99#comment-7921). In fact, I thought about doing that just a few days ago, since this is a fix I would really like to have in both H-uru/Plasma and CWE-ou.

For what it’s worth, here’s my port from when I tested it: cwalther/Plasma@ 0ff9a10ca9897bad50c9c77f9e6c6dff679615a9. As far as I can see, the only piece of commit metadata you didn’t preserve is the authoring date (plus an extra line break in the commit message). If Skoader is OK with that, I’d say go for it.

Also, you have some stray whitespace at the end of the last line of code.

@Skoader
Copy link
Contributor

Skoader commented Jan 15, 2012

Thanks for the heads up cwalther.

I've been busy but I'll issue a pull request with OU tomorrow.
With that said, you're welcome to cherry pick anything from my repository that may be of interest, as done here.

Bounds type needs be checked after refreshing the bsp tree.
@Hoikas
Copy link
Member Author

Hoikas commented Jan 15, 2012

@Skoader Thanks! You're doing some good work in your fork that I think is very beneficial. I'll try to keep up with your progress.

@cwalther I missed the commit date unfortunately. I added a newline to the commit message so that we can use github's nice message formatting. Furthermore, I used spaces instead of tabs in the code. The extra whitespace is troubling, so I'll amend this commit to fix that.

@dpogue
Copy link
Member

dpogue commented Jan 15, 2012

@Skoader Thanks!

I'm definitely 👍 on this :)

Hoikas added a commit that referenced this pull request Jan 15, 2012
@Hoikas Hoikas merged commit 1dac794 into H-uru:master Jan 15, 2012
Deledrius pushed a commit to Deledrius/Plasma that referenced this pull request Dec 4, 2012
Hoikas added a commit to Hoikas/Plasma that referenced this pull request Dec 4, 2012
Hoikas added a commit to Hoikas/Plasma that referenced this pull request Dec 13, 2012
zrax pushed a commit to zrax/Plasma that referenced this pull request Apr 24, 2020
change literal from octal to decimal
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.

None yet

4 participants