 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 |
|
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
|
b1273e759d
|
Merge remote-tracking branch 'origin/ole' into ole
# Conflicts:
# src/OnlinePlayer.java
|
2024-11-30 17:15:51 +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 |
|
Ole Wachtel
|
a381c8d660
|
add OnlinePlayer Konstructer
|
2024-11-30 13:25:42 +01:00 |
|
Luca Conte
|
d425e64fa0
|
Merge pull request 'hotfixes - so we can at least run it' (#9) from hotfixes into main
Reviewed-on: #9
|
2024-11-27 12:01:15 +00: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 |
 alexy
|
f3d56b37c7
|
Merge pull request 'Schiffe setzen Validierung hinzugefuegt' (#8) from oleFundF into main
Reviewed-on: #8
Reviewed-by: flo <florian.hantzschel@stud.hs-hannover.de>
|
2024-11-26 16:00:08 +00: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 |