lieght
2fb116e107
Merge remote-tracking branch 'origin/UI' into UI
2025-10-02 19:22:58 +02:00
lieght
7f7637bc4e
Merge remote-tracking branch 'refs/remotes/origin/Development' into UI
...
# Conflicts:
# app/src/main/java/org/toop/app/App.java
# framework/src/main/java/org/toop/framework/asset/AssetLoader.java
# framework/src/main/java/org/toop/framework/asset/AssetManager.java
2025-10-02 19:22:39 +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
2003fcbf5b
Alpha Audio update ( #90 )
...
Co-authored-by: Stef <48526421+StefBuwalda@users.noreply.github.com >
2025-10-01 21:33:18 +02:00
lieght
f86775ff4c
Estimate for how much RAM used in loading assets.
2025-10-01 19:30:57 +02:00
lieght
afdadbba66
Naming and logging
2025-10-01 19:21: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
5ff7bdc0bd
Merge remote-tracking branch 'origin/Alpha' into UI
...
# Conflicts:
# .idea/misc.xml
# app/src/main/java/org/toop/app/App.java
# 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/Menu.java
# app/src/main/java/org/toop/app/menu/OptionsMenu.java
# app/src/main/java/org/toop/app/menu/QuitMenu.java
# app/src/main/resources/assets/style/main.css
# app/src/main/resources/assets/style/quit.css
2025-10-01 18:12:36 +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
lieght
71dab89dc8
Removed need for manual typecast
2025-10-01 16:17:02 +02:00
lieght
dd74eaab43
Removed files no longer in use
2025-10-01 16:04:42 +02:00
lieght
af9da93421
JDK25
2025-10-01 16:03:35 +02:00
lieght
632756bd51
Removed no more needed files.
2025-10-01 16:03:06 +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
435d443b94
Merge remote-tracking branch 'origin/UI' into UI
...
# Conflicts:
# .idea/misc.xml
2025-10-01 15:58:33 +02:00
Ticho Hidding
2c83427faf
fix small merge error
2025-10-01 15:57:46 +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
Ticho Hidding
b12c74433a
merge to UI
2025-10-01 15:31:38 +02:00
Bas Antonius de Jong
2f9b155e6e
Alpha DrawCondition update ( #89 )
...
* drawConditions gemaakt en geimplementeerd
* drawConditions gemaakt en geimplementeerd, werkt wanneer je het lokaal draait
* better draw conditions in a shorter amount of lines
* commit for ticho
* working draw conditions (maybe?)
* moved a little bit
* removed a little bit
---------
Co-authored-by: michiel <m.brands.3@st.hanze.nl >
2025-10-01 15:20:02 +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
lieght
527378ac00
Alpha rebase complete, added asset loader for UI branch
2025-10-01 15:08:18 +02:00
lieght
197db4faac
Merge remote-tracking branch 'origin/UI' into UI
...
# Conflicts:
# app/pom.xml
# app/src/main/java/org/toop/app/gui/RemoteGameSelector.java
# app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java
# app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
2025-10-01 15:04:03 +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
b2b8601f0c
Added methods to FontAsset to make it usable.
2025-10-01 04:30:35 +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
f11ff0421b
Merge remote-tracking branch 'origin/assetManager' into assetManager
2025-10-01 00:13:04 +02:00
lieght
6cd2c083b7
Refactored to have assets use self reflection to identify with certain extensions
2025-10-01 00:12:38 +02:00
aba8f682ec
Merge remote-tracking branch 'origin/assetManager' into assetManager
2025-10-01 00:08:01 +02:00
7ff65de1ca
Added an isLoaded check to AudioAsset getNewClip().
2025-10-01 00:07:15 +02:00
d661e0d4b5
Moved isLoaded to BaseResource. Loading and unloading will still be overridden if necessary. Added some subclass/super safe load and unload functions.
2025-10-01 00:06:46 +02:00
lieght
21763851e8
Made AssetManager be Thread safe.
2025-09-30 23:42:56 +02:00
d432887860
Added back changes from audio branch. byte[] is stored in base resource and different Resources can extract their data from it.
2025-09-30 23:42:00 +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
lieght
cf9c281992
Merge remote-tracking branch 'refs/remotes/origin/46-audio-epic' into assetManager
...
# Conflicts:
# framework/src/main/java/org/toop/framework/assets/resources/AudioAsset.java
# framework/src/main/java/org/toop/framework/assets/resources/BaseResource.java
# framework/src/main/java/org/toop/framework/assets/resources/ImageResource.java
2025-09-30 22:54:54 +02:00
Bas de Jong
8328387e86
Reworked resources to be assets, and made AssetManager a singleton
2025-09-30 21:01:59 +02:00
Stef
a7cd0016f1
83 spelen van geluid geeft id terug ( #86 )
...
* Between commit
* Revert "Between commit"
This reverts commit 6c6e55492e
2025-09-30 20:29:42 +02:00
Bas de Jong
d158668dfd
Resources now impelement the ResourceType interface
2025-09-30 20:04:48 +02:00
Stef
db544868d9
Merge pull request #85 from 2OOP/84-Byte-array-ipv-InputStream
...
Changed Input Stream into byte array
2025-09-30 19:55:10 +02:00
324811d026
Switched from Input Stream to Byte array. getStream can now be used to get a buffered stream
2025-09-30 19:53:39 +02:00
44b4613c27
Updated SoundManager.java to simplify how audios are played. Uses new AssetManager and AudioInputStream instead of whatever was going on at first.
2025-09-30 16:58:26 +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
