 Joshua
|
8c953a1f2b
|
Added Javadoc comments to all FrontEnd classes.
Added functionality to mute button.
Added "//" comments to all Actionlisteners.
Added "Todo" where there is still need for something
|
2024-12-17 09:19:52 +01:00 |
|
Joshua
|
626ae041e5
|
Added 3 more sounds. Added function calls to test sounds, some still untested
|
2024-12-15 18:55:45 +01:00 |
|
Joshua
|
f5a0f8c9fe
|
Merge remote-tracking branch 'origin/main' into lucasjoshua
|
2024-12-15 17:17:39 +01:00 |
|
Joshua
|
f1adf06035
|
Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua
|
2024-12-15 16:56:20 +01:00 |
|
Joshua
|
e0748ceff9
|
Small Stuff
|
2024-12-15 16:55:59 +01:00 |
 Kaver
|
0935c3bcb7
|
WinLoose grob erstellt
|
2024-12-15 16:55:29 +01:00 |
 Luca Conte
|
78f6dd01f9
|
Merge pull request 'display improvements' (#18) from pewpew into main
Reviewed-on: #18
|
2024-12-15 15:54:33 +00:00 |
|
Luca Conte
|
ec35646dab
|
display improvements
|
2024-12-15 16:54:04 +01:00 |
|
Joshua
|
d8804d5369
|
Added TODO for frontend
|
2024-12-15 16:17:02 +01:00 |
|
Luca Conte
|
6857df94e0
|
Merge pull request 'pewpew' (#17) from pewpew into main
Reviewed-on: #17
|
2024-12-15 15:08:21 +00:00 |
|
Luca Conte
|
d7637e1e51
|
Merge branch 'main' into pewpew
|
2024-12-15 16:05:09 +01:00 |
|
Luca Conte
|
7b80e3dfd3
|
Merge pull request 'lucasjoshua' (#16) from lucasjoshua into main
Reviewed-on: #16
|
2024-12-15 15:02:32 +00:00 |
|
Kaver
|
37a984772c
|
Javadoc Kommentare erweitert in BoardDisplay
|
2024-12-15 16:01:52 +01:00 |
|
Joshua
|
c0f22cec6e
|
Cleaned up code
|
2024-12-15 16:01:11 +01:00 |
|
Luca Conte
|
d9a93952d2
|
PEW PEW
|
2024-12-15 15:59:26 +01:00 |
|
Kaver
|
ad61fcecb7
|
Anpasung an paintFields, sodass preview unterscheidet, ob setzen von Schiff valide ist
|
2024-12-15 15:51:32 +01:00 |
|
Kaver
|
b4f1de82bd
|
Preview des setzen von Schiffen
|
2024-12-15 15:25:53 +01:00 |
|
Luca Conte
|
60e44f2e1a
|
add getVirtualOccupiedPoints
|
2024-12-15 15:10:20 +01:00 |
|
Kaver
|
7605646b80
|
Action Listener Update fuer BoardDisplay
|
2024-12-15 14:51:40 +01:00 |
|
Kaver
|
5be3f4daf3
|
Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua
|
2024-12-15 14:44:41 +01:00 |
|
Luca Conte
|
0391b3265a
|
Merge pull request 'fix horizontal' (#15) from lucasjoshua into main
Reviewed-on: #15
|
2024-12-15 13:42:34 +00:00 |
|
Luca Conte
|
864ca20e18
|
fix horizontal
|
2024-12-15 14:42:18 +01:00 |
|
Luca Conte
|
9e07350f7d
|
Merge pull request 'lucasjoshua' (#14) from lucasjoshua into main
Reviewed-on: #14
|
2024-12-15 13:27:15 +00:00 |
|
Luca Conte
|
b5f1151a4f
|
add checkValidShipPlacement and set horizontal in setPosition
|
2024-12-15 14:26:42 +01:00 |
|
Luca Conte
|
f565708461
|
implement ready for players and board refresh method
|
2024-12-15 14:21:17 +01:00 |
|
Joshua
|
970550308b
|
Fixed showing Player names in GameBoard.
Added functionality to Button coloring (when selected, placed etc.)
|
2024-12-15 13:48:01 +01:00 |
|
Luca Conte
|
d1dbcfe603
|
remove isPlaced field
|
2024-12-15 12:54:36 +01:00 |
|
Luca Conte
|
256d769ccf
|
add ship reset position
|
2024-12-15 12:53:44 +01:00 |
|
Luca Conte
|
80b5d8e701
|
set player names
|
2024-12-15 12:40:12 +01:00 |
|
Joshua
|
d3f5421808
|
Added kontextText variations.
Added functionality to "Ready" Button.
|
2024-12-14 17:26:46 +01:00 |
|
Kaver
|
587d88f764
|
Reset Button Funktionalität hinzugefuegt
|
2024-12-14 16:47:12 +01:00 |
|
Joshua
|
decef526da
|
Fixed ship rotation method.
Added pulsating Effect for "kontextText"
|
2024-12-14 15:29:45 +01:00 |
|
Joshua
|
bf78db9404
|
Added (currently not working) ship rotation method, colored Ready and Reset button, added (currently not working) Player name Labels etc. to GameBoard
|
2024-12-13 20:46:38 +01:00 |
|
Kaver
|
a7e7d75c62
|
Button ausschalten wenn Schiff gesetzt wurde, nicht komplett richtige Funktion
|
2024-12-13 20:30:15 +01:00 |
|
Luca Conte
|
88ec23c5e5
|
fix ship placing :)
|
2024-12-13 19:12:26 +01:00 |
|
Kaver
|
bd3976cc0c
|
ShipButton hinzugefuegt,Schiffe setzen WIP
|
2024-12-13 18:47:14 +01:00 |
|
Luca Conte
|
fd5a97cd6e
|
Merge pull request 'start game stuff - both online and offline' (#13) from start-game into main
Reviewed-on: #13
|
2024-12-13 16:27:43 +00:00 |
|
Luca Conte
|
dfbe4b3c53
|
fix online game start
|
2024-12-13 17:26:18 +01:00 |
|
Luca Conte
|
5ba5919775
|
Merge branch 'lucasjoshua' into start-game
|
2024-12-13 17:24:17 +01:00 |
|
Kaver
|
00df38dd7a
|
Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua
# Conflicts:
# src/BoardDisplay.java
|
2024-12-13 17:06:45 +01:00 |
|
Kaver
|
f397803b64
|
Kleine Anpassung von BoardDisplay
|
2024-12-13 17:00:51 +01:00 |
|
Luca Conte
|
fd82e64814
|
remove connection timeout
|
2024-12-13 16:59:02 +01:00 |
|
Joshua
|
84865e5468
|
Added comments (Javadoc etc.) to most GUI classes und deleted old code and comments etc. (in general cleanup)
|
2024-12-12 17:19:35 +01:00 |
|
Kaver
|
adac40156a
|
Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua
|
2024-12-11 16:04:06 +01:00 |
|
Joshua
|
6f9f5c5063
|
Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua
|
2024-12-10 17:26:58 +01:00 |
|
Joshua
|
bb61a68f24
|
Player names will now be passed correctly between classes. Added lots of comments in startLocalGame, startLocalGameLoadingScreen, startMultiplayerGame and JoinGame.
|
2024-12-10 17:26:27 +01:00 |
|
Kaver
|
663991e418
|
Merge remote-tracking branch 'origin/start-game' into lucasjoshua
# Conflicts:
# src/JoinGame.java
|
2024-12-10 16:58:38 +01:00 |
|
Kaver
|
8a9e7fb4b2
|
Implementierung von Schiffe platzieren gestartet(BoardDisplay),
Anpassungen an Buttons im GameBoard sowie diverse getter hinzugefeugt(backend)
|
2024-12-10 16:52:10 +01:00 |
|
Luca Conte
|
60e6ed1277
|
kill the zombies
|
2024-12-10 14:42:15 +01:00 |
|
Luca Conte
|
5cf8befdc1
|
add todo
|
2024-12-10 14:08:00 +01:00 |