Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SevillanoRobin/Projet-2048-Behm-Claudel-Richez-Sevillano
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: A1.v1
Choose a base ref
...
head repository: SevillanoRobin/Projet-2048-Behm-Claudel-Richez-Sevillano
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
5 contributors

Commits on Nov 1, 2019

  1. Correction of the keys for moving and closing the scanner

    Adrien committed Nov 1, 2019
    Copy the full SHA
    80758c5 View commit details

Commits on Nov 4, 2019

  1. Changements sur les classes Main. (#6) 

    * Tweaks the Main_Terminal class.

* Tweaks the Main class.
    @Prometheos2
    Prometheos2 committed Nov 4, 2019
    Copy the full SHA
    41d67c7 View commit details

Commits on Nov 9, 2019

  1. Create the basis for the Main Menu. (#5) 

    * Create the basis for the Main Menu.

* Implement MainMenu's onQuit button and method.

* Move and rename the main menu files.
    @Prometheos2
    Prometheos2 authored Nov 9, 2019
    Copy the full SHA
    454453f View commit details

  2. Change package for the MainMenu elements.

    @Prometheos2
    Prometheos2 committed Nov 9, 2019
    Copy the full SHA
    b4f20b1 View commit details

Commits on Nov 15, 2019

  1. Update the position of the cell after moving.

    @Prometheos2
    Adrien authored and Prometheos2 committed Nov 15, 2019
    Copy the full SHA
    4a594f1 View commit details

Commits on Nov 16, 2019

  1. Correct a display error on Main_Terminal.

    @Prometheos2
    Adrien authored and Prometheos2 committed Nov 16, 2019
    Copy the full SHA
    59e2234 View commit details

Commits on Nov 27, 2019

  1. Add the AI.

    @Prometheos2
    Prometheos2 committed Nov 27, 2019
    Copy the full SHA
    04b124c View commit details

  2. Merge pull request #9 from SevillanoRobin/feature/IA 

    Add the AI.
    @Prometheos2
    Prometheos2 authored Nov 27, 2019
    Copy the full SHA
    44e1669 View commit details

  3. Implement the save feature into Grids.

    @Prometheos2
    Adrien authored and Prometheos2 committed Nov 27, 2019
    Copy the full SHA
    34b6a14 View commit details

  4. Implement the save feature into Main_Terminal.

    @Prometheos2
    Adrien authored and Prometheos2 committed Nov 27, 2019
    Copy the full SHA
    0c69998 View commit details

  5. Merge pull request #8 from SevillanoRobin/serialization 

    Serialisation & sauvegarde
    @Prometheos2
    Prometheos2 authored Nov 27, 2019
    Copy the full SHA
    90dfdc3 View commit details

  6. Achievements 6

    @Reiji7
    Reiji7 committed Nov 27, 2019
    Copy the full SHA
    372cd3f View commit details

Commits on Nov 28, 2019

  1. Minor correction of model

    @Reiji7
    Reiji7 committed Nov 28, 2019
    Copy the full SHA
    51a4de4 View commit details

Commits on Nov 29, 2019

  1. Remove Movable-related redundancy in Grid.

    @Prometheos2
    Prometheos2 committed Nov 29, 2019
    Copy the full SHA
    1211631 View commit details

Commits on Dec 7, 2019

  1. Correction of new tiles generation

    @Reiji7
    Reiji7 committed Dec 7, 2019
    Copy the full SHA
    94ad2b9 View commit details

  2. Move IA sources towards its own package.

    @SevillanoRobin @Prometheos2
    SevillanoRobin authored and Prometheos2 committed Dec 7, 2019
    Copy the full SHA
    cf6dea4 View commit details

  3. Document & Tweak the AI sources.

    @SevillanoRobin @Prometheos2
    SevillanoRobin authored and Prometheos2 committed Dec 7, 2019
    Copy the full SHA
    295d433 View commit details

  4. Achievement 5: Database.

    @SevillanoRobin @Prometheos2
    SevillanoRobin authored and Prometheos2 committed Dec 7, 2019
    Copy the full SHA
    e539c4a View commit details

  5. Merge pull request #10 from SevillanoRobin/feature/BDD 

    Achievement 5 & JavaDoc sur le package IA
    @Prometheos2
    Prometheos2 authored Dec 7, 2019
    Copy the full SHA
    0feae0a View commit details

  6. Create a dialog box factory for the main menu +JavaDoc.

    @Prometheos2
    Prometheos2 committed Dec 7, 2019
    Copy the full SHA
    20d023c View commit details

  7. Remove the quitButton attribute, as it is currently unnecessary.

    @Prometheos2
    Prometheos2 committed Dec 7, 2019
    Copy the full SHA
    a1d6d56 View commit details

  8. Change interactions between the main menu and Main. 

    Includes:
  - Creating MainMenu class attributes.
  - Creating an access to the application language.
  - Deleting the unused addCSSFiles() method.
    @Prometheos2
    Prometheos2 committed Dec 7, 2019
    Copy the full SHA
    8bdbc42 View commit details

  9. Create a loader and an interface for views.

    @Prometheos2
    Prometheos2 committed Dec 7, 2019
    Copy the full SHA
    7144229 View commit details

  10. Merge pull request #11 from Prometheos2/MainMenuTweaks 

    Changements et documentation du menu principal
    @Prometheos2
    Prometheos2 authored Dec 7, 2019
    Copy the full SHA
    11f2b1f View commit details

Commits on Dec 8, 2019

  1. Extract the Application class from Main.

    @Prometheos2
    Prometheos2 committed Dec 8, 2019
    Copy the full SHA
    81b1f41 View commit details

  2. Move the Lang attribute into the GameApplication class.

    @Prometheos2
    Prometheos2 committed Dec 8, 2019
    Copy the full SHA
    ce35edf View commit details

  3. Change the controller interface's & the view loader's package.

    @Prometheos2
    Prometheos2 committed Dec 8, 2019
    Copy the full SHA
    352c6f5 View commit details

  4. Upgrade AI features.

    @SevillanoRobin @Prometheos2
    SevillanoRobin authored and Prometheos2 committed Dec 8, 2019
    Copy the full SHA
    f1cf9ae View commit details

  5. Tweak the Model elements. +JavaDoc

    @SevillanoRobin @Prometheos2
    SevillanoRobin authored and Prometheos2 committed Dec 8, 2019
    Copy the full SHA
    270905e View commit details

  6. Upgrade the Main classes.

    @SevillanoRobin @Prometheos2
    SevillanoRobin authored and Prometheos2 committed Dec 8, 2019
    Copy the full SHA
    21a5f93 View commit details

  7. Implement save features into terminal games.

    @Prometheos2
    Prometheos2 committed Dec 8, 2019
    Copy the full SHA
    fb63c36 View commit details

Commits on Dec 9, 2019

  1. Quit after saving.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    2539254 View commit details

  2. Merge pull request #13 from SevillanoRobin/IAupgrades 

    Mise à niveau de l'IA et des classes Main (+Tweaks sur Model)
    @Prometheos2
    Prometheos2 authored Dec 9, 2019
    Copy the full SHA
    9bfeff5 View commit details

  3. Tweak the Grids class.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    636b406 View commit details

  4. Tweak the Grid class.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    0ab445b View commit details

  5. Tweak the Movable class.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    72df376 View commit details

  6. Liquidate the Movable class and fix the components.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    139839c View commit details

  7. Merge pull request #12 from Prometheos2/GridTrioRework 

    Suppression de la classe Movable & changements sur Grid et Grids
    @Prometheos2
    Prometheos2 authored Dec 9, 2019
    Copy the full SHA
    0cef143 View commit details

  8. Tweak Grid's elements privacy.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    902cca5 View commit details

  9. Cleanup Parameters.java and its usages.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    c721109 View commit details

  10. Cleanup Tile.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    bb03191 View commit details

  11. Cleanup the IA package sources. 

    - Action
- Etat
- Noeud
- Probleme
    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    d5f8e6d View commit details

  12. Merge branch 'ModelTweaks'

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    dbf342e View commit details

  13. Cleanup the JouerEnSolo class.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    1296412 View commit details

  14. Fix the Application launch's exception.

    @Prometheos2
    Prometheos2 committed Dec 9, 2019
    Copy the full SHA
    fe309f2 View commit details

Commits on Dec 10, 2019

  1. Update the readme file with a link to pull requests.

    @Prometheos2
    Prometheos2 committed Dec 10, 2019
    Copy the full SHA
    5945a18 View commit details

Commits on Dec 11, 2019

  1. Create a Theme enumeration for themes.

    @Prometheos2
    Prometheos2 committed Dec 11, 2019
    Copy the full SHA
    ea2fc48 View commit details

  2. Implement the themes into the main menu creation.

    @Prometheos2
    Prometheos2 committed Dec 11, 2019
    Copy the full SHA
    98f68a4 View commit details

  3. Create an abstract super-class for View controllers.

    @Prometheos2
    Prometheos2 committed Dec 11, 2019
    Copy the full SHA
    d4e5d6e View commit details

  4. Create different ViewLoader classes (inc. one for subview).

    @Prometheos2
    Prometheos2 committed Dec 11, 2019
    Copy the full SHA
    2ad709e View commit details
Showing with 52,763 additions and 783 deletions.
  1. +1 −0 .gitattributes
  2. +3 −0 .gitignore
  3. +30 −0 build.xml
  4. +3 −0 doc/allclasses-frame.html
  5. +3 −0 doc/allclasses-noframe.html
  6. +550 −0 doc/application/GameApplication.html
  7. +331 −0 doc/application/JouerEnSolo.html
  8. +344 −0 doc/application/Main.html
  9. +321 −0 doc/application/Main_IA.html
  10. +32 −0 doc/application/package-frame.html
  11. +191 −0 doc/application/package-summary.html
  12. +177 −0 doc/application/package-tree.html
  13. +3 −0 doc/constant-values.html
  14. +588 −0 doc/controller/AbstractViewController.html
  15. +393 −0 doc/controller/AbstractViewLoader.html
  16. +416 −0 doc/controller/DialogBoxFactory.html
  17. +452 −0 doc/controller/SubViewLoader.html
  18. +449 −0 doc/controller/Theme.html
  19. +395 −0 doc/controller/ViewController.html
  20. +350 −0 doc/controller/ViewLoader.html
  21. +645 −0 doc/controller/game/GameController.html
  22. +529 −0 doc/controller/game/GridSetView.html
  23. +503 −0 doc/controller/game/GridView.html
  24. +31 −0 doc/controller/game/package-frame.html
  25. +182 −0 doc/controller/game/package-summary.html
  26. +211 −0 doc/controller/game/package-tree.html
  27. +610 −0 doc/controller/menus/MainMenuController.html
  28. +30 −0 doc/controller/menus/package-frame.html
  29. +172 −0 doc/controller/menus/package-summary.html
  30. +175 −0 doc/controller/menus/package-tree.html
  31. +624 −0 doc/controller/menus/settings/SettingsController.html
  32. +31 −0 doc/controller/menus/settings/package-frame.html
  33. +174 −0 doc/controller/menus/settings/package-summary.html
  34. +176 −0 doc/controller/menus/settings/package-tree.html
  35. +44 −0 doc/controller/package-frame.html
  36. +238 −0 doc/controller/package-summary.html
  37. +200 −0 doc/controller/package-tree.html
  38. +23 −0 doc/css/package-frame.html
  39. +150 −0 doc/css/package-summary.html
  40. +154 −0 doc/css/package-tree.html
  41. +3 −0 doc/deprecated-list.html
  42. +3 −0 doc/help-doc.html
  43. +3 −0 doc/index-all.html
  44. +3 −0 doc/index.html
  45. +9,820 −0 doc/jquery/external/jquery/jquery.js
  46. BIN doc/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
  47. BIN doc/jquery/images/ui-bg_flat_75_ffffff_40x100.png
  48. BIN doc/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
  49. BIN doc/jquery/images/ui-bg_glass_65_ffffff_1x400.png
  50. BIN doc/jquery/images/ui-bg_glass_75_dadada_1x400.png
  51. BIN doc/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
  52. BIN doc/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
  53. BIN doc/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  54. BIN doc/jquery/images/ui-icons_222222_256x240.png
  55. BIN doc/jquery/images/ui-icons_2e83ff_256x240.png
  56. BIN doc/jquery/images/ui-icons_454545_256x240.png
  57. BIN doc/jquery/images/ui-icons_888888_256x240.png
  58. BIN doc/jquery/images/ui-icons_cd0a0a_256x240.png
  59. +9,820 −0 doc/jquery/jquery-1.10.2.js
  60. +1,111 −0 doc/jquery/jquery-ui.css
  61. +2,612 −0 doc/jquery/jquery-ui.js
  62. +7 −0 doc/jquery/jquery-ui.min.css
  63. +7 −0 doc/jquery/jquery-ui.min.js
  64. +165 −0 doc/jquery/jquery-ui.structure.css
  65. +5 −0 doc/jquery/jquery-ui.structure.min.css
  66. +3 −0 doc/member-search-index.js
  67. +3 −0 doc/member-search-index.zip
  68. +573 −0 doc/model/Bdd/ConnectionDatabase.html
  69. +358 −0 doc/model/Bdd/InformationDatabase.html
  70. +31 −0 doc/model/Bdd/package-frame.html
  71. +175 −0 doc/model/Bdd/package-summary.html
  72. +169 −0 doc/model/Bdd/package-tree.html
  73. +399 −0 doc/model/Grid.html
  74. +867 −0 doc/model/Grids.html
  75. +349 −0 doc/model/Ia/Action.html
  76. +436 −0 doc/model/Ia/Etat.html
  77. +415 −0 doc/model/Ia/Noeud.html
  78. +363 −0 doc/model/Ia/Probleme.html
  79. +32 −0 doc/model/Ia/package-frame.html
  80. +193 −0 doc/model/Ia/package-summary.html
  81. +171 −0 doc/model/Ia/package-tree.html
  82. +419 −0 doc/model/Parameters.html
  83. +356 −0 doc/model/Tile.html
  84. +488 −0 doc/model/events/AbstractModelEventEmitter.html
  85. +426 −0 doc/model/events/ModelEvent.html
  86. +481 −0 doc/model/events/ModelEventCategory.html
  87. +359 −0 doc/model/events/ModelEventEmitter.html
  88. +644 −0 doc/model/events/ModelEventSubtype.html
  89. +449 −0 doc/model/events/ModelFusionEvent.html
  90. +449 −0 doc/model/events/ModelMovedTileEvent.html
  91. +420 −0 doc/model/events/ModelNewTileEvent.html
  92. +418 −0 doc/model/events/ModelScoreEvent.html
  93. +48 −0 doc/model/events/package-frame.html
  94. +250 −0 doc/model/events/package-summary.html
  95. +222 −0 doc/model/events/package-tree.html
  96. +36 −0 doc/model/package-frame.html
  97. +195 −0 doc/model/package-summary.html
  98. +188 −0 doc/model/package-tree.html
  99. +3 −0 doc/overview-frame.html
  100. +3 −0 doc/overview-summary.html
  101. +3 −0 doc/overview-tree.html
  102. +3 −0 doc/package-list
  103. +3 −0 doc/package-search-index.js
  104. +3 −0 doc/package-search-index.zip
  105. +341 −0 doc/recommender/IaContext.html
  106. +29 −0 doc/recommender/package-frame.html
  107. +172 −0 doc/recommender/package-summary.html
  108. +166 −0 doc/recommender/package-tree.html
  109. +346 −0 doc/recommender/strategies/IaRandom.html
  110. +349 −0 doc/recommender/strategies/IaReductionNombreTuile.html
  111. +349 −0 doc/recommender/strategies/IaScoreMax.html
  112. +287 −0 doc/recommender/strategies/IaStrategies.html
  113. +38 −0 doc/recommender/strategies/package-frame.html
  114. +206 −0 doc/recommender/strategies/package-summary.html
  115. +187 −0 doc/recommender/strategies/package-tree.html
  116. BIN doc/resources/glass.png
  117. BIN doc/resources/x.png
  118. +3 −0 doc/script.js
  119. +3 −0 doc/search.js
  120. +3 −0 doc/serialized-form.html
  121. +3 −0 doc/stylesheet.css
  122. +3 −0 doc/type-search-index.js
  123. +3 −0 doc/type-search-index.zip
  124. +8 −3 readme.md
  125. +3 −0 save/readme.md
  126. +139 −0 src/application/GameApplication.java
  127. +144 −0 src/application/JouerEnSolo.java
  128. +64 −22 src/application/Main.java
  129. +36 −0 src/application/Main_IA.java
  130. +0 −48 src/application/Main_Terminal.java
  131. +128 −0 src/controller/AbstractViewController.java
  132. +210 −0 src/controller/AbstractViewLoader.java
  133. +160 −0 src/controller/DialogBoxFactory.java
  134. +135 −0 src/controller/SubViewLoader.java
  135. +59 −0 src/controller/Theme.java
  136. +80 −0 src/controller/ViewController.java
  137. +78 −0 src/controller/ViewLoader.java
  138. +353 −0 src/controller/game/GameController.java
  139. +23 −0 src/controller/game/GameView.properties
  140. +62 −0 src/controller/game/GameViewFXML.fxml
  141. +15 −0 src/controller/game/GameViewStyle_Dark.css
  142. +12 −0 src/controller/game/GameViewStyle_Light.css
  143. +23 −0 src/controller/game/GameView_fr.properties
  144. +145 −0 src/controller/game/GridSetView.java
  145. +13 −0 src/controller/game/GridSetView.properties
  146. +28 −0 src/controller/game/GridSetViewStyle.css
  147. +12 −0 src/controller/game/GridSetView_fr.properties
  148. +126 −0 src/controller/game/GridView.java
  149. +68 −0 src/controller/game/TileStyle.css
  150. +142 −0 src/controller/game/TileView.java
  151. +33 −0 src/controller/menus/MainMenu.fxml
  152. +233 −0 src/controller/menus/MainMenuController.java
  153. +25 −0 src/controller/menus/MainMenu_Dark.css
  154. +25 −0 src/controller/menus/MainMenu_Light.css
  155. +25 −0 src/controller/menus/menus.properties
  156. +25 −0 src/controller/menus/menus_fr.properties
  157. +315 −0 src/controller/menus/settings/SettingsController.java
  158. +55 −0 src/controller/menus/settings/SettingsMenu.fxml
  159. +23 −0 src/controller/menus/settings/SettingsMenu_Core.css
  160. +23 −0 src/controller/menus/settings/SettingsMenu_Dark.css
  161. +19 −0 src/controller/menus/settings/SettingsMenu_Light.css
  162. +157 −0 src/css/CSSGenerator.java
  163. +128 −0 src/model/Bdd/ConnectionDatabase.java
  164. +65 −0 src/model/Bdd/InformationDatabase.java
  165. +557 −199 src/model/Grid.java
  166. +548 −169 src/model/Grids.java
  167. +49 −0 src/model/Ia/Action.java
  168. +221 −0 src/model/Ia/Etat.java
  169. +79 −0 src/model/Ia/Noeud.java
  170. +85 −0 src/model/Ia/Probleme.java
  171. +0 −256 src/model/Movable.java
  172. +27 −0 src/model/Parameters.java
  173. +0 −17 src/model/Parametres.java
  174. +86 −69 src/model/Tile.java
  175. +124 −0 src/model/events/AbstractModelEventEmitter.java
  176. +98 −0 src/model/events/ModelEvent.java
  177. +44 −0 src/model/events/ModelEventCategory.java
  178. +63 −0 src/model/events/ModelEventEmitter.java
  179. +92 −0 src/model/events/ModelEventSubtype.java
  180. +103 −0 src/model/events/ModelFusionEvent.java
  181. +102 −0 src/model/events/ModelMovedTileEvent.java
  182. +83 −0 src/model/events/ModelNewTileEvent.java
  183. +110 −0 src/model/events/ModelScoreEvent.java
  184. +74 −0 src/recommender/IaContext.java
  185. +117 −0 src/recommender/strategies/IaRandom.java
  186. +135 −0 src/recommender/strategies/IaReductionNombreTuile.java
  187. +134 −0 src/recommender/strategies/IaScoreMax.java
  188. +31 −0 src/recommender/strategies/IaStrategies.java
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
doc/* filter=lfs diff=lfs merge=lfs -text
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## Fichiers de sauvegarde
*.xt

# Created by .ignore support plugin (hsz.mobi)
### NetBeans template
**/nbproject/private/
30 changes: 30 additions & 0 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- https://www.tutorialspoint.com/ant/ant_build_documentation.htm -->
<project name="2048 3D" default="all" basedir=".">

<target name="all" depends="generate-javadoc">

</target>

<target name="generate-javadoc">
<!-- Generate the JavaDoc -->
<javadoc packagenames="*" sourcepath="src"
destdir="doc" version="true" windowtitle="2048 3D">

<doctitle><![CDATA[= 2048 3D =]]></doctitle>

<bottom>
<![CDATA[Copyright © 2019. All Rights Reserved.]]>
</bottom>

<group title="Application" packages="application:application.*"/>
<group title="Contr&#244;leurs" packages="controller:controller.*"/>
<group title="IA" packages="model.Ia:recommender:recommender.*"/>
<group title="Mod&#232;le" packages="model:model.Bdd"/>
</javadoc>

<echo message="java doc has been generated!"/>

</target>

</project>
3 changes: 3 additions & 0 deletions doc/allclasses-frame.html
View file
Git LFS file not shown
3 changes: 3 additions & 0 deletions doc/allclasses-noframe.html
View file
Git LFS file not shown
Loading