Commit Graph

74 Commits (9ad0fd5b4ef0cd76a23f007bf38c023cf2476332)

Author SHA1 Message Date
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
Cemal Odabasioglu 219cab7311 added rules 2022-05-26 22:56:52 +02:00
Cemal Odabasioglu d207ebff19 added animation when switching scenes 2022-05-21 14:21:32 +02:00
Mathis 61280da595 UPDATE method removeTile in Rack, attributes in GameBoard 2022-05-20 23:31:45 +02:00
Mathis 0124b6b3b0 ADD method removeTile and updateRack in Rack | ADD Player | UPDATE
LaticeApplicationConsole
2022-05-19 20:45:30 +02:00
Cemal Odabasioglu 6ca85066db added background and few design adjustments 2022-05-19 15:41:17 +02:00
Cemal Odabasioglu 2e34cb91b4 working main screen 2022-05-18 10:24:18 +02:00
Mathis cf6049a4fe UPDATE LaticeApplicationConsole 2022-05-17 10:09:48 +02:00
Mathis bea07979aa UPDATE Color, Rack, Shape 2022-05-17 10:09:24 +02:00
Cemal Odabasioglu b568c967c6 WIP added FXML main screen 2022-05-17 10:08:42 +02:00
Mathis bc278df804 ADD Position | ADD attribute 'position' to Tile 2022-05-17 09:17:09 +02:00
Mathis a1f81b0d15 ADD Player and Score 2022-05-17 09:14:16 +02:00
Mathis b5e8814000 Step2 : ADD GameBoard 2022-05-17 09:13:03 +02:00
Mathis 963dbaccdb ADD Rules 2022-05-17 09:09:48 +02:00
Cemal Odabasioglu 677c3aed6d bugFix and working version with drag&drop and 2 dimension array 2022-05-10 18:53:45 +02:00
Cemal Odabasioglu 02370ee10a improvments to drag n drop in progess 2022-05-04 11:26:09 +02:00
Cemal Odabasioglu 172663cb13 Adjusts to rack and plateau 2022-05-04 09:51:50 +02:00
Mathis b8bf1ab8a8 bugfix in Rack and LaticeApplicationWindow 2022-05-03 17:18:03 +02:00
Odabasioglu Cemal 122756df94 Merge branch 'Image_in_Rack' into 'master'
NAME CORRECTION "feather" -> "FEATHER" and UPDATE

See merge request odabasioglu1/latice!3
2022-05-03 14:52:15 +00:00
Odabasioglu Cemal 7ac6bc4763 Merge branch 'master' into 'Image_in_Rack'
# Conflicts:
#   src/main/java/latice/application/LaticeApplicationWindow.java
2022-05-03 14:50:55 +00:00
Mathis 4c1ebc4f6b UPDATE Rack with images 2022-05-03 16:47:54 +02:00
Mathis ed18f8f5c9 NAME CORRECTION "feather" -> "FEATHER" and UPDATE
LaticeApplicationConsole, LaticeApplicationWindow
2022-05-03 16:38:26 +02:00
Mathis b72112ad8d UPDATE Shape with a new attribute 2022-05-03 16:31:17 +02:00
Mathis d1d1a17e4b ADD image of turtle 2022-05-03 16:28:18 +02:00
Mathis 535c2d2515 UPDATE Color with improvements 2022-05-03 16:23:10 +02:00