 Joshua
|
d8804d5369
|
Added TODO for frontend
|
2024-12-15 16:17:02 +01:00 |
 Luca Conte
|
d7637e1e51
|
Merge branch 'main' into pewpew
|
2024-12-15 16:05:09 +01: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 |
|
Luca Conte
|
864ca20e18
|
fix horizontal
|
2024-12-15 14:42:18 +01: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
|
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 |
|
Luca Conte
|
ffa04a50cb
|
set IP to 0.0.0.0 in server mode
|
2024-12-10 14:07:56 +01:00 |
|
Luca Conte
|
21563dd469
|
remove unused imports
|
2024-12-10 14:07:45 +01:00 |
|
Luca Conte
|
7f5e031574
|
find correct constructor
|
2024-12-10 14:07:39 +01:00 |
|
Luca Conte
|
44f2b0f0f1
|
move socket connection into thread within AsyncSocket
|
2024-12-10 14:07:16 +01:00 |
|
Joshua
|
3b6ffeb82d
|
JoinGame and related functions should now work properly
|
2024-12-10 13:48:55 +01:00 |
|
Luca Conte
|
9ab97b5f0c
|
Merge branch 'lucasjoshua' into start-game
|
2024-12-10 12:51:11 +01:00 |
|
Joshua
|
f151a89ea4
|
Added function to JoinGame.
|
2024-12-10 12:50:26 +01:00 |
|
Luca Conte
|
c55a62663e
|
pass main frame to game controller
|
2024-12-10 12:50:19 +01:00 |
|
Luca Conte
|
b958ffd6b9
|
initialise board arrays correctly
|
2024-12-10 12:44:34 +01:00 |
|
Luca Conte
|
6a57a6e1ff
|
remove unused import
|
2024-12-10 12:44:01 +01:00 |
|
Luca Conte
|
9ff0958fbc
|
start game in frontend
|
2024-12-10 12:39:41 +01:00 |
|
Joshua
|
7a9b70c271
|
Started making changes to JoinGame etc.
|
2024-12-10 12:36:34 +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
|
15ff3034d3
|
Added Comments to MainFrame,
Fixed functionality of left/right buttons after adding more difficulties in startLocalGame and startMultiplayerGame
|
2024-12-04 11:51:00 +01:00 |
|
Joshua
|
7ee0f9c097
|
Added AI difficulties, and updated methods to cycle between them correctly
|
2024-12-03 16:42:37 +01:00 |
|
Joshua
|
48bc601a0d
|
Added BoardDisplay, startet connecting FrontEnd/BackAnd.
Added new graphics.
Added startLocalGameLoadingScreen
|
2024-12-03 15:33:15 +01:00 |
|
Luca Conte
|
d9baeec957
|
make all methods static, add player name to start game method params
|
2024-12-03 13:47:36 +01:00 |
|
Luca Conte
|
f166200499
|
add static main frame
|
2024-12-03 13:47:13 +01:00 |
 ole
|
0ce9e012dd
|
Merge remote-tracking branch 'origin/lucasjoshua' into ole
# Conflicts:
# src/startMultiplayerGame.java
|
2024-12-03 12:28:26 +01:00 |
|
Joshua
|
772f2d45c6
|
Added Backbutton function to GameBoard
|
2024-12-03 12:23:46 +01:00 |
|
ole
|
2160b5d410
|
add shoot to OnlinePlayer_1_1_0.java
|
2024-12-03 12:20:40 +01:00 |
Ole Wachtel
|
43545afb45
|
add coin flip and turn logic
|
2024-12-03 12:11:06 +01:00 |
|
Kaver
|
3b9b1eaebb
|
Klasse fuer verbinden Panel erstellt(extrem grobes Beispiel) und Panel Weiterleitung eingefuegt
Anpassungen an ActionListenern in MainMenuView
Backbutton mit Funktion eingefuegt fuer joinGame Panel
|
2024-12-02 19:04:34 +01:00 |
|
Luca Conte
|
addf542300
|
strip string before passing to handler
|
2024-11-30 18:43:04 +01:00 |
|
Luca Conte
|
1fb284eb1a
|
add IAM Package
|
2024-11-30 18:40:04 +01:00 |
|
Luca Conte
|
bdde2066f3
|
add getter and setter for name
|
2024-11-30 18:39:58 +01:00 |
|
Luca Conte
|
ab1aae7798
|
add method to convert semester to board size
|
2024-11-30 18:39:41 +01:00 |
|
Luca Conte
|
cecc44abf4
|
fix: remove board size from constructor
|
2024-11-30 18:28:05 +01:00 |
|
Luca Conte
|
998ff3d663
|
Merge branch 'networking' into networking-start-online-game
|
2024-11-30 18:16:27 +01:00 |
|
Luca Conte
|
2c6f9adf54
|
move board size out of player constructor
|
2024-11-30 18:15:07 +01:00 |
|
Luca Conte
|
3eeb4d25bd
|
start online game
|
2024-11-30 17:58:24 +01:00 |
|
ole
|
6a4e157605
|
add: Network implementation
|
2024-11-30 17:09:44 +01:00 |
|
ole
|
22950cd155
|
add: Thread protection Player.java
|
2024-11-30 17:07:11 +01:00 |
|
ole
|
058d069ff2
|
change: all Points from java.awt.point too new Point.java
|
2024-11-30 17:06:25 +01:00 |
|
ole
|
c2ca83c718
|
chore: remove all unjust imports
|
2024-11-30 17:04:29 +01:00 |
|
ole
|
5a48e7e0a9
|
Merge branch 'networking' into ole
|
2024-11-30 14:17:54 +01:00 |
|
Luca Conte
|
8bc64bd9ba
|
move joined logic out of if statement
|
2024-11-30 14:14:29 +01:00 |
|
Luca Conte
|
ff9ffbd628
|
sleep first in loop to avoid skipping sleep with continue
|
2024-11-30 14:13:15 +01:00 |
|
Luca Conte
|
7303f49d0d
|
avoid nulls
|
2024-11-30 14:13:01 +01:00 |
|
ole
|
48a5958414
|
add Thread safety for Player
|
2024-11-30 13:48:50 +01:00 |
|
Luca Conte
|
c92b3b3551
|
networking basis
|
2024-11-30 13:45:06 +01:00 |
|
Luca Conte
|
b2a26c1f81
|
fix compiler errors
|
2024-11-27 13:00:18 +01:00 |
|
Luca Conte
|
73add1442b
|
fix class names
|
2024-11-27 13:00:05 +01:00 |
|
Luca Conte
|
11c7dda19b
|
fix deprecated function calls
|
2024-11-27 12:59:55 +01:00 |
|
Joshua
|
2274a1e558
|
Created GameBoard.
Added showPanel methods to pass parameters between methods.
|
2024-11-26 17:15:21 +01:00 |
 FlorianAlexy
