ramollia
3c699cde01
merged
2025-10-02 19:59:14 +02:00
ramollia
6626157052
Merge remote-tracking branch 'origin/UI' into UI
...
# Conflicts:
# app/src/main/java/org/toop/app/App.java
# app/src/main/java/org/toop/app/menu/MainMenu.java
# app/src/main/java/org/toop/app/menu/Menu.java
# app/src/main/java/org/toop/app/menu/QuitMenu.java
# app/src/main/resources/assets/image/background.jpg
# app/src/main/resources/assets/image/battleship.png
# app/src/main/resources/assets/image/icon.png
# app/src/main/resources/assets/image/lowpoly.png
# app/src/main/resources/assets/image/other.png
# app/src/main/resources/assets/image/reversi.png
# app/src/main/resources/assets/image/sudoku.png
# app/src/main/resources/assets/image/tictactoe.png
# app/src/main/resources/assets/style/app.css
# app/src/main/resources/assets/style/main.css
# app/src/main/resources/assets/style/quit.css
# app/src/main/resources/assets/style/style.css
2025-10-02 19:47:09 +02:00
ramollia
258ce964c9
main menu done(?). probably not but fine for now
2025-10-01 19:25:19 +02:00
lieght
527378ac00
Alpha rebase complete, added asset loader for UI branch
2025-10-01 15:08:18 +02:00
ramollia
5edd3a2278
broken push
2025-10-01 15:01:32 +02:00
lieght
823a2cd4df
Added ability to track loading amount through event.
2025-10-01 14:50:47 +02:00
lieght
5e4db91750
Moved loads to own class for better memory management. Added ability to add text- and localizationassets.
2025-10-01 04:19:28 +02:00
lieght
6cd2c083b7
Refactored to have assets use self reflection to identify with certain extensions
2025-10-01 00:12:38 +02:00
lieght
7c970d9a4d
Updated assetmanager to now load assets with an assetloader
2025-09-30 23:32:37 +02:00
lieght
d78fd1b606
Fixed unknown names, Assetmanager now has initializeloader
2025-09-30 23:17:32 +02:00
Stef
a7cd0016f1
83 spelen van geluid geeft id terug ( #86 )
...
* Between commit
* Revert "Between commit"
This reverts commit 6c6e55492e .
* Removed debug print from main
* Removed class variables that are no longer used. Sound resources now generate a new Clip with the getNewClip() method.
* Successfully plays multiple instances of the same sound. Returns the clipID so the sound can be stopped.
* Added some comments
2025-09-30 20:29:42 +02:00
Bas de Jong
423fd9d68a
AssetManager init
2025-09-30 16:38:13 +02:00
ramollia
99a3b7e85b
broken push
2025-09-30 12:38:49 +02:00
Bas de Jong
d1da49ad1d
New assetManager
2025-09-30 11:48:53 +02:00
Bas de Jong
a957195514
Rudimentary audio file processing.
2025-09-29 13:48:03 +02:00
lieght
a94d83292e
Fixed unittests. Formatting
2025-09-28 21:57:59 +02:00
lieght
a9e63b3fcc
Initial parsing of server response
2025-09-28 21:57:59 +02:00
ramollia
27e7166ac7
refactored game
2025-09-25 15:50:10 +02:00
lieght
e6e11a3604
Refactor and fixes
2025-09-24 18:37:13 +02:00
lieght
05e2b27330
Fixed poms
2025-09-24 16:28:25 +02:00
ramollia
da777f5300
refactor
2025-09-24 15:52:58 +02:00
ramollia
9fdd74326a
refactor
2025-09-24 15:44:38 +02:00