Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
149 Commits 7 Branches 0 Tags
d0baf5673fc78d4e445b583496bfee9b4a9f369f
Commit Graph
149 Commits
This Branch
This Branch
All Branches
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 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
Remco 6f265063b4 Edited Waypointpopup 2015-04-08 17:31:06 +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
kennyboy55 7a6bca5ed3 Merge branch 'kenneth' of https://github.com/ProjectgroepA4/FestivalPlanner into kenneth 2015-04-08 16:39:23 +02:00
kennyboy55 9d853babdc Combined Agenda 2015-04-08 16:38:55 +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
Remco 13ab1900d2 Added Cancel button 2015-04-08 15:57:55 +02:00
unknown 69c05da3fd laatste versie 2015-04-08 15:56:46 +02:00
Remco 7ffc00110f Added PathPopup 2015-04-08 15:46:19 +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
Remco 867486f6ad bugfix WayPoint 2015-04-08 14:47:49 +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
Remco 7c66edad14 WayPoint popup edited 2015-04-08 14:35:46 +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
xrgman 7c28dd3a16 spawn 
hoi
 2015-04-08 14:03:58 +02:00
kennyboy55 b50c4d2c33 Objects can no longer move outside field 2015-04-08 13:51:01 +02:00
Yorick a03463442c Merge guus dev 2015-04-08 13:24:41 +02:00
kennyboy55 a360286c48 Stuff 2015-04-08 13:16:12 +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
unknown c2cb07cf3e ok 2015-04-08 13:11:16 +02:00
Yorick e1f88aba2d Waypointpopup 2015-04-08 12:59:49 +02:00
kennyboy55 4e277e7d5f Added new keyboard controls 2015-04-08 12:55:51 +02:00
kennyboy55 9cce659329 Added new textures 2015-04-08 12:55:38 +02:00
kennyboy55 3d0324e80b Fixed focus 2015-04-08 12:55:07 +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
unknown 90ca17e28a ok 2015-04-08 12:13:39 +02:00
kennyboy55 0c9d41585c Attempt to fix focus problem. Fixed path selection 2015-04-08 11:48:29 +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
kennyboy55 2a8ff8e29a Entrance now snaps to side. 2015-04-08 11:18:25 +02:00
kennyboy55 33bb880018 Fixed scale 2015-04-08 10:55:23 +02:00
kennyboy55 a164f7b781 Improved Agenda module 2015-04-08 10:55:16 +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 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
xrgman 98af73b15e fixed stuff 2015-04-07 17:07:32 +02:00
kennyboy55 0c59eb5dd3 Stuff 2015-04-07 16:11:20 +02:00