Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Groupe 16
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

61bbb0f3

Commit 61bbb0f3 authored 4 years ago by CARION Baptiste

Downloads
- Plain Diff

Merge branch 'master' into Baptiste

parents 8585e5bd 07c805be

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.settings/org.eclipse.core.resources.prefs 2 additions, 0 deletions

.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.core.runtime.prefs 2 additions, 0 deletions

.settings/org.eclipse.core.runtime.prefs
doc/sprint-5/README.md 4 additions, 1 deletion

doc/sprint-5/README.md
doc/sprint-6/README.md 14 additions, 0 deletions

doc/sprint-6/README.md
doc/sprint-6/radiateur.jpg 0 additions, 0 deletions

doc/sprint-6/radiateur.jpg
src/items/Crown.java 8 additions, 8 deletions

src/items/Crown.java
src/items/Items.java 2 additions, 1 deletion

src/items/Items.java
src/main/Case.java 9 additions, 2 deletions

src/main/Case.java
src/main/Main.java 30 additions, 29 deletions

src/main/Main.java
src/main/Plateau.java 8 additions, 0 deletions

src/main/Plateau.java
src/main/Region.java 9 additions, 0 deletions

src/main/Region.java
src/main/Type.java 1 addition, 1 deletion

src/main/Type.java
src/units/Unite.java 24 additions, 9 deletions

src/units/Unite.java

with 113 additions and 51 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment