Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

IDATT2003 Mappevurdering
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

cad88c47

Commit cad88c47 authored 11 months ago by Håvard Daleng

Downloads
- Patches
- Plain Diff

Resolved merge conflicts.

parent f7e8dd5c

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/edu/ntnu/stud/chaosgame/controller/game/ChaosCanvas.java 4 additions, 5 deletions

.../edu/ntnu/stud/chaosgame/controller/game/ChaosCanvas.java
src/main/java/edu/ntnu/stud/chaosgame/controller/game/ChaosGame.java 27 additions, 0 deletions

...va/edu/ntnu/stud/chaosgame/controller/game/ChaosGame.java
src/main/java/edu/ntnu/stud/chaosgame/view/ChaosGameGUIView.java 411 additions, 220 deletions

...n/java/edu/ntnu/stud/chaosgame/view/ChaosGameGUIView.java
src/main/java/edu/ntnu/stud/chaosgame/view/ChaosGameObserver.java 1 addition, 1 deletion

.../java/edu/ntnu/stud/chaosgame/view/ChaosGameObserver.java
src/main/resources/descriptions/factory/desc_2.txt 1 addition, 1 deletion

src/main/resources/descriptions/factory/desc_2.txt
src/main/resources/descriptions/factory/desc_4.txt 6 additions, 5 deletions

src/main/resources/descriptions/factory/desc_4.txt

with 450 additions and 232 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