Commit Graph

  • 61e1035bb1 Merge commit '353c68c35867e57d918907c9d8d86edbeb0890e1' into HEAD Jenkins 2022-02-15 15:18:48 +0100
  • af28ea8e34 Improved random ship positioning fleetstorm Lorenz Hohmann 2022-02-03 08:32:14 +0100
  • a32541b39f Implemented finished random ship positionig method into gui Lorenz Hohmann 2022-02-03 08:30:43 +0100
  • f753e07ac1 Refactoring MatchfieldShipTest class Lorenz Hohmann 2022-02-02 17:01:06 +0100
  • 3ff4b665f6 Implemented method to random position ships on matchfield Lorenz Hohmann 2022-02-02 16:53:42 +0100
  • a05c6c09b9 Added Test case when one coordinate is hit, but others on free field (isFreePosition() method) Lorenz Hohmann 2022-02-02 16:34:42 +0100
  • 8915964ed0 Added Test case when no ship is within the coordinates (isFree() method) Lorenz Hohmann 2022-02-02 16:27:26 +0100
  • 0419b89aaa Refactoring: MatchfieldShipTest class Lorenz Hohmann 2022-02-02 16:24:16 +0100
  • 7830143d4b Added isFreePosition() with first test case when position is filled Lorenz Hohmann 2022-02-02 16:14:26 +0100
  • 353c68c358 Fixed JUnit Imports (Maven didn't compile correctly) Lorenz Hohmann 2022-01-18 18:07:55 +0100
  • d5d6af193e Beautified GUI Won Screen Lorenz Hohmann 2022-01-17 15:38:43 +0100
  • bed8f71879 Implemented gameOver() function in GUI with test case Lorenz Hohmann 2022-01-17 15:32:58 +0100
  • 8e92a1caee Added third test for areAllShipsHit() when a ship is not fully hit Lorenz Hohmann 2022-01-17 15:14:18 +0100
  • aae87e50e1 Refactoring MatchfieldShipTest class: added description for tests and outsourced multiple tests into more functions Lorenz Hohmann 2022-01-17 15:11:38 +0100
  • 27e7a96ba7 Added second test case for areAllShipsHit() - all ships hit test Lorenz Hohmann 2022-01-17 15:02:25 +0100
  • abeaff8d7b Implemented areAllShipsHit() with first test case if no ship was hit Lorenz Hohmann 2022-01-17 14:59:00 +0100
  • 805c233108 Fixed GameLogicTest with new test parameter in start() function Lorenz Hohmann 2022-01-17 14:37:39 +0100
  • 5d039543b7 GUI Refactoring Lorenz Hohmann 2022-01-17 14:20:27 +0100
  • 629063b5ff Fixed that AI has next move when ship was hit Lorenz Hohmann 2022-01-17 14:11:57 +0100
  • dd2ddc5811 Fixed chooseField returns null Lorenz Hohmann 2022-01-17 13:59:56 +0100
  • 53bc0d9064 chooseField still works after returning null Max Wenzel 2022-01-17 13:47:48 +0100
  • b11262ba56 Changed whole GUI layout to two matchfields Lorenz Hohmann 2022-01-17 13:55:48 +0100
  • d472759a1c Implemented logic after ai made move and player made move Lorenz Hohmann 2022-01-15 15:34:18 +0100
  • 79f90946a5 Refactored LogicTest: No longer useful with general game loop Lorenz Hohmann 2022-01-15 15:19:21 +0100
  • a42df0aac2 Added shoot() function to panel click for general game loop Lorenz Hohmann 2022-01-15 15:08:11 +0100
  • cc34afa847 Added test case when field was already hitted Lorenz Hohmann 2022-01-15 14:48:13 +0100
  • 4d69cc3e76 Added test case when field was already shot (expect false) Lorenz Hohmann 2022-01-15 14:46:46 +0100
  • 8c49de9767 New test case for shoot(): Check if field was already shot Lorenz Hohmann 2022-01-15 14:44:51 +0100
  • dd87d19b18 Added second test case to shoot(): Call on Coordinate without ship Lorenz Hohmann 2022-01-15 14:40:38 +0100
  • fadf708556 Added shoot() function to Coordinate class with first test case Lorenz Hohmann 2022-01-15 14:38:25 +0100
  • fff174937b Refactoring: getCoordinateFromLabel() Lorenz Hohmann 2022-01-15 14:28:20 +0100
  • 94ff308379 Implemented first move 'animation' for GUI Lorenz Hohmann 2022-01-15 14:18:50 +0100
  • 7038a4c607 Added default ship positioning to GUI Lorenz Hohmann 2022-01-15 14:08:23 +0100
  • 86e79f0a49 Implemented test if ship is already on position in shipSet Lorenz Hohmann 2022-01-15 13:39:41 +0100
  • 65ad351305 Added second test case for invalid coordinates on setShip (5x1, direction 1) Lorenz Hohmann 2022-01-15 13:38:51 +0100
  • 246ecfa6bd Added test case for invalid coordinates on setShip (2x1, direction 0) Lorenz Hohmann 2022-01-15 13:37:03 +0100
  • 4426627a5b Added third test case for setShip() (4x1, direction 1) Lorenz Hohmann 2022-01-15 13:35:12 +0100
  • d47d765c92 Added second test case for setShip() (3x1, direction 0) Lorenz Hohmann 2022-01-15 13:34:18 +0100
  • 6de05cb134 Implemented setShip() in Matchfield with first test case for 2x1 ship in direction 0 Lorenz Hohmann 2022-01-15 13:32:51 +0100
  • 871f5fb860 United AI with GameLogic Lorenz Hohmann 2022-01-15 12:35:21 +0100
  • c1cbf6a077 United GameManager with GUI class (Refactoring) Lorenz Hohmann 2022-01-14 12:13:29 +0100
  • f36500d195 Added mouse listener to register click on matchfield Lorenz Hohmann 2022-01-14 12:05:01 +0100
  • 46d51b2b8b Refactored GUI and generated Getters Lorenz Hohmann 2022-01-14 11:55:05 +0100
  • b937245b63 Added game info sidebar Lorenz Hohmann 2022-01-14 11:43:58 +0100
  • 936a563422 Created gui with minimal elements Lorenz Hohmann 2022-01-12 13:18:57 +0100
  • 3211601bd5 Added nextMove() function to check wheter the player or AI has move Lorenz Hohmann 2022-01-12 11:55:09 +0100
  • 557984b581 Added GameManager and check if GameState is correct after start function call Lorenz Hohmann 2022-01-12 11:41:14 +0100
  • 79a7556286 if ShipIsOnYAxis, ai doesent check XAxis Max Wenzel 2022-01-15 12:12:16 +0100
  • 3c1e3d19e5 Refactoring: chooseField doesent need Params now Max Wenzel 2022-01-14 17:29:16 +0100
  • 2022df6682 restrucered logic-Class Max Wenzel 2022-01-14 17:05:19 +0100
  • 4a02c0b7cc chooseField returns correekt Field case:Left has Ship Max Wenzel 2022-01-14 16:55:28 +0100
  • d983b43642 chooseField returns correekt Field case:Right has Ship Max Wenzel 2022-01-14 16:53:13 +0100
  • f7c0a6da9c small Refactoring: chooseFieldBelowAfterHit Max Wenzel 2022-01-14 16:50:25 +0100
  • 1fd251655c Fix: chooseField makes way more sense now Max Wenzel 2022-01-14 16:43:21 +0100
  • fbdade30e3 chooseField returns correekt Field case:Down has Ship Max Wenzel 2022-01-14 16:26:37 +0100
  • d5bd72a53c Refactoring: testChooseFieldAboveAfterHit Max Wenzel 2022-01-14 16:24:48 +0100
  • af264751e5 chooseField returns correekt Field cae:Up has Ship Max Wenzel 2022-01-14 14:56:55 +0100
  • ac9183ea27 overload getState() in Matchfield Max Wenzel 2022-01-14 14:18:53 +0100
  • 3364446cd6 add sinkShip Max Wenzel 2022-01-14 13:49:40 +0100
  • 8a169d52de add Setter for ClearedLeft Max Wenzel 2022-01-14 13:45:06 +0100
  • 908beb15c8 add Setter for ClearedRight Max Wenzel 2022-01-14 13:43:48 +0100
  • 6aa384e173 add Setter for ClearedBelow Max Wenzel 2022-01-14 13:41:49 +0100
  • 3ddb76e0ab add Setter for ClearedAbove Max Wenzel 2022-01-14 13:40:49 +0100
  • ed7474228a Refactoring: add Constructor to set DefaultValues Max Wenzel 2022-01-14 13:28:10 +0100
  • 7db470de84 Refactoring: Coordinate target is private now Max Wenzel 2022-01-14 12:53:07 +0100
  • cdf4b5b14d Refactoring: cleared-booleans are private now (add getters for Test) Max Wenzel 2022-01-14 12:09:47 +0100
  • 6b53586a1b add clearleft Max Wenzel 2022-01-14 12:04:37 +0100
  • ba410306ac add clearRight Max Wenzel 2022-01-14 11:57:30 +0100
  • 0387c76c97 add clearBelow Max Wenzel 2022-01-14 11:54:05 +0100
  • 794f4bbb51 add clearAbove Max Wenzel 2022-01-14 11:43:18 +0100
  • e064873635 Refactoring: boolean foundShip is private now Max Wenzel 2022-01-14 10:31:14 +0100
  • 61cd9ad08a add findShip() Max Wenzel 2022-01-13 15:14:37 +0100
  • bf1f6b2ac3 Refactoring: getEverySecondField() doesn't need param matchfield anymore Max Wenzel 2022-01-13 14:56:55 +0100
  • 2ace6f42a9 Refactoring: chooseField() doesn't need param matchfield anymore Max Wenzel 2022-01-13 13:54:27 +0100
  • ba00efe5e2 Refactoring: setLastShot() doesn't need param matchfield anymore Max Wenzel 2022-01-13 13:34:41 +0100
  • bc2e79b7a3 add Matchfield variable with Getter/Setter in ai-logic Max Wenzel 2022-01-13 13:30:35 +0100
  • 6a00b0bad3 add lastShot with Getter/Setter in ai-logic Max Wenzel 2022-01-13 13:19:17 +0100
  • 25d399e1a6 Refactoring testEverySecondField (override Equals of Coordinate) Max Wenzel 2022-01-13 12:16:32 +0100
  • f3beee8e45 add getEverySecondField in ai-logic Max Wenzel 2022-01-12 19:04:11 +0100
  • d847e33ef5 Refact6oring: ai-logicTest restructured Max Wenzel 2022-01-12 17:00:53 +0100
  • 66e3394f09 add getBelow() in Matchfield - case: nothingBelow Max Wenzel 2022-01-12 16:48:10 +0100
  • 7a43204fdd add getBelow() in Matchfield - DefaultCase Max Wenzel 2022-01-12 16:44:38 +0100
  • 7c67747398 add getAbove() in Matchfield - Case: nothingAbove Max Wenzel 2022-01-12 16:37:13 +0100
  • 304b3c943e add getAbove() in Matchfield - DefaultCase Max Wenzel 2022-01-12 16:30:32 +0100
  • 2603cb9f83 Fix: Above = Right and Below = Left Max Wenzel 2022-01-12 15:55:59 +0100
  • bdb4c30cdb add getAbove() in Matchfield - Case: nothingBelow Max Wenzel 2022-01-12 15:41:52 +0100
  • ac41493feb add getBelow() in Matchfield - DefaultCase Max Wenzel 2022-01-12 15:34:51 +0100
  • d703a7b1c6 add getAbove() in Matchfield - Case: nothingAbove Max Wenzel 2022-01-12 15:24:59 +0100
  • 958fcf7166 add getAbove() in Matchfield - DefaultCase Max Wenzel 2022-01-12 15:21:24 +0100
  • 0106ea2577 Refactoring: Use ParameterizedTest in CoordinateTest Max Wenzel 2022-01-12 14:41:15 +0100
  • 78e804dff9 Refactoring: Implements Coordinate into ai-logic Max Wenzel 2022-01-12 14:07:01 +0100
  • f8a8179650 Refactoring: Implements Coordinate into Matchfield Max Wenzel 2022-01-12 14:02:20 +0100
  • 10c4518ed0 add setState Max Wenzel 2022-01-12 13:40:34 +0100
  • 295ecd2bb1 add DeafaultState(EMPTY) to Coordinate Max Wenzel 2022-01-12 13:16:55 +0100
  • b696244000 Coodrdinates returns correct Values for X and Y Max Wenzel 2022-01-12 13:13:32 +0100
  • 1a2bd51394 choosenField returns only Fields with state != shot Max Wenzel 2022-01-12 11:14:41 +0100
  • 04d9a5d774 Merge branch 'matchfield' into fleetstorm2 Lorenz Hohmann 2022-02-15 15:09:43 +0100
  • 0559513f69 player_management: login loads existing player from file or creates new player player_management Tobias Krause 2022-01-15 20:07:09 +0100
  • 6e61c04240 player_management: added layout for LoginPanel Tobias Krause 2022-01-15 19:51:24 +0100
  • 75ca5e7f47 player_management: added LoginPanel to gameexplorer Tobias Krause 2022-01-15 19:43:04 +0100