 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 |
|
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 |
|
Luca Conte
|
6118d480d9
|
Merge pull request 'lucasjoshua' (#12) from lucasjoshua into main
Reviewed-on: #12
|
2024-12-10 11:38:36 +00: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
|
f20896566c
|
Merge pull request 'game-controller-adjustments' (#11) from game-controller-adjustments into main
Reviewed-on: #11
|
2024-12-03 12:48:14 +00: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 |
|
Luca Conte
|
2c84e02261
|
Merge pull request 'Network and Frontend' (#10) from ole into main
Reviewed-on: #10
Reviewed-by: lgc <main@lugico.de>
|
2024-12-03 12:13:27 +00:00 |
 ole
|
175bb20345
|
change idea settings
|
2024-12-03 13:11:06 +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 |