lieght
6ae5f1c2d2
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/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
2025-10-15 21:05:33 +02:00
lieght
b30420616a
Merge remote-tracking branch 'origin/185-networkingeventlistener' into UI
...
# Conflicts:
# app/src/main/java/org/toop/app/App.java
# app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.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
2025-10-15 21:05:01 +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
lieght
444a81abc3
Improved API for dependency injection
2025-10-14 23:44:45 +02:00
lieght
d0676d9363
Forgot to remove
2025-10-14 23:27:52 +02:00
lieght
8f7e78efb5
Reworked NetworkingClientManager into SRP model.
2025-10-14 23:27:12 +02:00
lieght
cb7e3298fd
Added shuffling on user request
2025-10-14 19:57:07 +02:00
michiel
c09f0eb1f9
punk toegevoegd
2025-10-14 14:18:52 +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
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
lieght
4b60fa88ee
Moved restrictedAPI to future release
2025-10-12 20:41:56 +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
a766b85a75
Fixed AudioVolumemanager, all volumes calculations are now made in VolumeTypes enum
2025-10-12 00:37:02 +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
Ticho Hidding
c1f7a093ef
Moves flip dots. all tests pass. can play reversi local.
2025-10-11 00:51:46 +02:00
Ticho Hidding
5dda85248e
legal moves now get highlighted in red
2025-10-09 15:27:58 +02:00
Ticho Hidding
5a3490af2e
start to reversi logic
2025-10-08 17:27:50 +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
3c385e27b0
Formatting
2025-10-07 19:47:45 +02:00
Bas de Jong
6bfa8868bf
Moved import
2025-10-07 19:36:42 +02:00
ramollia
e12e48b4fb
fast server connection
2025-10-07 12:40:12 +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
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
