Commit Graph

98 Commits (ccb61b5ef8594d75123eb955d1c38d8d91d66b53)

Author SHA1 Message Date
Mathis ccb61b5ef8 UPDATE "change Rack (2 points)" -> "change Rack" 2022-06-07 15:33:55 +02:00
Mathis e81a73d554 UPDATE display of the gameboard 2022-06-07 14:56:26 +02:00
Cemal Odabasioglu f832d54911 added tests and few bugfixes 2022-06-07 14:35:48 +02:00
Cemal Odabasioglu 38c6ea073b added free change rack in free round 2022-06-07 11:05:31 +02:00
Mathis 6f3179ee91 little UPDATE LaticeApplicationWindow, buttons "Confirm" -> "End Turn"
and "Change Rack (2 points)" -> "Change Rack (3 points)"
2022-06-06 23:57:18 +02:00
Mathis 2ae745c638 cleaned the source code 2 2022-06-06 23:55:02 +02:00
Cemal Odabasioglu 8aa26ca8de added forgotten class 2022-06-06 22:48:02 +02:00
Cemal Odabasioglu 14a0045859 Cleaned the source code 2022-06-06 22:47:39 +02:00
Odabasioglu Cemal 2a73cfb775 Merge branch 'bugfix_players_when_replay' into 'master'
UPDATE Player, LaticeApplicationWindow and LaticeApplicationConsole

See merge request odabasioglu1/latice!11
2022-06-06 13:31:07 +00:00
Odabasioglu Cemal 5789fab5fe Merge branch 'master' into 'bugfix_players_when_replay'
# Conflicts:
#   src/main/java/latice/application/LaticeApplicationWindow.java
2022-06-06 13:31:02 +00:00
Mathis 5d3ff112eb UPDATE Player, LaticeApplicationWindow and LaticeApplicationConsole 2022-06-06 15:09:01 +02:00
Cemal Odabasioglu 5c36959b5a add laticeApp forgotten 2022-06-05 23:46:35 +02:00
Cemal Odabasioglu 89e1461810 added replay function and clean code 2022-06-05 23:46:06 +02:00
Mathis 83abebacdc bugfix method neighborRule in Rack 2022-06-05 19:56:45 +02:00
Mathis b7da0b39d7 ADD modifying display of the tiles remaining for each player | ADD sun
rule in game when a tile is placed on a sun
2022-06-05 19:30:33 +02:00
Cemal Odabasioglu 6432393147 updated gamefinished screen and added points condition to change rack 2022-06-05 13:46:10 +02:00
Mathis 30623929e0 bugfix method updateRack in Rack 2022-06-04 18:54:52 +02:00
Cemal Odabasioglu abc6668bff few changes to finished screen 2022-06-04 18:46:24 +02:00
Cemal Odabasioglu a8e96c3306 added finished game screen and adjustments to player name input 2022-06-04 16:41:01 +02:00
Cemal Odabasioglu 9310eb6bc7 Merge branch 'master' of http://git.unilim.fr/odabasioglu1/latice.git 2022-06-04 12:58:46 +02:00
Cemal Odabasioglu 66310f911f null commit 2022-06-04 12:58:29 +02:00
Mathis 89be17697c Implementation of the playing tile after the first tile laid 2022-06-04 12:10:16 +02:00
Mathis 2927f59f8a ADD method checkPostionRule in Rules | implementation of
checkPositionRule in LaticeApplicationWindow to avoid putting a tile on
a tile
2022-06-03 22:59:40 +02:00
Mathis acd757b978 bugfix method updateRack into class Rack 2022-06-03 22:59:16 +02:00
Mathis 9ad0fd5b4e ADD display of score to increase it | UPDATE PlayerFX,
LaticeApplicationWindow
2022-06-03 21:51:53 +02:00
Mathis 2658755153 CORRECTION : display rack and information of the players | UPDATE
LaticeApplicationWindow
2022-06-03 21:12:04 +02:00
Mathis afe085a20e UPDATE Constant, PlayerFX, Rack, Rules 2022-06-03 21:10:30 +02:00
Mathis 933340b2ef UPDATE Constant LaticeApplicationConsole LaticeAplicationWindow
MainScreenController | ADD attribute to GameBoard, method
getNumberOfTilesRemaining to Tile
2022-06-02 21:50:34 +02:00
Odabasioglu Cemal 596a675aaf Merge branch 'buyAction' into 'master'
Buy action

