Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online

This commit is contained in:
MarcEricMartel 2023-12-13 16:10:25 -05:00
commit 71691c55c8

View File

@ -146,7 +146,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
index = 17; index = 17;
else else
index = 9; index = 9;
} }
else if (current.states.jumpshot) { else if (current.states.jumpshot) {
if (Shooting) if (Shooting)
@ -159,8 +158,6 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot) else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
index = 0; index = 0;
} }
else if (angle >= 0.25 && isLeft) //Frontleft else if (angle >= 0.25 && isLeft) //Frontleft
{ {
@ -250,7 +247,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (angle >= 0.25 && !isLeft) //FrontRight else if (angle >= 0.25 && !isLeft) //FrontRight //REVOIR L'ANIME DE SHOOTING EST PAS DRETTE
{ {
if (current.states.shooting) { if (current.states.shooting) {
if (Shooting) if (Shooting)