|
c8b3f4f2db
|
Schiffe setzen Validierung hinzugefuegt
Florian und Florian haben eine schoene Validierung zum setzen der Position eines Schiffes hinzugefuegt.
|
2024-11-26 16:43:25 +01:00 |
|
Kaver
|
88d016ed99
|
Umstrukturierung von MainFrame, sodass beim druecken eines Buttons parameter an die Funktion uebergeben werden welche das naechste Panel stellt (showPanelExtra)
|
2024-11-26 16:43:14 +01:00 |
|
Kaver
|
5cabd5325a
|
Umstrukturierung von MainFrame, sodass beim druecken eines Buttons parameter an die Funktion uebergeben werden welche das naechste Panel stellt (showPanelExtra)
|
2024-11-26 16:42:00 +01:00 |
|
ole
|
d00e12e72f
|
Merge remote-tracking branch 'origin/lucasjoshua' into ole
# Conflicts:
# src/HalloSchiffeVersenken.java
|
2024-11-26 14:56:19 +01:00 |
|
Joshua
|
1fc1abee3a
|
Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua
|
2024-11-26 14:14:43 +01:00 |
|
Joshua
|
3d557361ee
|
Implemented coinToss(still incomplete)
|
2024-11-26 14:13:14 +01:00 |
eyFlorian
|
aaa9d57f68
|
Easy/MediumAI
Haben eine sehr einfache und Medium KI hinzugefügt. F&F
Fragenaufwerfende Methoden:
https://cdn.discordapp.com/attachments/1296860613212897413/1310209916325068894/WhatsApp_Bild_2024-11-24_um_12.31.02_fb836c3d.jpg?ex=67446392&is=67431212&hm=82f37b83dc5e711622abb43abe51edd62833450dddf91ed524991da6d0981f38&
|
2024-11-24 12:47:45 +01:00 |
|
Kaver
|
ea6a1c9804
|
grobe Weiterleitung fuer startMultiplayerGame an Spiel beitreten/Spiel erstellen eingefügt
|
2024-11-19 18:33:05 +01:00 |
|
Joshua
|
737e485773
|
Implemented coinToss(still incomplete)
|
2024-11-19 17:37:16 +01:00 |
|
Joshua
|
6ef3b38dd5
|
Implemented CardLayout into startMultiplayerGame, startLocalGame, MainMenuView. Implemented MainFrame.
|
2024-11-19 17:08:59 +01:00 |
|
Joshua
|
8069315c15
|
Implemented CardLayout into startMultiplayerGame, startLocalGame, MainMenuView. Implemented MainFrame.
|
2024-11-19 16:25:52 +01:00 |
|
Kaver
|
a84110a8a8
|
Panellogik neu gemacht und dementsprechend views angepasst
|
2024-11-19 15:41:45 +01:00 |
|
Joshua
|
607004a3b3
|
Added test classes for CardLayout and GameBoard.java
|
2024-11-19 14:24:09 +01:00 |
Kaver
|
d95df0cf5f
|
Minimale Anpassung an Actionlistener fuer MainMenu zu LocalGame
|
2024-11-19 13:39:43 +01:00 |
|
Kaver
|
5bedfddc60
|
Erste Anpassungen an Multiplayermenu (sehr grob)
diverse alte ungenutzte Methoden entfernt
|
2024-11-18 18:20:48 +01:00 |
|
Joshua
|
f7326a57d9
|
Added coinToss.java, first attempts integrating cardlayout in startLocalGame.java and startMultiplayerGame.java
|
2024-11-16 15:26:52 +01:00 |
|
Kaver
|
a11885c76d
|
Transission von Main zu MultiMenu angepasst
Panels eingeführt anstatt neue Frames zu öffnen
MainmenuController angepasst
|
2024-11-15 18:34:05 +01:00 |
|
Joshua
|
fe942ab660
|
Continued work on startLocalGame and started work startMultiplayerGame
|
2024-11-15 18:18:28 +01:00 |
|
Joshua
|
15d5a67c38
|
Continued work on startLocalGame and started work startMultiplayerGame
|
2024-11-15 18:18:21 +01:00 |
