Merge branch 'master' of github.com:ralucado/WaveGGJ17

2017-01-22 00:30:12 +01:00 · 2017-01-22 00:30:12 +01:00 · b42413dd77
commit b42413dd77
parent 19e293b238 be9ea49ee6
2 changed files with 0 additions and 1 deletions
--- a/VaporWaveWars/character.hpp
+++ b/VaporWaveWars/character.hpp
@ -6,7 +6,6 @@ class Character : public sf::Sprite{
 private:
    //CONFIG
    const double frameTime = BLACKVALUE/4.0f;
-    const int numFrames = 4;
    const std::string spriteFile = WORK_DIR+"Resources/spreadsheet.png";
    //POSICIO PLAYER 1
    float posX1 = W_WIDTH*0.05f, posY1 = W_HEIGHT*0.5f - 15;
--- a/build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/VaporWaveWars
+++ b/build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/VaporWaveWars