ramollia
|
a2d651cd7d
|
Merge remote-tracking branch 'refs/remotes/origin/Development' into Tutorials
# Conflicts:
# app/src/main/java/org/toop/app/game/Connect4Game.java
|
2025-11-28 11:51:46 +01:00 |
|
tichohidding
|
8c01c7fa7a
|
Merge branch 'Development' into Widgets
|
2025-11-27 17:19:17 +01:00 |
|
michiel
|
c14b66e892
|
rest van de tutorials toegevoegd
|
2025-11-27 11:42:38 +01:00 |
|
michiel301b
|
8c69453506
|
started a basis for the tutorials, tic tac toe is almost done with some general stuff still to do.
|
2025-11-26 22:03:06 +01:00 |
|
ramollia
|
1c9af58264
|
half done with the widget system
|
2025-10-31 17:33:19 +01:00 |
|
|
|
eda85ea888
|
Removed unused import and unused parameter
|
2025-10-29 13:51:56 +01:00 |
|
|
|
f026a4fec6
|
Manually fallback to the fallback locale when a ResourceBundle is missing a resource key. Fallsback to "MISSING RESOUREC" if it's not present in the fallback.
|
2025-10-29 13:49:50 +01:00 |
|
ramollia
|
7f8ed029b9
|
add: reversi game
|
2025-10-15 15:22:19 +02:00 |
|
ramollia
|
1f64a2dfd0
|
fixed merge conflicts
|
2025-10-15 00:26:27 +02:00 |
|
ramollia
|
0a6c2487bd
|
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/GameInformation.java
# app/src/main/java/org/toop/app/canvas/GameCanvas.java
# app/src/main/java/org/toop/app/canvas/TicTacToeCanvas.java
# app/src/main/java/org/toop/app/layer/Container.java
# app/src/main/java/org/toop/app/layer/Layer.java
# app/src/main/java/org/toop/app/layer/NodeBuilder.java
# app/src/main/java/org/toop/app/layer/Popup.java
# app/src/main/java/org/toop/app/layer/containers/HorizontalContainer.java
# app/src/main/java/org/toop/app/layer/containers/VerticalContainer.java
# app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
# app/src/main/java/org/toop/app/layer/layers/CreditsPopup.java
# app/src/main/java/org/toop/app/layer/layers/MainLayer.java
# app/src/main/java/org/toop/app/layer/layers/MultiplayerLayer.java
# app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java
# app/src/main/java/org/toop/app/layer/layers/QuitPopup.java
# app/src/main/java/org/toop/app/layer/layers/game/GameFinishedPopup.java
# app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
# app/src/main/java/org/toop/local/AppSettings.java
|
2025-10-15 00:17:17 +02:00 |
|
ramollia
|
e382cf95f2
|
gui refactor
|
2025-10-15 00:14:39 +02:00 |
|
Bas de Jong
|
7f3d858320
|
AppSettings now also get loaded into the assetmanager
|
2025-10-08 00:14:40 +02:00 |
|
Bas de Jong
|
e9dfbbd150
|
Renamed asset folder to resource, made resourceLoader more robust. Completed some TODO's, formatting
|
2025-10-07 23:54:33 +02:00 |
|
Bas de Jong
|
3c385e27b0
|
Formatting
|
2025-10-07 19:47:45 +02:00 |
|
Stef
|
3af182b986
|
Add a music volume slider (#135)
|
2025-10-07 11:47:57 +02:00 |
|
ramollia
|
172b26ed51
|
...
|
2025-10-07 04:46:45 +02:00 |
|
ramollia
|
acc9972c80
|
redesign. add: themes and text size
|
2025-10-06 21:08:36 +02:00 |
|
lieght
|
2198b8a8d9
|
Fixes gets
|
2025-10-05 17:52:32 +02:00 |
|
ramollia
|
f780309572
|
Merge remote-tracking branch 'origin/Settings' into UI
# Conflicts:
# app/src/main/java/org/toop/app/App.java
# app/src/main/java/org/toop/app/layer/layers/OptionsLayer.java
# framework/src/main/java/org/toop/framework/audio/SoundManager.java
|
2025-10-05 17:03:09 +02:00 |
|
lieght
|
0ab0cd75ba
|
Fixed audio not getting correct volume at settings loading. Added back background music
|
2025-10-05 01:51:29 +02:00 |
|
ramollia
|
043b789da1
|
readd: localization
|
2025-10-04 22:57:12 +02:00 |
|
michiel
|
d7d6a49b98
|
settings
|
2025-10-04 22:33:46 +02:00 |
|
ramollia
|
82f8d00625
|
started the great ui redesign
|
2025-10-03 20:38:50 +02:00 |
|
lieght
|
83130806a8
|
Changed bundled resources to use static base name instead.
Added options menu with selectable language.
Created checkbox for setting fullscreen.
Refactored code to functions
|
2025-10-03 04:15:36 +02:00 |
|
lieght
|
a5513bf87b
|
Merge remote-tracking branch 'origin/121-settings-menu' into UI
# Conflicts:
# app/src/main/java/org/toop/app/menu/OptionsMenu.java
# app/src/main/resources/assets/localization/localization_de.properties
# app/src/main/resources/assets/localization/localization_en_US.properties
# app/src/main/resources/assets/localization/localization_es.properties
# app/src/main/resources/assets/localization/localization_fr.properties
# app/src/main/resources/assets/localization/localization_it.properties
# app/src/main/resources/assets/localization/localization_nl.properties
# app/src/main/resources/assets/localization/localization_zh.properties
|
2025-10-03 03:25:20 +02:00 |
|
lieght
|
547ea55300
|
Changed bundled resources to use static base name instead.
Added options menu with selectable language
|
2025-10-03 03:19:38 +02:00 |
|
Ticho Hidding
|
c020269f6e
|
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/game/GameMenu.java
|
2025-10-03 02:43:39 +02:00 |
|
Ticho Hidding
|
f037412e9a
|
Change language buttons added. Made UI update all text on language change
|
2025-10-03 02:37:38 +02:00 |
|
ramollia
|
5e1d53e96b
|
tiny portion of refactoring
|
2025-10-03 01:41:11 +02:00 |
|
Ticho Hidding
|
2c4719f6d4
|
added localization options
//todo add all the strings
|
2025-09-25 14:38:06 +02:00 |
|
