Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
157 Commits 7 Branches 0 Tags
d3e9b578ebee237e8ff49760e1cc1314e00a867d
Commit Graph
36 Commits
Author SHA1 Message Date
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
Yorick b5cf44b44c woo 2015-04-08 16:46:02 +02:00
kennyboy55 a360286c48 Stuff 2015-04-08 13:16:12 +02:00
Yorick 9066d0212f icons 2015-04-08 13:14:52 +02:00
kennyboy55 9cce659329 Added new textures 2015-04-08 12:55:38 +02:00
Remco 8ed04d356a Added new Waypoint sprite 
Als ie niet goed is moet je het zeggen
 2015-04-08 10:29:42 +02:00
Yorick f2c1544d71 merge banaan dev 2015-04-07 19:35:38 +02:00
xrgman 5ec737e707 Added images 2015-04-07 16:08:05 +02:00
Yorick d60924a05b Merge banaan dev 2015-04-07 15:22:28 +02:00
xrgman 65f428c572 New terrain 2015-04-07 14:56:59 +02:00
unknown 0535d98427 ok 2015-04-07 14:29:24 +02:00
Yorick 6f58084554 Merge kenneth en develop 2015-04-07 11:55:55 +02:00
Yorick c8c1d85eba Merge banaan en develop 2015-04-07 11:35:05 +02:00
Remco 30192ec4aa Added Sprite Visitor 2015-04-06 11:39:10 +02:00
kennyboy55 65cd07af6f Removing useless stuff 2015-04-04 11:02:05 +02:00
Wesley a45d37a4d5 Added path's 
works but allot is edited
 2015-04-02 23:31:48 +02:00
aareschluchtje 140d5803ef added Food, edited the icons and changed the sprites 2015-03-17 12:42:36 +01:00
unknown 2f53d1353f added stuff 2015-03-17 12:23:43 +01:00
kennyboy55 ddf5e4e908 Merge branch 'kenneth' into develop 2015-03-17 11:45:47 +01:00
kennyboy55 fd6e334649 Updated images 2015-03-17 11:45:31 +01:00
kennyboy55 47345f70c4 Merge branch 'kenneth' into develop 2015-03-17 11:43:01 +01:00
kennyboy55 ecdb50320a Kenny Images added 2015-03-17 11:41:53 +01:00
aareschluchtje c00a542ffc Edited StageIcon 2015-03-17 10:49:06 +01:00
aareschluchtje 01b538b3b4 Added Alpha 2015-03-17 10:39:07 +01:00
Yorick 99e52ebc1a Merge branch 'master' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-03-16 21:29:33 +01:00
aareschluchtje 87fb690de7 Also added a resize to the new Stage sprite 2015-03-16 17:49:11 +01:00
aareschluchtje ceaabb37c7 New resized sprites 2015-03-16 17:43:22 +01:00
Yorick 388021d93d Succesful merge but with nullpointerexceptions 2015-03-13 08:53:46 +00:00
Yorick 23020d03b6 Added some icons and implemented them 2015-03-12 23:42:06 +00:00
aareschluchtje fefffeef19 added food sprite and resized wc 2015-03-12 23:52:53 +01:00
aareschluchtje d0f9601737 smaller path 2015-03-12 23:20:21 +01:00
aareschluchtje 33f0105337 new horrible sprites 2015-03-12 23:16:43 +01:00
guusvdongen a89feaaaab Delete selection.png 2015-03-12 18:14:00 +01:00
guusvdongen df02d793eb Delete grass.jpg 2015-03-12 18:13:42 +01:00
kennyboy55 9f2fee9f20 Updated to new Johan version 2015-03-10 12:02:12 +01:00
kennyboy55 c7ef130187 First Commit 2015-03-03 13:03:36 +01:00