Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
174 Commits 7 Branches 0 Tags
master
Commit Graph
77 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yorick 719d58aae9 done 2015-04-09 01:55:12 +02:00
Yorick 4897a9440b ohgodwhy 2015-04-09 01:30:38 +02:00
Yorick 2e947589be merge 2015-04-09 00:56:42 +02:00
Yorick 6178311c4b Merge remote-tracking branch 'origin/kenneth' into develop 2015-04-09 00:35:30 +02:00
Yorick 920fd8117e KUT 2015-04-09 00:33:18 +02:00
Yorick be53c1f138 kaas kenneth 2015-04-08 21:47:12 +02:00
Yorick a7d811f956 Merge remote-tracking branch 'origin/kenneth' into develop 2015-04-08 21:46:42 +02:00
Yorick f2f0b36d0e Load waypoints from filez 2015-04-08 21:45:27 +02:00
Yorick d3e9b578eb Merge banan dev 2015-04-08 21:37:48 +02:00
Yorick 8ba874bec6 visitors kinda working? 2015-04-08 21:29:17 +02:00
Yorick 19f48ad3e9 Merge remote-tracking branch 'origin/kenneth' into develop 2015-04-08 21:03:46 +02:00
Yorick 26265b5a3e Waypoint move 2015-04-08 21:03:29 +02:00
Yorick 8167fec369 WOOOOOOOOOOOOOOOOOOOO 2015-04-08 20:31:18 +02:00
Yorick bdcc40f00f Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-04-08 17:32:28 +02:00
Yorick d0c0b16585 kaas 2015-04-08 17:32:10 +02:00
Yorick 89036d27af Actions is nul wtf 2015-04-08 17:17:53 +02:00
Yorick b5cf44b44c woo 2015-04-08 16:46:02 +02:00
Yorick 547ebfbf6a Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-04-08 16:13:48 +02:00
Yorick d75016f9a9 FOLLOW WAYPOINT WOO 2015-04-08 16:13:28 +02:00
Yorick fc16b4c019 kut remco 2015-04-08 15:37:11 +02:00
Yorick ab91a7f1aa Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-04-08 15:12:49 +02:00
Yorick 07b083453c Follow waypoints added 2015-04-08 15:12:33 +02:00
Yorick a82809c959 Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-04-08 14:46:11 +02:00
Yorick f571189849 kaas 2015-04-08 14:46:08 +02:00
Yorick a6eb4578da Merge banaan dev 2015-04-08 14:27:19 +02:00
Yorick 420e596590 Waypoint kaas 2015-04-08 14:22:01 +02:00
Yorick a03463442c Merge guus dev 2015-04-08 13:24:41 +02:00
Yorick 9066d0212f icons 2015-04-08 13:14:52 +02:00
Yorick 1e5d95733f Merge kenneth dev 2015-04-08 13:11:22 +02:00
Yorick e1f88aba2d Waypointpopup 2015-04-08 12:59:49 +02:00
Yorick 2dcdc954ae Merge remote-tracking branch 'origin/kenneth' into develop 2015-04-08 12:43:11 +02:00
Yorick ad62094ee7 Working 2015-04-08 12:42:12 +02:00
Yorick 701f2aed4b merge kenneth dev 2015-04-08 11:22:01 +02:00
Yorick e31b44d43f Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-04-08 11:18:41 +02:00
Yorick 82a94ba456 Started with waypoints 2015-04-08 11:18:30 +02:00
Yorick 1f6811332e Visitors following paths..sort of.. 2015-04-07 22:01:07 +02:00
Yorick f2c1544d71 merge banaan dev 2015-04-07 19:35:38 +02:00
Yorick 32de28204c halverwege 2015-04-07 19:32:10 +02:00
Yorick d6b511bab5 Merge guus dev 2015-04-07 15:30:17 +02:00
Yorick d60924a05b Merge banaan dev 2015-04-07 15:22:28 +02:00
Yorick ad4eacc20c kaas 2015-04-07 15:06:20 +02:00
Yorick 284823c28b hi 2015-04-07 14:49:00 +02:00
Yorick 41b4c5db8f Added several thingz 2015-04-07 14:31:44 +02:00
Yorick cba61d4dc5 Merge guus dev 2015-04-07 13:59:34 +02:00
Yorick 5a0def924a Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop 2015-04-07 13:13:00 +02:00
Yorick ea7ecfcd56 Saven werkt van guus 2015-04-07 13:12:02 +02:00
Yorick 5a9c3f259a oops 2015-04-07 12:12:42 +02:00
Yorick 3920354ae2 Kaas 2015-04-07 12:00:04 +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
Yorick df8fdd803b Merged banaan and develop 2015-03-24 09:58:21 +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
Yorick a0a0e604a9 kaas 2015-03-17 13:21:43 +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
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
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
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
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
Yorick fa726f062e Scrolling added 2015-03-12 22:44:02 +00:00
Yorick be6aba1e38 Added images to Panel 2015-03-12 21:56:42 +00: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
Yorick a315bdda59 Fixed 2015-03-10 12:55:02 +00:00
Yorick 907ae4bf29 Added jar 2015-03-10 10:24:30 +00:00