Bas Antonius de Jong
00daf37244
Merge pull request #175 from 2OOP/166-audiomanager-opslitsen-om-single-responsibility-principle-te-volgen
...
166 audiomanager opslitsen om single responsibility principle te volgen Done
2025-10-12 20:44:57 +02:00
lieght
bab11b64a5
Merge remote-tracking branch 'origin/166-audiomanager-opslitsen-om-single-responsibility-principle-te-volgen' into 166-audiomanager-opslitsen-om-single-responsibility-principle-te-volgen
2025-10-12 20:42:09 +02:00
lieght
4b60fa88ee
Moved restrictedAPI to future release
2025-10-12 20:41:56 +02:00
lieght
f3316145e7
Finished todo's
2025-10-12 20:41:54 +02:00
lieght
53a72cc340
Moved restrictedAPI to future release
2025-10-12 20:41:10 +02:00
lieght
081fbda7b1
Merge remote-tracking branch 'origin/166-audiomanager-opslitsen-om-single-responsibility-principle-te-volgen' into 166-audiomanager-opslitsen-om-single-responsibility-principle-te-volgen
...
# Conflicts:
# framework/src/main/java/org/toop/framework/audio/MusicManager.java
2025-10-12 20:37:23 +02:00
lieght
d051e3e603
Finished todo's
2025-10-12 20:36:28 +02:00
Bas de Jong
5317c42c81
Removed no more needed code.
2025-10-12 07:20:28 +02:00
Bas de Jong
6085f6ebe2
Small fixes.
2025-10-12 07:19:27 +02:00
Bas de Jong
ea6264e519
Added ErrorProne for potential bugs. Fixed potential bugs.
2025-10-12 07:14:26 +02:00
lieght
e3bce3889e
Renamed VolumeTypes to VolumeControl. Made it thread safe. Added docs to VolumeControl and co.
...
removed .updateAllVolumes() in favor of auto updating inside enum instead
2025-10-12 02:20:30 +02:00
lieght
b050e06ceb
Minor changes in API design
2025-10-12 01:56:06 +02:00
lieght
7631a10838
Renamed VOLUME to MASTERVOLUME for better naming
2025-10-12 01:02:58 +02:00
lieght
ca25338971
Fixed grammer and spelling mistakes
2025-10-12 00:55:02 +02:00
lieght
42e03e0878
Removed file no longer in use
2025-10-12 00:52:02 +02:00
lieght
9b81ee1e65
Added ability to remove a manager from VolumeTypes
2025-10-12 00:39:16 +02:00
lieght
a4b0f890da
Merge remote-tracking branch 'origin/166-audiomanager-opslitsen-om-single-responsibility-principle-te-volgen' into 166-audiomanager-opslitsen-om-single-responsibility-principle-te-volgen
2025-10-12 00:37:21 +02:00
lieght
a766b85a75
Fixed AudioVolumemanager, all volumes calculations are now made in VolumeTypes enum
2025-10-12 00:37:02 +02:00
Stef
34ccddaea5
Hotfix for loading clip volume issue ( #174 )
2025-10-12 00:04:59 +02:00
lieght
73a2fe3da2
Unit tests for MusicManager.java
2025-10-11 23:08:28 +02:00
Stef
d958b9730a
Split SoundEffectManager from AudioManager. ( #171 )
...
Clips no longer create a new clip instance each time they are played. A singular clip is made for each resource and is opened/closed when loaded/unloaded. When a clip is played that is already playing it'll stop playback and start again. Clip volume handling isn't done very well.
2025-10-11 23:00:06 +02:00
Bas de Jong
9749d3eee8
Added more flexible dependency injection to MusicManager for unittesting. Moved to event driven design for less complex code and lower runtime complexity.
2025-10-11 20:45:57 +02:00
Bas de Jong
1ecdb9a555
Made all of the updated classes more generic for better flexibility in unittesting
2025-10-11 19:31:55 +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
lieght
123ecc7d3a
Working state. Split AudioManager into 3 different branches for easier testing and srp
2025-10-11 04:50:49 +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
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
Bas de Jong
783cfd22e1
Updated .gitignore
2025-10-07 19:46:14 +02:00
Bas de Jong
16a5b1ce2f
Merge remote-tracking branch '2OOP/main' into Development
...
# Conflicts:
# .idea/compiler.xml
# .idea/misc.xml
# app/src/main/java/org/toop/Main.java
2025-10-07 19:40:55 +02:00
Bas de Jong
6bfa8868bf
Moved import
2025-10-07 19:36:42 +02:00
Bas de Jong
748f72352f
Merge remote-tracking branch 'origin/Development' into UI
2025-10-07 19:36:14 +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
Stef
58269e917a
Split AudioVolumeManager from SoundManager ( #134 )
2025-10-07 09:45:59 +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
6d7a8e4c50
Refactored code
2025-10-06 23:10:07 +02:00
Bas de Jong
c6c1c110f7
var to string
2025-10-06 23:04:11 +02:00
Bas de Jong
046a59e915
Added clickable players
2025-10-06 22:59:18 +02:00
Bas de Jong
501b411e34
Merge remote-tracking branch 'origin/UI' into UI
2025-10-06 22:27:27 +02:00
Bas de Jong
95c4a2fc8e
finished fx audio volume
2025-10-06 22:27:14 +02:00
ramollia
ce02fc2b88
add: online player list
2025-10-06 22:16:23 +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
