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
72e322675e
Fixed bugs and oversights
2025-10-07 22:39:47 +02:00
Bas de Jong
ed3cb902e4
Fixed wrong test
2025-10-07 19:55:23 +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
Stef
58269e917a
Split AudioVolumeManager from SoundManager ( #134 )
2025-10-07 09:45:59 +02:00
Bas de Jong
95c4a2fc8e
finished fx audio volume
2025-10-06 22:27:14 +02:00
ramollia
fcdd4a8fc1
Merge remote-tracking branch 'origin/UI' into UI
...
# Conflicts:
# app/src/main/java/org/toop/app/layer/layers/MultiplayerLayer.java
# app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
2025-10-06 21:09:23 +02:00
ramollia
acc9972c80
redesign. add: themes and text size
2025-10-06 21:08:36 +02:00
Stef
0d771088e1
Merge pull request #129
...
* Sound data is now stored in memory as a byte[]
2025-10-06 19:08:46 +02:00
Stef
43c577ef17
Volume slider affects clips ( #127 )
2025-10-06 18:51:04 +02:00
Ticho Hidding
9144cb453e
small fix
2025-10-06 02:34:48 +02:00
Ticho Hidding
20a7fd7a3e
serverThread added. cant test cus server doesnt allow "MOVE <int>"
2025-10-06 01:36:58 +02:00
lieght
08bfb97399
Wip OnlineGameState
2025-10-05 19:55:29 +02:00
lieght
b8336ce3d2
Added throw exception
2025-10-05 17:38:01 +02:00
lieght
06464945bd
Sane default for audio.
2025-10-05 17:23:05 +02:00
lieght
1bab3e12a5
Fixed garbage code.
2025-10-05 17:21:31 +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
michiel
d7d6a49b98
settings
2025-10-04 22:33:46 +02:00
lieght
56a1afe1cd
"Fixed double sound bug"
2025-10-03 18:34:48 +02:00
lieght
dd192692bd
Working sound effect for clicking, bug when using audio volume changer (changes some sounds to be wrong)
2025-10-03 17:12:50 +02:00
lieght
5a200a8a70
Working audio rocker in settings menu.
2025-10-03 04:42:48 +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
lieght
ccc8ba3b79
Renamed assetmanager to resourcemanager
2025-10-02 21:47:18 +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
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
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
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
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
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
