lieght
abc173a1ee
Merge remote-tracking branch 'origin/AudioDisplay' into AudioDisplay
2025-10-16 00:57:01 +02:00
lieght
3784cd790e
Clips now also return positional information
2025-10-16 00:56:46 +02:00
michiel301b
f44c3932dc
Basis Audio Display toegevoegd + standaard CSS toegevoegd
...
Kan nu zien hoe lang de song duurt, hoe lang ie al bezig is met draaien en de titel (-.mp3)
2025-10-16 00:45:29 +02:00
lieght
545e830b3c
Updated timings
2025-10-15 23:54:17 +02:00
lieght
977e9bb102
Updated test.
2025-10-15 23:24:21 +02:00
lieght
69bc55dc26
Polling music event, fires every 1 second
2025-10-15 23:21:00 +02:00
michiel301b
62e2b71ece
begin van audio display
2025-10-15 22:58:25 +02:00
ramollia
e71369f7ff
visual update
2025-10-15 16:46:19 +02:00
ramollia
56ebe1347c
add: server chat box
2025-10-15 16:13:42 +02:00
ramollia
7f8ed029b9
add: reversi game
2025-10-15 15:22: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
1f64a2dfd0
fixed merge conflicts
2025-10-15 00:26:27 +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
michiel
a3203dd78e
Merge remote-tracking branch 'origin/Reversi' into Reversi
2025-10-14 13:40:00 +02:00
michiel
efbab12b10
Tests toegevoegd
2025-10-14 13:39:22 +02:00
Ticho Hidding
8e823b4108
getLegalMoves logic seems fixed //todo write better tests
2025-10-14 13:34:47 +02:00
Ticho Hidding
81abeef843
commit ofzo
2025-10-14 13:12:45 +02:00
Ticho Hidding
be26db953e
Merge remote-tracking branch 'origin/Development' into Reversi
...
# Conflicts:
# app/src/main/java/org/toop/app/canvas/GameCanvas.java
# app/src/main/java/org/toop/app/layer/layers/MainLayer.java
# game/src/main/java/org/toop/game/Game.java
# game/src/main/java/org/toop/game/othello/Othello.java
# game/src/main/java/org/toop/game/othello/OthelloAI.java
2025-10-14 11:25:46 +02:00
Ticho Hidding
76c7e44447
Merge remote-tracking branch 'origin/Development' into Reversi
2025-10-14 11:07:10 +02:00
Ticho Hidding
d9f6c7ee74
commit
2025-10-14 11:06:41 +02:00
Bas de Jong
0e3165ed98
Added linelistener to SoundEffectAsset
2025-10-13 13:45:16 +02:00
lieght
4bcf70d4dc
Removed ResourceManager from AudioManagers
2025-10-13 02:47:34 +02:00
lieght
fcc0b9d0dd
SoundEffectManager now generic
2025-10-13 02:27:04 +02:00
lieght
cdc34b432e
Changed pom to be correct.
...
Fixed SnowflakeGenerator not making unique ids.
Changed naming for event implementation.
Automated id getter for events.
Added Error-Prone to all modules.
Added parents to all modules.
Added processors module.
2025-10-13 02:06:12 +02:00
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
