Cemal
/
Latice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99 Commits
1 Branch
0 Tags
4.9 MiB
Commit Graph

99 Commits (f520c3aee65340b3af86a57580d0450867136837)

Author SHA1 Message Date
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
Mathis ef7cd30347 ADD all images of tiles 2022-05-03 16:20:48 +02:00
Odabasioglu Cemal d3f5e83472 Merge branch 'JavaFX_Implementation' into 'master' 
Java fx implementation

See merge request odabasioglu1/latice!2
 2022-05-03 14:19:19 +00:00
Odabasioglu Cemal 57014ecfc7 Merge branch 'master' into 'JavaFX_Implementation' 
# Conflicts:
#   src/main/java/latice/model/Rack.java
 2022-05-03 14:13:35 +00:00
Cemal Odabasioglu 6780348413 Added improvments to drag&drop(only for one tile) 2022-04-28 17:01:47 +02:00
Cemal Odabasioglu a959e044d6 WIP adding rectangles for drag n drop 2022-04-26 15:12:14 +02:00
Cemal Odabasioglu b056b09aac Added Rack view in JavaFX 2022-04-24 15:12:45 +02:00
Odabasioglu Cemal cff5a97d93 Merge branch 'added_Deck_and_Rack_classes' into 'master' 
Added deck and rack classes

See merge request odabasioglu1/latice!1
 2022-04-24 15:10:43 +02:00
Odabasioglu Cemal a66ce8f606 Merge branch 'master' into 'added_Deck_and_Rack_classes' 
# Conflicts:
#   src/main/java/latice/application/LaticeApplicationConsole.java
#   src/main/java/latice/model/Tile.java
 2022-04-24 15:10:43 +02:00
mathi 16db96f887 STEP 1 : ADD Deck and Rack classes with UPDATE LaticeApplicationConsole 2022-04-24 15:10:43 +02:00
Odabasioglu Cemal 37a8ad922c Merge branch 'added_Deck_and_Rack_classes' into 'master' 
Added deck and rack classes

See merge request odabasioglu1/latice!1
 2022-04-24 12:06:48 +00:00
Odabasioglu Cemal ecaf204611 Merge branch 'master' into 'added_Deck_and_Rack_classes' 
# Conflicts:
#   src/main/java/latice/application/LaticeApplicationConsole.java
#   src/main/java/latice/model/Tile.java
 2022-04-24 12:03:50 +00:00
mathi c4ed8e5832 ADD Deck and Rack classes with UPDATE LaticeApplicationConsole 2022-04-23 16:05:32 +02:00
Mathis 431e9759e9 WIP add Deck and Rack classes 2022-04-19 23:24:10 +02:00
mathi dba464f4ef UPDATE Tile and LaticeApplicationConsole classes 2022-04-19 23:19:52 +02:00
Cemal Odabasioglu 3e6530a90a added improvements to tile attribution and javaFX application 2022-04-13 17:14:34 +02:00
Cemal Odabasioglu ab53bdc999 added JavaFX Application with image and title 2022-04-13 15:59:07 +02:00
Cemal Odabasioglu 637dff2438 added tiles and tiles attribution for Step 1 2022-04-13 15:58:10 +02:00
Cemal Odabasioglu 91178431c6 added Tile getters/setters 2022-04-13 15:56:57 +02:00
mathi 837651d0c6 Add Shape and Tile 2022-04-12 16:22:07 +02:00
mathi 4dc29b4286 Merge branch 'master' of https://git.unilim.fr/odabasioglu1/latice.git 2022-04-12 16:11:30 +02:00
Mathis d1dff01c15 WIP add Shape 2022-03-29 18:30:14 +01:00
Cemal Odabasioglu f9bcaec4c2 Added Color enum 2022-03-29 19:29:56 +02:00
Cemal Odabasioglu 2913af5e6a Latice Main 2022-03-29 19:15:40 +02:00
Cemal Odabasioglu f8246a6156 initial commit 2022-03-29 18:31:39 +02:00