ramollia
e71369f7ff
visual update
2025-10-15 16:46:19 +02:00
ramollia
2c8db95ba7
Merge remote-tracking branch 'origin/Reversi' into UI
...
# Conflicts:
# app/src/main/java/org/toop/app/App.java
# app/src/main/java/org/toop/app/canvas/GameCanvas.java
# app/src/main/java/org/toop/app/layer/layers/MainLayer.java
# app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java
# app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
# app/src/main/java/org/toop/local/AppSettings.java
# app/src/main/resources/assets/localization/localization_ar.properties
# app/src/main/resources/assets/localization/localization_de.properties
# app/src/main/resources/assets/localization/localization_en.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_hi.properties
# app/src/main/resources/assets/localization/localization_it.properties
# app/src/main/resources/assets/localization/localization_ja.properties
# app/src/main/resources/assets/localization/localization_ko.properties
# app/src/main/resources/assets/localization/localization_nl.properties
# app/src/main/resources/assets/localization/localization_ru.properties
# app/src/main/resources/assets/localization/localization_zh.properties
2025-10-15 00:39:14 +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
michiel
c09f0eb1f9
punk toegevoegd
2025-10-14 14:18:52 +02:00
Ticho Hidding
81abeef843
commit ofzo
2025-10-14 13:12:45 +02:00
lieght
b101734fd7
Reworked to now use better defined generics and easier to use API. Added AudioResource to be used in changing volume
2025-10-11 06:09:13 +02:00
michiel
a302f0d24d
added a song
2025-10-07 12:35:54 +02:00
ramollia
3d9914c927
add: missing localization
2025-10-07 12:08:01 +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
78aef47bc0
fix: effects volume translation
2025-10-06 23:36:25 +02:00
ramollia
ea8de7881f
Merge remote-tracking branch 'origin/UI' into UI
...
# Conflicts:
# app/src/main/resources/assets/localization/localization_ka.properties
2025-10-06 23:26:07 +02:00
ramollia
e6fa522f39
add: ai think time.
...
remove: georgian language pack
2025-10-06 23:25:48 +02:00
Bas de Jong
95c4a2fc8e
finished fx audio volume
2025-10-06 22:27:14 +02:00
ramollia
f525fc7ffc
add: missing localization
2025-10-06 21:49:35 +02:00
ramollia
1bf3f00322
add: win screen
2025-10-06 21:46:38 +02:00
ramollia
525adfdd04
translated: connection type
2025-10-06 21:15:43 +02:00
ramollia
acc9972c80
redesign. add: themes and text size
2025-10-06 21:08:36 +02:00
ramollia
cfde1f8d7f
update: style
2025-10-06 11:43:09 +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
ramollia
2362333d46
add: some more languages
2025-10-05 16:59:37 +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
ramollia
39fa2edb3a
add: credits layer
2025-10-04 20:25:59 +02:00
ramollia
e7d606f08e
add: options layer
2025-10-04 19:26:30 +02:00
ramollia
cd2f3c312e
start: options
2025-10-04 16:59:28 +02:00
ramollia
ba4173f029
add: separators
2025-10-04 16:24:27 +02:00
ramollia
af0db24b0a
add: sliders
...
change: formatting
2025-10-04 15:56:07 +02:00
ramollia
fe6b050702
Merge remote-tracking branch 'origin/UI' into UI
...
# Conflicts:
# app/src/main/java/org/toop/app/menu/CreditsMenu.java
# app/src/main/java/org/toop/app/menu/MainMenu.java
# app/src/main/java/org/toop/app/menu/OptionsMenu.java
2025-10-04 15:16:39 +02:00
ramollia
b3feab7cb3
change things
2025-10-04 15:16:07 +02:00
ramollia
87a5b301c7
change: layout stuff
2025-10-04 13:52:04 +02:00
ramollia
8fc7f606f9
change: toggles
2025-10-03 23:16:47 +02:00
ramollia
fae5b8bcda
added: toggle
2025-10-03 22:34:26 +02:00
ramollia
ac6de04e68
changed how the layer background uses css
2025-10-03 21:44:32 +02:00
michiel
d9a93f24fb
credits toegevoegd
2025-10-03 21:44:06 +02:00
ramollia
754c8fea2e
started working on the game selection layer
2025-10-03 21:31:42 +02:00
ramollia
82f8d00625
started the great ui redesign
2025-10-03 20:38:50 +02:00
lieght
796c3a2bc6
Added forgotten sound effects
2025-10-03 18:31:13 +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
3471ae54a5
small merge fixes
2025-10-03 02:46:48 +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
lieght
1dd345a290
Merge remote-tracking branch 'origin/Development' into UI
...
# Conflicts:
# app/src/main/java/org/toop/app/App.java
# app/src/main/java/org/toop/app/menu/MainMenu.java
2025-10-03 01:18:18 +02:00
lieght
ccc8ba3b79
Renamed assetmanager to resourcemanager
2025-10-02 21:47:18 +02:00
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
Bas Antonius de Jong
477afa142b
UI ( #106 )
...
* added localization options
//todo add all the strings
* broken push
* merge to UI
* broken push
* Alpha rebase complete, added asset loader for UI branch
* merge to UI
* UI now uses assetmanager
* added NL and EN for all strings currently in UI
* fix small merge error
* Removed no more needed files.
* JDK25
* Removed files no longer in use
* Removed need for manual typecast
* Added ability to load in BundledResource for localization
* Docs and easy font loading. Added interfaces for PreloadResource's
* added German, French, Spanish, Italian and Mandarin Chinese
---------
Co-authored-by: Ticho Hidding <tichohidding@gmail.com >
Co-authored-by: ramollia <@>
2025-10-02 19:25:21 +02:00
