Commit Graph

39 Commits

Author SHA1 Message Date
Luca Conte eaa5b64956 fix ready 2024-12-23 23:21:48 +01:00
Luca Conte 9ea176cc6d add rotate instruction 2024-12-23 23:15:04 +01:00
Luca Conte 6f98a82a90 KOOMMMEEENTTAAAREEEEEEEE 2024-12-23 21:36:19 +01:00
Luca Conte c14f7d5bfe Merge branch 'main' into lucasjoshua 2024-12-23 20:44:31 +01:00
Luca Conte e85f151b33 a bit cleaner withdraw 2024-12-23 20:28:06 +01:00
Joshua 678ed9d81e Got rid of some todos 2024-12-23 19:28:02 +01:00
Luca Conte be6b50739f Merge branch 'lucasjoshua' into wip-fix-ai-players 2024-12-23 19:05:24 +01:00
Joshua cb9b110621 Added and integrated new sounds.
Added standardPort to be default value of port field.
2024-12-21 16:26:10 +01:00
Kaver 4dd1c9b39b Code aufräumen und kleine Anpassungen/Korrekturen vorgenommen 2024-12-20 19:39:56 +01:00
Luca Conte b7215db6d9 destroy players on game end 2024-12-20 17:57:50 +01:00
ole 7ef04711c3 add getter for Player 1 2024-12-20 17:29:37 +01:00
Joshua 15c23c1f2c Added final TODOs 2024-12-17 17:21:59 +01:00
Joshua 42fc341608 Added more Javadoc (TODOs) comments. 2024-12-17 16:42:50 +01:00
Joshua 1f04760f6a Added more Javadoc (TODOs) comments.
Added new sound.
temporarily disabled sound when hitting/sinking ships (buggy)
2024-12-17 15:58:05 +01:00
Joshua db2b0532bc Added more Javadoc (TODOs) comments. 2024-12-17 14:34:03 +01:00
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 e0748ceff9 Small Stuff 2024-12-15 16:55:59 +01:00
Luca Conte d7637e1e51 Merge branch 'main' into pewpew 2024-12-15 16:05:09 +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
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
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
Kaver bd3976cc0c ShipButton hinzugefuegt,Schiffe setzen WIP 2024-12-13 18:47:14 +01:00
Kaver 00df38dd7a Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua
# Conflicts:
#	src/BoardDisplay.java
2024-12-13 17:06:45 +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 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
Joshua f151a89ea4 Added function to JoinGame. 2024-12-10 12:50:26 +01:00
Luca Conte 6a57a6e1ff remove unused import 2024-12-10 12:44:01 +01:00
Kaver 0ef34e18eb Anpassungen/Erweiterungen an dem Spielfeld durch BoardDisplay und GameBoard
Test Button hinzugefuegt um auf Spielfeld JPanel zu wechseln
2024-12-04 15:38:10 +01:00
Joshua 48bc601a0d Added BoardDisplay, startet connecting FrontEnd/BackAnd.
Added new graphics.
Added startLocalGameLoadingScreen
2024-12-03 15:33:15 +01:00
Joshua 772f2d45c6 Added Backbutton function to GameBoard 2024-12-03 12:23:46 +01:00
Joshua 2274a1e558 Created GameBoard.
Added showPanel methods to pass parameters between methods.
2024-11-26 17:15:21 +01:00
Joshua 607004a3b3 Added test classes for CardLayout and GameBoard.java 2024-11-19 14:24:09 +01:00