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

Conversation

Projects
None yet
4 participants
@H-M-H
Member

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;

This comment has been minimized.

@nzyuzin

nzyuzin Nov 16, 2015

Contributor

Commented out?

@@ -134,6 +140,46 @@ void CEmoticon::OnRender()
Graphics()->QuadsEnd();
CServerInfo pServerInfo;
Client()->GetServerInfo(&pServerInfo);
if((IsDDRace(&pServerInfo) || IsDDNet(&pServerInfo) || IsPlus(&pServerInfo)) && g_Config.m_ClEyeWheel)

This comment has been minimized.

@nzyuzin

nzyuzin Nov 16, 2015

Contributor

Maybe this check could be moved to a helper function?
Same check here as on line 209.

This comment has been minimized.

@H-M-H

H-M-H Nov 16, 2015

Member

found an even better way :)

@nzyuzin

This comment has been minimized.

Contributor

nzyuzin commented Nov 16, 2015

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

@H-M-H

This comment has been minimized.

Member

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

This comment has been minimized.

Contributor

Chairn commented Nov 19, 2015

Happy that someone used my work ;).

@Tardo

This comment has been minimized.

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

This comment has been minimized.

Member

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

Merge pull request #373 from H-M-H/eyewheel
Eyewheel (by Chairn and CytraL)

@H-M-H H-M-H merged commit c38cba9 into ddnet:master Dec 1, 2015

1 check passed

ci/circleci Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment