diff --git a/Deliverables/Oblig4.md b/Deliverables/Oblig4.md index 30c8c6d..8f0d55e 100644 --- a/Deliverables/Oblig4.md +++ b/Deliverables/Oblig4.md @@ -370,10 +370,11 @@ Den eneste kjente bugen er at når en spiller sier at den skal i powerdown neste den automatisk i powerdown uten å få mulighet til å avbryte powerdown. ## Deloppgave 3 - +* For dokumentasjon om bygging, testing og kjøring, se [README.md](../README.md). ### Manuell testing [Manuelle tester finner du her](../docs/team/planlegging/Sprint_4/Manuelle_tester.md) -## Deloppgave 3 -- For dokumentasjon om bygging, testing og kjøring, se [README.md](../README.md). \ No newline at end of file +### UML +![UML](../Deliverables/Umls/UmlOblig4.png) +![UML](../Deliverables/Umls/UmlObli4Simple.png) \ No newline at end of file diff --git a/Deliverables/Umls/UmlObli4Simple.png b/Deliverables/Umls/UmlObli4Simple.png new file mode 100644 index 0000000..a05c044 Binary files /dev/null and b/Deliverables/Umls/UmlObli4Simple.png differ diff --git a/Deliverables/Umls/UmlOblig4.png b/Deliverables/Umls/UmlOblig4.png new file mode 100644 index 0000000..67974f4 Binary files /dev/null and b/Deliverables/Umls/UmlOblig4.png differ diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/DrawableObject.html b/docs/javadoc/inf112/fiasko/roborally/objects/DrawableObject.html index 4e0ed16..6560bff 100644 --- a/docs/javadoc/inf112/fiasko/roborally/objects/DrawableObject.html +++ b/docs/javadoc/inf112/fiasko/roborally/objects/DrawableObject.html @@ -99,7 +99,7 @@ var activeTableTab = "activeTableTab";
  • java.lang.Object
  • diff --git a/src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java b/src/main/java/inf112/fiasko/roborally/ui/DrawableObject.java similarity index 99% rename from src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java rename to src/main/java/inf112/fiasko/roborally/ui/DrawableObject.java index 050a064..3b8af99 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java +++ b/src/main/java/inf112/fiasko/roborally/ui/DrawableObject.java @@ -1,4 +1,4 @@ -package inf112.fiasko.roborally.objects; +package inf112.fiasko.roborally.ui; import com.badlogic.gdx.graphics.g2d.TextureRegion; diff --git a/src/main/java/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.java index 36e9f58..af3acb7 100644 --- a/src/main/java/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.java @@ -8,7 +8,7 @@ import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.utils.viewport.ExtendViewport; import inf112.fiasko.roborally.objects.DrawableGame; -import inf112.fiasko.roborally.objects.DrawableObject; +import inf112.fiasko.roborally.ui.DrawableObject; import inf112.fiasko.roborally.objects.InteractableGame; import inf112.fiasko.roborally.objects.Player; import inf112.fiasko.roborally.objects.Robot; diff --git a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java index 3363687..641eb17 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java @@ -3,7 +3,7 @@ package inf112.fiasko.roborally.utility; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.esotericsoftware.kryonet.Connection; import inf112.fiasko.roborally.objects.DrawableGame; -import inf112.fiasko.roborally.objects.DrawableObject; +import inf112.fiasko.roborally.ui.DrawableObject; import inf112.fiasko.roborally.objects.Particle; import inf112.fiasko.roborally.objects.Player; import inf112.fiasko.roborally.objects.Robot; diff --git a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java index a99c986..f36dfdc 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureRegion; import inf112.fiasko.roborally.GdxTestRunner; +import inf112.fiasko.roborally.ui.DrawableObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;