Merge branch '93-assets-folder-cleaning' into 'dev'

Resolve "Assets folder cleaning" Closes #93 See merge request !93

Merge branch '93-assets-folder-cleaning' into 'dev'
a84e8fbc · Ivar Nordvik Myrstad · 2fe2bdea · 1efa55f4 · a84e8fbc · a84e8fbc
Commit a84e8fbc authored Apr 16, 2020 by Ivar Nordvik Myrstad
--- a/frontend/android/assets/bensound-goinghigher.mp3
+++ b/frontend/android/assets/bensound-goinghigher.mp3
--- a/frontend/android/assets/ConfirmationSprite.png
+++ b/frontend/android/assets/ConfirmationSprite.png
--- a/frontend/android/assets/DimmingTexture.png
+++ b/frontend/android/assets/DimmingTexture.png
--- a/frontend/android/assets/ExitButton.png
+++ b/frontend/android/assets/ExitButton.png
--- a/frontend/android/assets/Number1.png
+++ b/frontend/android/assets/Number1.png
--- a/frontend/android/assets/Number2.png
+++ b/frontend/android/assets/Number2.png
--- a/frontend/android/assets/Number3.png
+++ b/frontend/android/assets/Number3.png
--- a/frontend/android/assets/PauseBackground.jpg
+++ b/frontend/android/assets/PauseBackground.jpg
--- a/frontend/android/assets/PauseButtonBlack.png
+++ b/frontend/android/assets/PauseButtonBlack.png
--- a/frontend/android/assets/PauseButtonWhite.png
+++ b/frontend/android/assets/PauseButtonWhite.png
--- a/frontend/android/assets/PauseText.png
+++ b/frontend/android/assets/PauseText.png
--- a/frontend/android/assets/ResumeButton.png
+++ b/frontend/android/assets/ResumeButton.png
--- a/frontend/android/assets/state/DimmingTexture.png
+++ b/frontend/android/assets/state/DimmingTexture.png
--- a/frontend/android/assets/LoadingText.png
+++ b/frontend/android/assets/LoadingText.png
--- a/frontend/android/assets/bg1.jpg
+++ b/frontend/android/assets/bg1.jpg
--- a/frontend/android/assets/bg1_finTourn.jpg
+++ b/frontend/android/assets/bg1_finTourn.jpg
--- a/frontend/android/assets/bg_score.jpg
+++ b/frontend/android/assets/bg_score.jpg
--- a/frontend/android/assets/questionMarkIcon.png
+++ b/frontend/android/assets/questionMarkIcon.png
--- a/frontend/android/assets/tableBGRounded.png
+++ b/frontend/android/assets/tableBGRounded.png
--- a/frontend/core/src/com/gameware/game/GameWare.java
+++ b/frontend/core/src/com/gameware/game/GameWare.java
@@ -79,7 +79,7 @@ public class GameWare extends ApplicationAdapter {

 		batch = new SpriteBatch();

-		music = Gdx.audio.newMusic(Gdx.files.internal(("bensound-goinghigher.mp3")));
+		music = Gdx.audio.newMusic(Gdx.files.internal(("music/bensound-goinghigher.mp3")));
 		music.setLooping(true);
 		music.setVolume(0.1f);
 		musicOn = true;