See merge request odabasioglu1/latice!10
2022-06-02 06:34:31 +00:00
Odabasioglu Cemal e8ca530fab Merge branch 'master' into 'buyAction'
# Conflicts:
#   src/main/java/latice/application/LaticeApplicationWindow.java
#   src/main/java/latice/model/Constant.java
2022-06-02 06:34:18 +00:00
Mathis 3bdcdeb237 ADD PlayerFX | UPDATE LaticeApplicationWindow MainScreenController
PlayerNameInputController
2022-06-02 08:32:41 +02:00
Cemal Odabasioglu fbf11f2d1c img add 2022-06-01 23:27:38 +02:00
Cemal Odabasioglu a93ab4954d Added buy action button but not yet implemented in jFX 2022-06-01 23:27:23 +02:00
Mathis de4460e92c bugfix LaticeApplicationWindow | ADD Constant 2022-06-01 20:27:51 +02:00
Odabasioglu Cemal 76a6581326 Merge branch 'Display_name_player_in_window' into 'master'
reorganisation of all packages | ADD Playgame, RectangleFX |

See merge request odabasioglu1/latice!9
2022-06-01 17:01:11 +00:00
Odabasioglu Cemal ece584542c Merge branch 'master' into 'Display_name_player_in_window'
# Conflicts:
#   src/main/java/latice/application/LaticeApplicationWindow.java
2022-06-01 17:00:57 +00:00
Odabasioglu Cemal 9a8bf149cb Merge branch 'test_cases' into 'master'
Test cases

See merge request odabasioglu1/latice!8
2022-06-01 16:57:36 +00:00
Mathis 7fe5d99364 reorganisation of all packages | ADD Playgame, RectangleFX |
MODIFICATION in LaticeApplicationWindow PlayerNameInputController and
MainScreenController
2022-06-01 18:57:13 +02:00
Cemal Odabasioglu a7bf2cfa4e added test cases 2022-06-01 18:51:10 +02:00
Cemal Odabasioglu 149f49f7f8 Step 7 : change Rack implemented and working sucessfully 2022-06-01 14:50:01 +02:00
Odabasioglu Cemal ee4f4451a2 Merge branch 'Latice_Console_2.0' into 'master'
ADD method checkScoreToPlay to Rules | UPDATE LaticeApplicationConsole

See merge request odabasioglu1/latice!7
2022-05-31 13:13:14 +00:00
Cemal Odabasioglu 625db82e12 adding image finished game 2022-05-31 15:12:27 +02:00
Cemal Odabasioglu a95f04440e adjustments 2022-05-31 15:12:10 +02:00
Mathis 9dba3ed659 ADD method checkScoreToPlay to Rules | UPDATE LaticeApplicationConsole 2022-05-31 15:06:48 +02:00
Odabasioglu Cemal 73366ec789 Merge branch 'Latice_Console_2.0' into 'master'
merging latice console and master

See merge request odabasioglu1/latice!6
2022-05-30 17:41:21 +00:00
Odabasioglu Cemal a5c0bd9b5d Merge branch 'Test_Branch' into 'Latice_Console_2.0'
added player name input window + working latice console

See merge request odabasioglu1/latice!5
2022-05-30 17:40:36 +00:00
Cemal Odabasioglu b2502ae030 added player name input window 2022-05-30 19:39:23 +02:00
Mathis 8e2e2a09d3 ADD new rules | ADD method changeRack | Change 'Fl' -> 'f' for class
Shape | ADD getPositionRow, getPositionColumn in Tile | CREATE Constant
'BLUE' in GameBoard
2022-05-30 19:35:34 +02:00
Cemal Odabasioglu 8060aa88e8 working after merge 2022-05-26 23:26:05 +02:00
Odabasioglu Cemal 4c1292bacf Merge branch 'Create_game_rules' into 'master'
merging game_rules onto master

See merge request odabasioglu1/latice!4
2022-05-26 20:58:57 +00:00