aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
Commit message (Collapse)AuthorAge
* Merge branch 'master' of https://github.com/pacien/upem-java-walljAdam NAILI2018-02-01
|\
| * Make fields privatepacien2018-02-01
| | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Refactoring Viewer.renderFrame()Adam NAILI2018-02-01
|/
* Merge branch 'master' of https://github.com/pacien/upem-java-walljpacien2018-02-01
|\
| * Merge branch 'master' of https://github.com/pacien/upem-java-walljAdam NAILI2018-02-01
| |\
| * | Usage of findFirst in GameStateControllerAdam NAILI2018-02-01
| | |
* | | Compute last exec and sleep durationpacien2018-02-01
| |/ |/| | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Merge branch 'master' of https://github.com/pacien/upem-java-walljpacien2018-02-01
|\|
| * Merge branch 'master' of https://github.com/pacien/upem-java-walljAdam NAILI2018-02-01
| |\
| * | Modifying Input handling, Thread sleep and various thingsAdam NAILI2018-02-01
| | |
* | | Move Matrix utilpacien2018-02-01
| |/ |/| | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Rename events/orders ; Partial impl. of robot event handlingpacien2018-02-01
| | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Use copy constructor for JBox vectorspacien2018-02-01
| | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Refactor blocks and controllerspacien2018-02-01
| | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Deduppacien2018-02-01
| | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Add stage controller and Updateable interfacepacien2018-02-01
| | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Rename GameController and update class diagrampacien2018-02-01
| | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Add time delta to contextpacien2018-02-01
|/ | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* Merge branch 'master' of https://github.com/pacien/upem-java-walljpacien2018-01-14
|\ | | | | | | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net> # Conflicts: # src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
| * Modifying the implementation of the Main, with Validation feature and ↵Adam NAILI2018-01-14
| | | | | | | | exception handling
| * Merge branch 'master' of https://github.com/pacien/upem-java-walljAdam NAILI2018-01-14
| |\
| * | Modifying implementation of paintCircle to center the cicle when it is ↵Adam NAILI2018-01-14
| | | | | | | | | | | | smaller and implementing paintString to print text on screen
| * | Implementing Display controllers (and changing null in some Physics ↵Adam NAILI2018-01-14
| | | | | | | | | | | | controllers to test the displays)
* | | Rename model package to blockpacien2018-01-14
| |/ |/| | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Make garbage blocks non-traversablepacien2018-01-14
|/ | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* Merge branch 'master' of https://github.com/pacien/upem-java-walljpacien2018-01-14
|\
| * Implementing Wall controllers for a not committed test of GUIAdam NAILI2018-01-14
| |
| * Modifying Exception handling messages in MainAdam NAILI2018-01-14
| |
| * Merge branch 'master' of https://github.com/pacien/upem-java-walljAdam NAILI2018-01-14
| |\
| * | Modifying the accessibility of the constant of size in TileVec2 (used to ↵Adam NAILI2018-01-14
| | | | | | | | | | | | display)
| * | Implementing the beginning of parsing thing, call to application.run()Adam NAILI2018-01-14
| | |
| * | Implementing ViewerAdam NAILI2018-01-14
| | |
* | | Implement board validatorpacien2018-01-14
| |/ |/| | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Move neighbour tile listpacien2018-01-14
| | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Impl. stubpacien2018-01-14
|/ | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* Fixing codeAdam NAILI2018-01-14
|
* Creating a new Event for GameOver featureAdam NAILI2018-01-14
|
* Implementing 'isOver' feature in GameAdam NAILI2018-01-14
|
* Merge branch 'master' of https://github.com/pacien/upem-java-walljAdam NAILI2018-01-14
|\
| * Implement path finderpacien2018-01-14
| |\ | | | | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
| * | Implement path finderpacien2018-01-14
| |/ | | | | | | Signed-off-by: pacien <pacien.trangirard@pacien.net>
* | Adding 'isOver' feature to GameControllerAdam NAILI2018-01-14
| |
* | Updating documentation (minor)Adam NAILI2018-01-14
| |
* | Moving Stage inside Game, and implementing methods related to this new ↵Adam NAILI2018-01-14
| | | | | | | | management or not
* | Modifying Context: it contains Game and no longer StageAdam NAILI2018-01-14
| |
* | Implementing very basics stuffs in Stage to unlock situation in other classesAdam NAILI2018-01-14
| |
* | Updating documentation and formatting BoardConverterAdam NAILI2018-01-14
|/
* Revert "Implement equality check"pacien2018-01-12
| | | | | | This reverts commit 09b631e Signed-off-by: pacien <pacien.trangirard@pacien.net>
* Merge branch 'master' of https://github.com/pacien/upem-java-walljpacien2018-01-12
|\
| * Modifying BoardConverter method due to TileVec2 modification and successful ↵Adam NAILI2018-01-12
| | | | | | | | tests