merge

PiotrMakarewicz · Aug 31, 2021 · a3c8802 · a3c8802
1 parent c286256
commit a3c8802
Show file tree

Hide file tree

Showing 46 changed files with 2 additions and 1,469 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .gradle
-.idea
+.idea
+build
diff --git a/resources/images/animal-1.png b/resources/images/animal-1.png
diff --git a/resources/images/animal-10.png b/resources/images/animal-10.png
diff --git a/resources/images/animal-2.png b/resources/images/animal-2.png
diff --git a/resources/images/animal-3.png b/resources/images/animal-3.png
diff --git a/resources/images/animal-4.png b/resources/images/animal-4.png
diff --git a/resources/images/animal-5.png b/resources/images/animal-5.png
diff --git a/resources/images/animal-6.png b/resources/images/animal-6.png
diff --git a/resources/images/animal-7.png b/resources/images/animal-7.png
diff --git a/resources/images/animal-8.png b/resources/images/animal-8.png
diff --git a/resources/images/animal-9.png b/resources/images/animal-9.png
diff --git a/resources/images/highlight-animal.png b/resources/images/highlight-animal.png
diff --git a/resources/images/jungle-tile-planted.png b/resources/images/jungle-tile-planted.png
diff --git a/resources/images/jungle-tile.png b/resources/images/jungle-tile.png
diff --git a/resources/images/savannah-tile-planted.png b/resources/images/savannah-tile-planted.png
diff --git a/resources/images/savannah-tile.png b/resources/images/savannah-tile.png
diff --git a/resources/images/selected-animal.png b/resources/images/selected-animal.png
diff --git a/src/application/InvalidStartingParametersException.java b/src/application/InvalidStartingParametersException.java
diff --git a/src/application/Main.java b/src/application/Main.java
diff --git a/src/application/ParametersLoader.java b/src/application/ParametersLoader.java
diff --git a/src/application/SimulationCanvas.java b/src/application/SimulationCanvas.java
diff --git a/src/application/SimulationThread.java b/src/application/SimulationThread.java
diff --git a/src/application/tiles/AnimalTile.java b/src/application/tiles/AnimalTile.java
diff --git a/src/application/tiles/AnimalTileFactory.java b/src/application/tiles/AnimalTileFactory.java
diff --git a/src/application/tiles/TerrainTile.java b/src/application/tiles/TerrainTile.java
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     .gradle
-    .idea
+    .idea
+    build