24 Commits

Author	SHA1	Message	Date
michiel	d9a93f24fb	credits toegevoegd	2025-10-03 21:44:06 +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
lieght	2fb116e107	Merge remote-tracking branch 'origin/UI' into UI	2025-10-02 19:22:58 +02:00
Ticho Hidding	be917e6a61	added German, French, Spanish, Italian and Mandarin Chinese	2025-10-02 13:43:00 +02:00
lieght	e7fded0c9e	Added event for playing sound on button press.	2025-10-02 12:40:57 +02:00
Bas Antonius de Jong	fb0e16acc2	Added MusicAsset, renamed SoundAsset to be SoundEffectAsset. Created new directories for fx and music types of sound. (#105)	2025-10-02 00:08:39 +02:00
Bas Antonius de Jong	258adbb627	UI (#96) ... * 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 --------- Co-authored-by: Ticho Hidding <tichohidding@gmail.com> Co-authored-by: ramollia <@>	2025-10-01 18:14:56 +02:00
lieght	744bef2ddf	Docs and easy font loading. Added interfaces for PreloadResource's	2025-10-01 18:09:14 +02:00
lieght	8ae7510219	Added ability to load in BundledResource for localization	2025-10-01 16:55:40 +02:00
Bas Antonius de Jong	9b17a4ba7f	Alpha UI update (#95) ... * 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 --------- Co-authored-by: Ticho Hidding <tichohidding@gmail.com> Co-authored-by: ramollia <@>	2025-10-01 15:59:12 +02:00
lieght	13bc313c17	UI now uses assetmanager	2025-10-01 15:48:23 +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