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

Eyewheel #373

Merged
merged 5 commits into from
Dec 1, 2015
Merged

Eyewheel #373

merged 5 commits into from
Dec 1, 2015

Conversation

H-M-H
Copy link
Member

@H-M-H H-M-H commented Nov 14, 2015

-fixed some stuff Chairn forgot
-I already tested but would be nice if someone else could have a look too

@@ -37,7 +40,9 @@ void CEmoticon::OnReset()
{
m_WasActive = false;
m_Active = false;
//m_DrawEmotes = false;
Copy link
Contributor

Choose a reason for hiding this comment

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

Commented out?

@nzyuzin
Copy link
Contributor

nzyuzin commented Nov 16, 2015

Code looks clean to me, thanks for the feature! 👍

@H-M-H
Copy link
Member Author

H-M-H commented Nov 16, 2015

Thanks for reviewing and let's not forget about unsigned char* and Chairn who did most of the work :)

@Chairn
Copy link
Contributor

Chairn commented Nov 19, 2015

Happy that someone used my work ;).

@Tardo
Copy link
Contributor

Tardo commented Nov 19, 2015

I only did it first, not contributed in this pr.... All thanks to Chairn and H-M-H ;)

@H-M-H
Copy link
Member Author

H-M-H commented Dec 1, 2015

okay, testest again and found no bugs so far, let's get it in.

H-M-H added a commit that referenced this pull request Dec 1, 2015
Eyewheel (by Chairn and CytraL)
@H-M-H H-M-H merged commit c38cba9 into ddnet:master Dec 1, 2015
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.

4 participants