Merge branch '75-bubblewrapfixes' into 'dev'

Resolve "BubbleWrapFixes" Closes #75 See merge request !71

Merge branch '75-bubblewrapfixes' into 'dev'
cdc7dab1 · Turid Cecilie Dahl · 2e8ab514 · ac1e5a34 · cdc7dab1 · cdc7dab1
Commit cdc7dab1 authored 5 years ago by Turid Cecilie Dahl
--- a/frontend/android/assets/glassy/raw/BlueSquare.png
+++ b/frontend/android/assets/glassy/raw/BlueSquare.png
--- a/frontend/android/assets/glassy/raw/ColorRushBackground.jpg
+++ b/frontend/android/assets/glassy/raw/ColorRushBackground.jpg
--- a/frontend/android/assets/glassy/raw/ConfirmationSprite.png
+++ b/frontend/android/assets/glassy/raw/ConfirmationSprite.png
--- a/frontend/android/assets/glassy/raw/DimmingTexture.png
+++ b/frontend/android/assets/glassy/raw/DimmingTexture.png
--- a/frontend/android/assets/glassy/raw/ExitButton.png
+++ b/frontend/android/assets/glassy/raw/ExitButton.png
--- a/frontend/android/assets/glassy/raw/GreenSquare.png
+++ b/frontend/android/assets/glassy/raw/GreenSquare.png
--- a/frontend/android/assets/glassy/raw/GreySquare.png
+++ b/frontend/android/assets/glassy/raw/GreySquare.png
--- a/frontend/android/assets/glassy/raw/LoadingCircle.png
+++ b/frontend/android/assets/glassy/raw/LoadingCircle.png
--- a/frontend/android/assets/glassy/raw/PauseBackground.jpg
+++ b/frontend/android/assets/glassy/raw/PauseBackground.jpg
--- a/frontend/android/assets/glassy/raw/PauseButtonBlack.png
+++ b/frontend/android/assets/glassy/raw/PauseButtonBlack.png
--- a/frontend/android/assets/glassy/raw/PauseButtonWhite.png
+++ b/frontend/android/assets/glassy/raw/PauseButtonWhite.png
--- a/frontend/android/assets/glassy/raw/PauseText.png
+++ b/frontend/android/assets/glassy/raw/PauseText.png
--- a/frontend/android/assets/glassy/raw/RedSquare.png
+++ b/frontend/android/assets/glassy/raw/RedSquare.png
--- a/frontend/android/assets/glassy/raw/ResumeButton.png
+++ b/frontend/android/assets/glassy/raw/ResumeButton.png
--- a/frontend/android/assets/glassy/raw/VioletSquare.png
+++ b/frontend/android/assets/glassy/raw/VioletSquare.png
--- a/frontend/android/assets/bubble_popped_1.png
+++ b/frontend/android/assets/bubble_popped_1.png
--- a/frontend/android/assets/bubble_popped_2.png
+++ b/frontend/android/assets/bubble_popped_2.png
--- a/frontend/android/assets/bubble_popped_3.png
+++ b/frontend/android/assets/bubble_popped_3.png
--- a/frontend/android/assets/glassy/raw/bubble_unpopped_1.png
+++ b/frontend/android/assets/glassy/raw/bubble_unpopped_1.png
--- a/frontend/android/assets/glassy/raw/bubblewrap_background.jpg
+++ b/frontend/android/assets/glassy/raw/bubblewrap_background.jpg