Commit Graph
121 Commits
Author SHA1 Message Date
Yorick 3920354ae2 Kaas 2015-04-07 12:00:04 +02:00
xrgman b2b2388f6f zooi 2015-04-07 11:58:36 +02:00
Remco bcbc9b1027 kaas 2015-04-07 11:58:32 +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
kennyboy55 a138807c2a Fixed collision and updated to WCS (Wesley Code Standard) 2015-04-06 16:44:21 +02:00
kennyboy55 fe5a8a5c2d Improved code structure. 2015-04-06 16:28:14 +02:00
kennyboy55 24790d8d19 Added area in Objects and made new panel for changing them. 2015-04-06 16:27:49 +02:00
kennyboy55 7e5c09da58 Starting with area 2015-04-06 15:31:21 +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
Wesley 040859ac2a Fixed overlapping and locked rotating rektangle.
Keep the rectangle its good enoguh.
2015-03-31 17:07:26 +02:00
Yorick df8fdd803b Merged banaan and develop 2015-03-24 09:58:21 +01:00
xrgman 10951fe225 fixed overlapping objects
banaan
2015-03-18 12:51:30 +01:00
xrgman 34bc4526fc Added red rectangle when over another object
fancy pansy
2015-03-17 16:59:43 +01:00
Yorick 8131464be7 SCrolling limited woo 2015-03-17 14:12:39 +01:00
Yorick d0c92db9f7 STAGE 4 2015-03-17 13:41:01 +01:00
Yorick f289bec571 KAas 2015-03-17 13:39:16 +01:00
Yorick 6dec40e70a Woo 2015-03-17 13:28:01 +01:00
kennyboy55 c21af8db1a Fixed actionlisteners 2015-03-17 13:27:21 +01:00
Yorick a0a0e604a9 kaas 2015-03-17 13:21:43 +01:00
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
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