kennyboy55 d0baf5673f Merge branch 'kenneth' of https://github.com/ProjectgroepA4/FestivalPlanner into kenneth ...

Conflicts:
	Applicatie/Panel.java
	Applicatie/Visitor.java
	Applicatie/WaypointPopup.java
	Listeners/Mouse.java

2015-04-08 20:55:44 +02:00

..

entrance.png

ok

2015-04-07 14:29:24 +02:00

entranceIcon.png

ok

2015-04-07 14:29:24 +02:00

food.png

ok

2015-04-07 14:29:24 +02:00

foodIcon.png

added Food, edited the icons and changed the sprites

2015-03-17 12:42:36 +01:00

grass2.png

Added new textures

2015-04-08 12:55:38 +02:00

grassIcon2.png

Added new textures

2015-04-08 12:55:38 +02:00

grassIcon.jpg

Added images

2015-04-07 16:08:05 +02:00

newPath.png

Added path's

2015-04-02 23:31:48 +02:00

sand2.jpg

Added new textures

2015-04-08 12:55:38 +02:00

sand.jpg

New terrain

2015-04-07 14:56:59 +02:00

sandIcon2.jpg

Added new textures

2015-04-08 12:55:38 +02:00

sandIcon.jpg

Added new textures

2015-04-08 12:55:38 +02:00

stage4.png

ok

2015-04-07 14:29:24 +02:00

stageIcon.png

Stuff

2015-04-08 13:16:12 +02:00

stone.jpg

Added new textures

2015-04-08 12:55:38 +02:00

stoneIcon.jpg

Added new textures

2015-04-08 12:55:38 +02:00

Visitor.png

Added Sprite Visitor

2015-04-06 11:39:10 +02:00

wall.png

ok

2015-04-07 14:29:24 +02:00

wallIcon.png

ok

2015-04-07 14:29:24 +02:00

waypoint.png

icons

2015-04-08 13:14:52 +02:00

waypointIcon.png

icons

2015-04-08 13:14:52 +02:00

wc.png

ok

2015-04-07 14:29:24 +02:00

wcIcon.png

ok

2015-04-07 14:29:24 +02:00