lieght
|
435d443b94
|
Merge remote-tracking branch 'origin/UI' into UI
# Conflicts:
# .idea/misc.xml
|
2025-10-01 15:58:33 +02:00 |
|
lieght
|
5a779a8a25
|
Merge remote-tracking branch 'origin/Alpha' into UI
# Conflicts:
# app/src/main/java/org/toop/app/menu/MainMenu.java
# app/src/main/java/org/toop/app/menu/QuitMenu.java
|
2025-10-01 15:56:42 +02:00 |
|
Ticho Hidding
|
9134c7e3e7
|
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
|
2025-10-01 15:54:18 +02:00 |
|
Ticho Hidding
|
9e35db4dd4
|
added NL and EN for all strings currently in UI
|
2025-10-01 15:51:14 +02:00 |
|
lieght
|
13bc313c17
|
UI now uses assetmanager
|
2025-10-01 15:48:23 +02:00 |
|
Bas Antonius de Jong
|
eb6dc03a3d
|
Alpha UI update (#88)
* broken push
* broken push
* Alpha rebase complete, added asset loader for UI branch
---------
Co-authored-by: ramollia <@>
|
2025-10-01 15:09:26 +02:00 |
|
ramollia
|
5edd3a2278
|
broken push
|
2025-10-01 15:01:32 +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 |
|
Bas de Jong
|
423fd9d68a
|
AssetManager init
|
2025-09-30 16:38:13 +02:00 |
|
Ticho Hidding
|
f37d26db28
|
Merge remote-tracking branch 'origin/UI' into Localization
# Conflicts:
# .idea/misc.xml
# app/src/main/java/org/toop/Main.java
# app/src/main/java/org/toop/app/gui/LocalServerSelector.java
# app/src/main/java/org/toop/events/WindowEvents.java
# app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
|
2025-09-30 14:25:41 +02:00 |
|
ramollia
|
99a3b7e85b
|
broken push
|
2025-09-30 12:38:49 +02:00 |
|
Bas de Jong
|
57bd6ded6f
|
HasMap to String, Asset instead of Long Asset
|
2025-09-30 11:53:13 +02:00 |
|
Bas de Jong
|
d1da49ad1d
|
New assetManager
|
2025-09-30 11:48:53 +02:00 |
|
Bas de Jong
|
9131803044
|
Working audio system with events.
|
2025-09-29 13:48:03 +02:00 |
|
Bas de Jong
|
a957195514
|
Rudimentary audio file processing.
|
2025-09-29 13:48:03 +02:00 |
|
Ticho Hidding
|
2c4719f6d4
|
added localization options
//todo add all the strings
|
2025-09-25 14:38:06 +02:00 |
|
ramollia
|
9fdd74326a
|
refactor
|
2025-09-24 15:44:38 +02:00 |
|