Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

FirefighterStarter
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

056c02c2

Commit 056c02c2 authored 5 months ago by BELHACHEMI Mehdi

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/app/SimulatorApplication.java
#	src/main/java/model/ModelElement.java
#	src/main/java/view/ViewElement.java

parents d463f126 2822f639

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/app/SimulatorApplication.java 1 addition, 1 deletion

src/main/java/app/SimulatorApplication.java
src/main/java/controller/Controller.java 6 additions, 2 deletions

src/main/java/controller/Controller.java
src/main/java/model/Cloud.java 4 additions, 4 deletions

src/main/java/model/Cloud.java
src/main/java/model/FirefighterBoard.java 34 additions, 5 deletions

src/main/java/model/FirefighterBoard.java
src/main/java/model/ModelElement.java 4 additions, 1 deletion

src/main/java/model/ModelElement.java
src/main/java/view/FirefighterGrid.java 2 additions, 0 deletions

src/main/java/view/FirefighterGrid.java
src/main/java/view/ViewElement.java 1 addition, 1 deletion

src/main/java/view/ViewElement.java

with 52 additions and 14 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