start game stuff - both online and offline #13

Merged

lgc merged 24 commits from start-game into main 2024-12-13 16:27:43 +00:00

Conversation 0 Commits 24 Files Changed 16 +702 -265

lgc commented 2024-12-10 13:09:14 +00:00

Owner

Copy Link

poggers

poggers

lgc added 11 commits 2024-12-10 13:09:15 +00:00

9ff0958fbc start game in frontend

6a57a6e1ff remove unused import

b958ffd6b9 initialise board arrays correctly

c55a62663e pass main frame to game controller

f151a89ea4 Added function to JoinGame.

9ab97b5f0c Merge branch 'lucasjoshua' into start-game

44f2b0f0f1 move socket connection into thread within AsyncSocket

7f5e031574 find correct constructor

21563dd469 remove unused imports

ffa04a50cb set IP to 0.0.0.0 in server mode

5cf8befdc1 add todo

lgc added 1 commit 2024-12-13 15:58:43 +00:00

60e6ed1277 kill the zombies

lgc added 1 commit 2024-12-13 15:59:08 +00:00

fd82e64814 remove connection timeout

lgc added 11 commits 2024-12-13 16:26:23 +00:00

3b6ffeb82d JoinGame and related functions should now work properly

8a9e7fb4b2 Implementierung von Schiffe platzieren gestartet(BoardDisplay), ...

Anpassungen an Buttons im GameBoard sowie diverse getter hinzugefeugt(backend)

663991e418 Merge remote-tracking branch 'origin/start-game' into lucasjoshua ...

# Conflicts:
#	src/JoinGame.java

bb61a68f24 Player names will now be passed correctly between classes. Added lots of comments in startLocalGame, startLocalGameLoadingScreen, startMultiplayerGame and JoinGame.

6f9f5c5063 Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua

adac40156a Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua

84865e5468 Added comments (Javadoc etc.) to most GUI classes und deleted old code and comments etc. (in general cleanup)

f397803b64 Kleine Anpassung von BoardDisplay

00df38dd7a Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua ...

# Conflicts:
#	src/BoardDisplay.java

5ba5919775 Merge branch 'lucasjoshua' into start-game

dfbe4b3c53 fix online game start

lgc merged commit fd5a97cd6e into main 2024-12-13 16:27:43 +00:00

lgc referenced this issue from a commit 2024-12-13 16:27:44 +00:00

Merge pull request 'start game stuff - both online and offline' (#13) from start-game into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: HSH/programmieren-projekt#13

No description provided.