diff --git a/.classpath b/.classpath
index bcd2772f9d0add3acd138f0c144c4a7879b847f9..eba6ecda07d3e90594a1325970dffc5070d4c109 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/_Tools"/>
<classpathentry kind="output" path="class"/>
</classpath>
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 85d06e63f7fd185eb29c2ee812a6ce56e7214dfa..b7924992b5b795f6a03b278318cef8bd7ed18519 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,9 +5,16 @@ UNO
======
>>> start-date: 09.04.16
->>> status-date: 24.04.16
+>>> status-date: 23.11.17
____________________________________________________
+v.1.2.0 - (3)
+===============
+
+-replaced uno logos
+
+>>> end-work: 23.11.17
+
v.1.1.0 - (2)
===============
diff --git a/README.md b/README.md
index 2729085c3bf19d5d8d708bf0aaa1e18f38d3f71b..070115963169c6f4c3efead52c3b903c7c65b8e1 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
# UNO
- startdate: 09.04.16
-- current version: 1.1.0 (2) - 24.04.16
+- current version: 1.2.0 (3) - 23.11.17
### Description
-The card game UNO
\ No newline at end of file
+implementation of the card game UNO in Java
+
+### Screenshots
\ No newline at end of file
diff --git a/build/UNO.exe b/build/UNO.exe
index 24c04a85383e7b3a45d9b1da0512aa333a1b49e5..cb020e236c38ee729216275e8abc9ece14be8ce6 100644
Binary files a/build/UNO.exe and b/build/UNO.exe differ
diff --git a/build/UNO.jar b/build/UNO.jar
index 4506946099cb81162d33c6af50b069bf6b495184..2587559cccb2afb3e114ac11f92719556571c7d5 100644
Binary files a/build/UNO.jar and b/build/UNO.jar differ
diff --git a/build/UNO.xml b/build/UNO.xml
index 124a5fb8f53f006902d91fc471a2173645a6240a..629c1a969262af44462a1afb2b906af5df353fdb 100644
--- a/build/UNO.xml
+++ b/build/UNO.xml
@@ -2,8 +2,8 @@
<launch4jConfig>
<dontWrapJar>false</dontWrapJar>
<headerType>gui</headerType>
- <jar>C:\Users\Robert\Documents\eclipse\workspace\UNO\build\UNO.jar</jar>
- <outfile>C:\Users\Robert\Documents\eclipse\workspace\UNO\build\UNO.exe</outfile>
+ <jar>C:\Programmierung\eclipse\workspace\UNO\build\UNO.jar</jar>
+ <outfile>C:\Programmierung\eclipse\workspace\UNO\build\UNO.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir>.</chdir>
@@ -13,7 +13,7 @@
<stayAlive>false</stayAlive>
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
- <icon>C:\Users\Robert\Documents\eclipse\workspace\UNO\build\icon.ico</icon>
+ <icon>C:\Programmierung\eclipse\workspace\UNO\build\icon.ico</icon>
<classPath>
<mainClass>application.Main</mainClass>
<cp>.</cp>
diff --git a/build/icon.ico b/build/icon.ico
index f604f6db4e25966819aec44a82e9514dcd4488c1..4299f8fda49e2bc2eba632f32644f71d47d2a40d 100644
Binary files a/build/icon.ico and b/build/icon.ico differ
diff --git a/build/icon.png b/build/icon.png
index 4b756db39463446f4151a2bfcdaca7d9661ca682..e549d6ff60e3f9b65211c2843739bc37b4cce6f5 100644
Binary files a/build/icon.png and b/build/icon.png differ
diff --git a/build/screenshots/achievements.png b/build/screenshots/achievements.png
new file mode 100644
index 0000000000000000000000000000000000000000..f50639b3f91d1bd6f2b2b942d7df1fbc36d19f0b
Binary files /dev/null and b/build/screenshots/achievements.png differ
diff --git a/build/screenshots/game-2.png b/build/screenshots/game-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..42a0d9d10a2327ef94a0f723ffb188e5f3ab24b0
Binary files /dev/null and b/build/screenshots/game-2.png differ
diff --git a/build/screenshots/game-3.png b/build/screenshots/game-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b14c5d98cfd54d0490c9bc4bf1925e6a0f401749
Binary files /dev/null and b/build/screenshots/game-3.png differ
diff --git a/build/screenshots/game.png b/build/screenshots/game.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e369065b138579e97775a328e532b70b07bb574
Binary files /dev/null and b/build/screenshots/game.png differ
diff --git a/build/screenshots/settings.png b/build/screenshots/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..194b7361394b9f205d45a551fa1036c45c2fb147
Binary files /dev/null and b/build/screenshots/settings.png differ
diff --git a/class/achievements/AchievementHandler.class b/class/achievements/AchievementHandler.class
index 10a58e0e237954c7c6d2c85f01171efa37c4ec94..1d9e4a3b82875f2b8a3c07722e90dd5de1e3c987 100644
Binary files a/class/achievements/AchievementHandler.class and b/class/achievements/AchievementHandler.class differ
diff --git a/class/application/Controller.class b/class/application/Controller.class
index 726f541192c50dd97fd813549dfcc350b1567f94..bc3de4d23563069a3a3a4fe4ee2ea3b8821d2fca 100644
Binary files a/class/application/Controller.class and b/class/application/Controller.class differ
diff --git a/class/application/Settings.class b/class/application/Settings.class
index 3977a5dbcd7bdbffdabcd1a66a4c20c564cd6d24..445be6bc60e8335b722cc97dd0c4dab57c456d18 100644
Binary files a/class/application/Settings.class and b/class/application/Settings.class differ
diff --git a/class/application/_de.properties b/class/application/_de.properties
index 577ee1e02ff6483bc7462c11584bd7e8862458f1..7748670635ad865e608b383f24df8239c7e19309 100644
--- a/class/application/_de.properties
+++ b/class/application/_de.properties
@@ -1,4 +1,4 @@
app.name=UNO
-version.code=2
-version.name=1.1.0
-version.date=23.04.16
\ No newline at end of file
+version.code=3
+version.name=1.2.0
+version.date=23.11.17
\ No newline at end of file
diff --git a/class/images/card-back.png b/class/images/card-back.png
index 289e39dc286c259c5492a5653c97fd770e90da4c..0b54f64fcc284de01161a912fa8d7aad821703bd 100644
Binary files a/class/images/card-back.png and b/class/images/card-back.png differ
diff --git a/class/images/icon.png b/class/images/icon.png
index 4b756db39463446f4151a2bfcdaca7d9661ca682..e549d6ff60e3f9b65211c2843739bc37b4cce6f5 100644
Binary files a/class/images/icon.png and b/class/images/icon.png differ
diff --git a/class/logic/AI.class b/class/logic/AI.class
index 0bbd63156039250c46dacf4eb32ca7cc6f38415d..492a0515a2cbc391b55edbe8ddb1ce0f3f1f6cc5 100644
Binary files a/class/logic/AI.class and b/class/logic/AI.class differ
diff --git a/src/application/Controller.java b/src/application/Controller.java
index 2e84bdfa45f7802688edeae7c38798e31d53e94e..c8bc88f8f1a27b331a9670e202ea24de63953bd4 100644
--- a/src/application/Controller.java
+++ b/src/application/Controller.java
@@ -1204,19 +1204,19 @@ public class Controller
{
AchievementHandler handler = new AchievementHandler(stage);
handler.setPath(PathUtils.getOSindependentPath() + "/Deadlocker/UNO/achievements.save");
- handler.addAchievement(new Achievement("Anf�nger", "Gewinne dein erstes Spiel", null, null, Status.LOCKED));
+ handler.addAchievement(new Achievement("Anf�nger", "Gewinne dein erstes Spiel", null, null, Status.LOCKED));
handler.addAchievement(new Achievement("Fortgeschrittener", "Gewinne insgesamt 10 Spiele", null, null, Status.LOCKED, 0, 10, 0));
handler.addAchievement(new Achievement("Experte", "Gewinne insgesamt 50 Spiele", null, null, Status.LOCKED, 0, 50, 0));
- handler.addAchievement(new Achievement("Gl�cksstr�hne", "Gewinne hintereinander 3 Spiele", null, null, Status.LOCKED, 0, 3, 0));
- handler.addAchievement(new Achievement("L�uft bei dir!", "Gewinne hintereinander 5 Spiele", null, null, Status.LOCKED, 0, 5, 0));
+ handler.addAchievement(new Achievement("Gl�cksstr�hne", "Gewinne hintereinander 3 Spiele", null, null, Status.LOCKED, 0, 3, 0));
+ handler.addAchievement(new Achievement("L�uft bei dir!", "Gewinne hintereinander 5 Spiele", null, null, Status.LOCKED, 0, 5, 0));
handler.addAchievement(new Achievement("Arme Sau", "Du musst mehr als 10 Karten ziehen", null, null, Status.LOCKED));
handler.addAchievement(new Achievement("Gegenangriff", "Kontere eine +4", null, null, Status.LOCKED));
- handler.addAchievement(new Achievement("Wunschkonzert", "W�nsch dir eine Farbe", null, null, Status.LOCKED));
+ handler.addAchievement(new Achievement("Wunschkonzert", "W�nsch dir eine Farbe", null, null, Status.LOCKED));
handler.addAchievement(new Achievement("Cheatest du?", "Besitze zwei +4 Karten gleichzeitig", null, null, Status.LOCKED));
- handler.addAchievement(new Achievement("Unm�glich", "Klicke 5 mal auf den Ablagestapel", null, null, Status.HIDDEN));
+ handler.addAchievement(new Achievement("Unm�glich", "Klicke 5 mal auf den Ablagestapel", null, null, Status.HIDDEN));
try
{
@@ -1275,9 +1275,9 @@ public class Controller
public void about()
{
Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("�ber " + bundle.getString("app.name"));
+ alert.setTitle("Über " + bundle.getString("app.name"));
alert.setHeaderText(bundle.getString("app.name"));
- alert.setContentText("Version: " + bundle.getString("version.name") + "\r\nDatum: " + bundle.getString("version.date") + "\r\nAutor: Robert Goldmann\r\n");
+ alert.setContentText("Version: " + bundle.getString("version.name") + "\r\nDatum: " + bundle.getString("version.date") + "\r\nAutor: Robert Goldmann\r\nCard images from:\nhttps://upload.wikimedia.org/wikipedia/commons/thumb/9/95/UNO_cards_deck.svg/800px-UNO_cards_deck.svg.png");
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
alert.showAndWait();
diff --git a/src/application/_de.properties b/src/application/_de.properties
index 577ee1e02ff6483bc7462c11584bd7e8862458f1..7748670635ad865e608b383f24df8239c7e19309 100644
--- a/src/application/_de.properties
+++ b/src/application/_de.properties
@@ -1,4 +1,4 @@
app.name=UNO
-version.code=2
-version.name=1.1.0
-version.date=23.04.16
\ No newline at end of file
+version.code=3
+version.name=1.2.0
+version.date=23.11.17
\ No newline at end of file
diff --git a/src/images/card-back.png b/src/images/card-back.png
index 289e39dc286c259c5492a5653c97fd770e90da4c..0b54f64fcc284de01161a912fa8d7aad821703bd 100644
Binary files a/src/images/card-back.png and b/src/images/card-back.png differ
diff --git a/src/images/icon.png b/src/images/icon.png
index 4b756db39463446f4151a2bfcdaca7d9661ca682..e549d6ff60e3f9b65211c2843739bc37b4cce6f5 100644
Binary files a/src/images/icon.png and b/src/images/icon.png differ