 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 |