SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Showing only changes of commit bc865dd9b5 - Show all commits

View File

@@ -153,7 +153,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 25; index = 25;
else if (current.states.running && current.states.still) else if (current.states.running || current.states.still)
index = 0; index = 0;
} }
@@ -173,7 +173,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping ) else if (current.states.jumping )
index = 26; index = 26;
else if (current.states.running && current.states.still) else if (current.states.running || current.states.still)
index = 1; index = 1;
} }
@@ -193,7 +193,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping ) else if (current.states.jumping )
index = 28; index = 28;
else if (current.states.running && current.states.still) else if (current.states.running || current.states.still)
index = 3; index = 3;
} }
@@ -213,7 +213,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 30; index = 30;
else if (current.states.running && current.states.still) else if (current.states.running || current.states.still)
index = 5; index = 5;
} }
else if (angle < -0.75) //Dos - side n<>gatif else if (angle < -0.75) //Dos - side n<>gatif
@@ -232,7 +232,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping ) else if (current.states.jumping )
index = 32; index = 32;
else if (current.states.running && current.states.still) else if (current.states.running || current.states.still)
index = 7; index = 7;
} }
@@ -252,7 +252,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 27; index = 27;
else if (current.states.running && current.states.still) else if (current.states.running || current.states.still)
index = 2; index = 2;
} }
@@ -272,7 +272,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 29; index = 29;
else if (current.states.running && current.states.still) else if (current.states.running || current.states.still)
index = 4; index = 4;
} }
@@ -292,7 +292,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
} }
else if (current.states.jumping) else if (current.states.jumping)
index = 31; index = 31;
else if (current.states.running && current.states.still) else if (current.states.running || current.states.still)
index = 6; index = 6;
} }