Commit Graph
157 Commits
Author SHA1 Message Date
xrgman 297026bf11 fixed dots
🍡
2015-03-17 12:55:09 +01:00
aareschluchtje 140d5803ef added Food, edited the icons and changed the sprites 2015-03-17 12:42:36 +01:00
unknown a3479fc37a fix 2015-03-17 12:35:57 +01:00
unknown 2f53d1353f added stuff 2015-03-17 12:23:43 +01:00
kennyboy55 8bf08d4e1d Fixed KeyListeners 2015-03-17 11:51:16 +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
Yorick 583e447b81 KAAASS 2015-03-17 11:42:48 +00:00
Yorick 1eb4f8df41 Remove podium 2015-03-17 11:33:01 +00:00
kennyboy55 ecdb50320a Kenny Images added 2015-03-17 11:41:53 +01:00
kennyboy55 b551f91b90 Merged 2015-03-17 11:27:50 +01:00
Yorick fe8fb76759 Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-03-17 10:55:54 +00:00
Yorick ea487bd24f Dragging now works properly 2015-03-17 10:55:34 +00:00
kennyboy55 47f04ee68f Added actions 2015-03-17 11:24:51 +01:00
kennyboy55 fa146df5a6 Added super cool properties stuffz 2015-03-17 11:07:57 +01:00
xrgman f1e6abae76 added deleting object
🎯
2015-03-17 11:00:46 +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
Remco b9eb9965dc Changed to new Podium (Stage) 2015-03-17 10:30:10 +01:00
Yorick f6bb5a8f44 Rectangle rotating 2015-03-16 23:00:10 +01:00
Yorick dfee405657 succesfully merged Banaan 2015-03-16 22:21:52 +01:00
Yorick d08e226650 Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-03-16 21:29:47 +01:00
Yorick 99e52ebc1a Merge branch 'master' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-03-16 21:29:33 +01:00
xrgman c3ca87ad8f Added resizing and scrolling
Still buggs while dragging scaled.
2015-03-16 19:36:03 +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 836f058c85 Fixed nullpointerexceptions 2015-03-16 13:46:20 +00:00
Yorick d31272622c Merge branch 'master' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-03-16 13:43:30 +00:00
xrgman dccdccb573 update
try
2015-03-15 11:42:01 +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
Yorick 7e51fe541a Scrolling works, had boundaries, only draws an object when image is drawn, woo 2015-03-12 23:00:44 +00:00
aareschluchtje fefffeef19 added food sprite and resized wc 2015-03-12 23:52:53 +01:00
Yorick fa726f062e Scrolling added 2015-03-12 22:44:02 +00: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
Yorick be6aba1e38 Added images to Panel 2015-03-12 21:56:42 +00:00
Wesley ae35416cf9 Added border when selected 2015-03-12 22:10:15 +01:00
kennyboy55 08c411070d Added properties panel 2015-03-12 20:51:25 +01:00
guusvdongen 87bf6d9295 festivaldemo methodes
Tekenobject & podium moeten Serializable worden.
In tekenobject moet de image variablen een String filepath worden.
Dan kun je moet je voor elke methode in tekenobject waar je die image voor nodig had (Image image = new ImageIcon(filepath).getImage();) doen. Dit komt, omdat een image niet serializable is :(
2015-03-12 18:18:03 +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
guusvdongen a00ccbe085 Delete commons-lang3-3.3.2.jar 2015-03-12 18:13:27 +01:00
guusvdongen 835d126d80 Delete README.md 2015-03-12 18:13:22 +01:00
guusvdongen dd7893375e Agenda load/save fix 2015-03-12 18:12:25 +01:00
Yorick be342a5976 added dragbar 2015-03-11 21:50:15 +00:00
Yorick 72383c9ccc Fixed nullpointexeption 2015-03-11 20:40:10 +00:00
Yorick 034e052bfa listneners -> listeners 2015-03-11 19:10:57 +00:00
Yorick ef2c491872 Merge 2015-03-10 12:59:54 +00:00