Merge remote-tracking branch 'origin/UI' into UI

# Conflicts: # .idea/misc.xml # app/src/main/java/org/toop/app/menu/MainMenu.java # app/src/main/java/org/toop/app/menu/QuitMenu.java
2026-02-04 10:54:51 +00:00 · 2025-10-01 15:54:18 +02:00
parent 9e35db4dd4 13bc313c17
commit 9134c7e3e7
65 changed files with 2542 additions and 961 deletions
--- a/app/src/main/resources/assets/audio/dramatic.wav
+++ b/app/src/main/resources/assets/audio/dramatic.wav
--- a/app/src/main/resources/assets/audio/hitsound0.wav
+++ b/app/src/main/resources/assets/audio/hitsound0.wav
--- a/app/src/main/resources/assets/audio/hitsound1.wav
+++ b/app/src/main/resources/assets/audio/hitsound1.wav
--- a/app/src/main/resources/assets/audio/mainmenu.wav
+++ b/app/src/main/resources/assets/audio/mainmenu.wav
--- a/app/src/main/resources/assets/audio/sadtrombone.wav
+++ b/app/src/main/resources/assets/audio/sadtrombone.wav
--- a/app/src/main/resources/assets/audio/scawymusic.wav
+++ b/app/src/main/resources/assets/audio/scawymusic.wav
--- a/app/src/main/resources/assets/audio/suspensful.wav
+++ b/app/src/main/resources/assets/audio/suspensful.wav
--- a/app/src/main/resources/assets/audio/testsound.wav
+++ b/app/src/main/resources/assets/audio/testsound.wav
--- a/app/src/main/resources/assets/audio/winsound.wav
+++ b/app/src/main/resources/assets/audio/winsound.wav
--- a/app/src/main/resources/assets/image/background.jpg
+++ b/app/src/main/resources/assets/image/background.jpg
--- a/app/src/main/resources/assets/image/battleship.png
+++ b/app/src/main/resources/assets/image/battleship.png
--- a/app/src/main/resources/assets/image/icon.png
+++ b/app/src/main/resources/assets/image/icon.png
--- a/app/src/main/resources/assets/image/other.png
+++ b/app/src/main/resources/assets/image/other.png
--- a/app/src/main/resources/assets/image/reversi.png
+++ b/app/src/main/resources/assets/image/reversi.png
--- a/app/src/main/resources/assets/image/sudoku.png
+++ b/app/src/main/resources/assets/image/sudoku.png
--- a/app/src/main/resources/assets/image/tictactoe.png
+++ b/app/src/main/resources/assets/image/tictactoe.png
--- a/app/src/main/resources/assets/style/main.css
+++ b/app/src/main/resources/assets/style/main.css
--- a/app/src/main/resources/assets/style/quit.css
+++ b/app/src/main/resources/assets/style/quit.css
--- a/app/src/main/resources/assets/style/style.css
+++ b/app/src/main/resources/assets/style/style.css
--- a/app/src/main/resources/assets/text/test.txt
+++ b/app/src/main/resources/assets/text/test.txt
@@ -0,0 +1 @@
+Super gaaf!