bring all to main #51
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
) * Add build.grade from branch 1-brainstorming * Add class Board * Add walking skeleton of model * Move model to package fr.uparis.energy.model * Correct package name in some files * Add changes suggested by @sevi2000
* Add build.grade from branch 1-brainstorming * Add class Board * Add walking skeleton of model * Move model to package fr.uparis.energy.model * Correct package name in some files * Add changes suggested by @sevi2000 * Fix various problems * fixed gradle bug thanks to Arbi * Merge request from branch 2-model-walking-skeleton to branch develop (#3) * Add build.grade from branch 1-brainstorming * Add class Board * Add walking skeleton of model * Move model to package fr.uparis.energy.model * Correct package name in some files * Add changes suggested by @sevi2000 * Create gradle.yml * Fix Main * Update gradle.yml * updated walking skeleton according to brainStorming file. * Move model to package fr.uparis.energy.model * Add changes suggested by @sevi2000 * made changees suggested @adrianhhhhh * Delete moved classes * Change group in build.gradle * Fix constructors * Fix build.gradle * added auto format on push * Update gradle.yml --------- Co-authored-by: Adrian H <multyx.pratix@gmail.com> Co-authored-by: adrianhhhhh <122212533+adrianhhhhh@users.noreply.github.com>
* Start implementation of level parser * Formatted code * added levels finished level parser form file need to find a way to locate level files * Delete and ignore .idea * Delete in .idea * LevelConverter finished, needs documentation * added doc to level converter but forgot to pull * Added test for level converter * Formatted code * Adrian it is your turn now. * initNeighbors() first version * Refactor all level converter code * Fix setNeighbors calls * added javadoc. * Delete generated Javadoc --------- Co-authored-by: Adrian H <multyx.pratix@gmail.com> Co-authored-by: GitHub Action <action@github.com>
* fnished Tile implementation * Formatted code * Final modifications for Tile --------- Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Adrian H <multyx.pratix@gmail.com>
* Finish Board implementation * added tests for board. * applyed formater. * Fix null handling of Connector.getNeighbor() * Tile geometry instead of board geometry * Check argument of Board.getTilesWithComponent() * Remove comments in WifiComponent * Improve everything * Re-add tests * Fix the worst bug ever * Remove test * Formatted code --------- Co-authored-by: Adrian H <multyx.pratix@gmail.com> Co-authored-by: GitHub Action <action@github.com>
* Modify Component * Refactor Direction
* Add SonarQube * Fix bug with Random * Add README.md
* Reduced debt. * Formatted code * It remains 20min of debpt which can be acceptable. * Formatted code --------- Co-authored-by: GitHub Action <action@github.com>
* We can draw images but SpriteBank need to be completed. * Formatted code * Adrien your turn now. * Formatted code * Modify sprite bank * Formatted code * Begin of a menu need to talk with Padovani. * Formatted code * Begin of bank1 design. * Fromated code. * Bank1 screen almost finished. * Formatted code * Reduced debt. * Formated code. * Refactored a bit. * Formatted code * ADVANCE the view * ÁDVÁNCE VIEW 2 * Formatted code * we can now draw a tile. * Formatted code * Begin of board drawing. * Refactor GUI start (#24) * yml * Refactor * Refactored MainMenuView * Refactor * Fix code smells * Imports * Rename PowerState enum * Started PlayingLevelView. --------- Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Adrian H <multyx.pratix@gmail.com> Co-authored-by: adrianhhhhh <122212533+adrianhhhhh@users.noreply.github.com>
* Almost finished square tile draw. * We can now draw a square tile of any size anywhere. * Square tile can be drawn everywhre and of every size. * We can now draw hex board need refactor. * Fixed gap between hexagonal columns. * Resolved MR discussions. * Resolved MR discussions. * Made possible to win level 7.
* Splited drawTile method. * Redo algorithm first part * Board is now centered * BoardView is finalized --------- Co-authored-by: Adrian H <multyx.pratix@gmail.com>
* Advenced Level editor we need to handle connectors and refactor. * Level editor almost finshed we need to imlement hex toggle connector. * Finished wires and refactored code. * Reduced sonarQube debt.
* Advenced Level editor we need to handle connectors and refactor. * Level editor almost finshed we need to imlement hex toggle connector. * Finished wires and refactored code. * Reduced sonarQube debt. * Added Bank enum and copy bank1 levels for bank2 --------- Co-authored-by: DERVISHI <sevidervishi@outlook.fr>
* Added Bank selection view. * Finished bank view.
* Fixed level editor back button. * Fixed failing test. * Fixed no button. * Fixed missing brace. * I Hope is fixed.
* Change geometry. * Added confirmation for empty and change geometry buttons. * Updated TODO file.
* Fix square empty one connector and propagate energy when board size change * Fix "You won" dialog closed instead of OK * Add jar generation * Fix crash on playing an empty bank 2 level * Replace mouseClicked by mousePressed * Split BoardObservable in two * Added right click to rotate tile counterclockwise * Added help message walking skeleton * Added static * Formatted all code * Add level. * Added level now appears instantly * Larger bank 1/2 view * Fixed editor back button * Reapplied palantir java format * Limit number of levels * Improved bank look. * Fixed little space. * Removed GridBagLayout. * Added our levels. * Wrote javaodoc need to review if elements were forgotten. * Work2 (#46) * 1 * Wrote help message * Added report * Formatted code --------- Co-authored-by: DERVISHI <sevidervishi@outlook.fr>
* Setup LauncherJar * Add version
* Setup LauncherJar * Add version
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.