stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
625 Commits 8 Branches 1 Tag
ea32598d4c1da9f2364cb46e89c1cb6878df381e
Commit Graph

625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lieght
b1589032be test fix 2025-10-17 20:22:27 +02:00
lieght
55989ab8ce Merge remote-tracking branch 'origin/UI' into AudioDisplay 2025-10-17 20:13:05 +02:00
lieght
443f2da97d Merge remote-tracking branch 'origin/UI' into 185-networkingeventlistener 2025-10-17 20:12:41 +02:00
lieght
8f047cd7b5 Faster event schedule for PlayingMusic event 2025-10-17 19:51:49 +02:00
lieght
bb2630f3d5 Small event fix 2025-10-17 19:46:03 +02:00
michiel
f44bf6bd02 Tiny fix when natural skip 2025-10-16 14:00:40 +02:00
Bas de Jong
3a120803e3 Fixes for garbage code by Omar 2025-10-16 13:59:24 +02:00
michiel
6e35067c18 Skip Button 2025-10-16 13:37:01 +02:00
michiel
30f797022c Skip Button 2025-10-16 13:35:41 +02:00
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
975207a6de Nuke everything on close. 2025-10-16 00:37:20 +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
lieght
cf9dbef882 Correct client creation and user polling 2025-10-15 21:36:46 +02:00
Bas Antonius de Jong
09f3dc4e3e Merge pull request #186 from 2OOP/UI 
Update UI for networking
 2025-10-15 21:06:31 +02:00
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
lieght
1134649197 Documentation 2025-10-15 20:11:43 +02:00
lieght
5beebf9663 Quick fix for closing connection. 2025-10-15 19:08:18 +02:00
lieght
798005de2c Refactor to make Events easier to work with. 2025-10-15 19:05:09 +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
lieght
bc6182e29a Fixed event bug 2025-10-15 03:26:19 +02:00
lieght
dc81d9c3ca Added exceptions. Added reconnect attempts and changeable address 2025-10-15 02:58:14 +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
14e6785c6f Some better docs. 2025-10-15 00:01:41 +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
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
Stef
3165ff33b3 Tests for SoundEffectManager 2025-10-14 13:21:17 +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