Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
Conflicts:
	image/Images.java
	model/gameState/TitleState.java
This commit is contained in:
Dofensmirtsz
2015-06-08 14:22:44 +02:00
parent ad81242081 38a0bc4620
commit 44f50f2698
19 changed files with 289 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image/Images.java
+1 -3
View File
@@ -31,8 +31,6 @@ public class Images {
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/colorstrike.png"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/background.png"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/aanwijzers4sho.png"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/MenuAchtergrond.png"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/SubmenuAchtergrond.png"))));
images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/kast.png"))));
} catch (IOException e) {
e.printStackTrace();
@@ -44,7 +42,7 @@ public class Images {
}
public enum ImageType {
pulse,cursor,pressstart,colorstrike,background,aanwijzers,menuachtergrond,subMenu,kast
pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast
}
public static BufferedImage readImage(File f) {