Merge branch 'dev' into 'master'

Dev See merge request !8

Merge branch 'dev' into 'master'
fa271725 · Petter Selfors Rølvåg · 902009c8 · 428a0d76 · fa271725 · fa271725
Commit fa271725 authored Apr 4, 2021 by Petter Selfors Rølvåg
--- a/CheckersClient/.idea/caches/build_file_checksums.ser
+++ b/CheckersClient/.idea/caches/build_file_checksums.ser
--- a/CheckersClient/android/assets/Loading/LoadingBarBackground.png
+++ b/CheckersClient/android/assets/Loading/LoadingBarBackground.png
--- a/CheckersClient/android/assets/Loading/LoadingBarBorder.png
+++ b/CheckersClient/android/assets/Loading/LoadingBarBorder.png
--- a/CheckersClient/android/assets/Loading/LoadingBarFill.png
+++ b/CheckersClient/android/assets/Loading/LoadingBarFill.png
--- a/CheckersClient/android/assets/Loading/LoadingDot.png
+++ b/CheckersClient/android/assets/Loading/LoadingDot.png
--- a/CheckersClient/android/assets/Loading/LoadingText.png
+++ b/CheckersClient/android/assets/Loading/LoadingText.png
--- a/CheckersClient/android/assets/Menu/1x/ConnectionBar.png
+++ b/CheckersClient/android/assets/Menu/1x/ConnectionBar.png
--- a/CheckersClient/android/assets/Menu/1x/GreenCircleSmall.png
+++ b/CheckersClient/android/assets/Menu/1x/GreenCircleSmall.png
--- a/CheckersClient/android/assets/Menu/1x/MainMenuForm.png
+++ b/CheckersClient/android/assets/Menu/1x/MainMenuForm.png
--- a/CheckersClient/android/assets/Menu/1x/RedCircleSmall.png
+++ b/CheckersClient/android/assets/Menu/1x/RedCircleSmall.png
--- a/CheckersClient/android/assets/Menu/1x/SpaceCheckersLogo.png
+++ b/CheckersClient/android/assets/Menu/1x/SpaceCheckersLogo.png
--- a/CheckersClient/android/assets/Menu/1x/flipButton.png
+++ b/CheckersClient/android/assets/Menu/1x/flipButton.png
--- a/CheckersClient/android/assets/Menu/Click11.wav.asd
+++ b/CheckersClient/android/assets/Menu/Click11.wav.asd
--- a/CheckersClient/android/assets/Menu/MenuLoop.mp3.asd
+++ b/CheckersClient/android/assets/Menu/MenuLoop.mp3.asd
--- a/CheckersClient/android/assets/Pause/PauseBackground.png
+++ b/CheckersClient/android/assets/Pause/PauseBackground.png
--- a/CheckersClient/android/assets/Pause/PauseButton.png
+++ b/CheckersClient/android/assets/Pause/PauseButton.png
--- a/CheckersClient/android/assets/UISkins/glassy/skin/glassy-ui.json
+++ b/CheckersClient/android/assets/UISkins/glassy/skin/glassy-ui.json
@@ -111,7 +111,7 @@ com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
 		background: list
 	}
 	plain: {
-		font: font
+		font: font-big
 		fontColorSelected: white
 		fontColorUnselected: dark-cyan
 		selection: pale-blue
@@ -183,7 +183,7 @@ com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
 }
 com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
 	default: {
-		font: font
+		font: font-big
 		fontColor: black
 		background: textfield
 		cursor: black

--- a/CheckersClient/android/assets/characters/AsianGirl1@1x.png
+++ b/CheckersClient/android/assets/characters/AsianGirl1@1x.png
--- a/CheckersClient/android/assets/characters/AsianGirl2@1x.png
+++ b/CheckersClient/android/assets/characters/AsianGirl2@1x.png
--- a/CheckersClient/android/assets/characters/AsianGirl3@1x.png
+++ b/CheckersClient/android/assets/characters/AsianGirl3@1x.png