Commit Graph

Select branches

Hide Pull Requests

Banaan

develop

guus

kenneth

master

remco

yorick

Mono Color

• 5d0ae9ca98 final commit develop Yorick 2015-04-09 09:29:13 +02:00
• 719d58aae9 done master Yorick 2015-04-09 01:55:12 +02:00
• 4897a9440b ohgodwhy Yorick 2015-04-09 01:30:38 +02:00
• 2e947589be merge Yorick 2015-04-09 00:56:42 +02:00
• a6f32b5739 Editing disabled while running simulator Remco 2015-04-09 00:51:18 +02:00
• 6178311c4b Merge remote-tracking branch 'origin/kenneth' into develop Yorick 2015-04-09 00:35:30 +02:00
• 920fd8117e KUT Yorick 2015-04-09 00:33:18 +02:00
• 73300b3cc1 iets remco Remco 2015-04-08 23:21:46 +02:00
• a8660820e3 disabled editting while watching simulation Remco 2015-04-08 23:21:10 +02:00
• 8a92a7a571 Added Stages to save file. Remove selection from save. kenneth kennyboy55 2015-04-08 22:42:40 +02:00
• 1563368bf8 removed pause button kennyboy55 2015-04-08 22:06:50 +02:00
• eab4aedc1d Added text to button actions kennyboy55 2015-04-08 21:53:18 +02:00
• be53c1f138 kaas kenneth Yorick 2015-04-08 21:47:12 +02:00
• a7d811f956 Merge remote-tracking branch 'origin/kenneth' into develop Yorick 2015-04-08 21:46:42 +02:00
• f2f0b36d0e Load waypoints from filez Yorick 2015-04-08 21:45:27 +02:00
• 04fa453e49 Added agenda stuff kennyboy55 2015-04-08 21:45:03 +02:00
• 9d88f92a98 Deleted useless exclamation points Remco 2015-04-08 21:37:43 +02:00
• d3e9b578eb Merge banan dev Yorick 2015-04-08 21:37:48 +02:00
• 8ba874bec6 visitors kinda working? Yorick 2015-04-08 21:29:17 +02:00
• 4c11d4ad2f fixed stuff Banaan Wesley 2015-04-08 21:25:08 +02:00
• 911714f9b5 Update Visitor.java guus guusvdongen 2015-04-08 21:15:45 +02:00
• 77dae9741e added addPeoplePanel Wesley 2015-04-08 21:07:59 +02:00
• 19f48ad3e9 Merge remote-tracking branch 'origin/kenneth' into develop Yorick 2015-04-08 21:03:46 +02:00
• 26265b5a3e Waypoint move Yorick 2015-04-08 21:03:29 +02:00
• 457da54a5c Fixed agenda module sync kennyboy55 2015-04-08 21:01:13 +02:00
• c3973cc4e4 Fixed stuff kennyboy55 2015-04-08 20:57:06 +02:00
• d0baf5673f Merge branch 'kenneth' of https://github.com/ProjectgroepA4/FestivalPlanner into kenneth kennyboy55 2015-04-08 20:55:44 +02:00
• 8167fec369 WOOOOOOOOOOOOOOOOOOOO Yorick 2015-04-08 20:31:18 +02:00
• 254167ba15 print out line op unknown 2015-04-08 17:40:22 +02:00
• bdcc40f00f Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop Yorick 2015-04-08 17:32:28 +02:00
• d0c0b16585 kaas Yorick 2015-04-08 17:32:10 +02:00
• 6f265063b4 Edited Waypointpopup Remco 2015-04-08 17:31:06 +02:00
• b8a7d9c02d change unknown 2015-04-08 17:24:29 +02:00
• 89036d27af Actions is nul wtf Yorick 2015-04-08 17:17:53 +02:00
• b5cf44b44c woo Yorick 2015-04-08 16:46:02 +02:00
• 2eb2d0825c nieuwe shit Remco 2015-04-08 16:39:23 +02:00
• 7a6bca5ed3 Merge branch 'kenneth' of https://github.com/ProjectgroepA4/FestivalPlanner into kenneth kennyboy55 2015-04-08 16:39:23 +02:00
• 9d853babdc Combined Agenda kennyboy55 2015-04-08 16:38:55 +02:00
• 547ebfbf6a Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop Yorick 2015-04-08 16:13:48 +02:00
• d75016f9a9 FOLLOW WAYPOINT WOO Yorick 2015-04-08 16:13:28 +02:00
• 13ab1900d2 Added Cancel button Remco 2015-04-08 15:57:55 +02:00
• 69c05da3fd laatste versie unknown 2015-04-08 15:56:46 +02:00
• 7ffc00110f Added PathPopup Remco 2015-04-08 15:46:19 +02:00
• fc16b4c019 kut remco Yorick 2015-04-08 15:37:11 +02:00
• ab91a7f1aa Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop Yorick 2015-04-08 15:12:49 +02:00
• 07b083453c Follow waypoints added Yorick 2015-04-08 15:12:33 +02:00
• 867486f6ad bugfix WayPoint Remco 2015-04-08 14:47:49 +02:00
• a82809c959 Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop Yorick 2015-04-08 14:46:11 +02:00
• f571189849 kaas Yorick 2015-04-08 14:46:08 +02:00
• 7c66edad14 WayPoint popup edited Remco 2015-04-08 14:35:46 +02:00
• a6eb4578da Merge banaan dev Yorick 2015-04-08 14:27:19 +02:00
• 420e596590 Waypoint kaas Yorick 2015-04-08 14:22:01 +02:00
• 7c28dd3a16 spawn xrgman 2015-04-08 14:03:58 +02:00
• b50c4d2c33 Objects can no longer move outside field kennyboy55 2015-04-08 13:51:01 +02:00
• a03463442c Merge guus dev Yorick 2015-04-08 13:24:41 +02:00
• a360286c48 Stuff kennyboy55 2015-04-08 13:16:12 +02:00
• 9066d0212f icons Yorick 2015-04-08 13:14:52 +02:00
• 1e5d95733f Merge kenneth dev Yorick 2015-04-08 13:11:22 +02:00
• c2cb07cf3e ok unknown 2015-04-08 13:11:16 +02:00
• e1f88aba2d Waypointpopup Yorick 2015-04-08 12:59:49 +02:00
• 4e277e7d5f Added new keyboard controls kennyboy55 2015-04-08 12:55:51 +02:00
• 9cce659329 Added new textures kennyboy55 2015-04-08 12:55:38 +02:00
• 3d0324e80b Fixed focus kennyboy55 2015-04-08 12:55:07 +02:00
• 2dcdc954ae Merge remote-tracking branch 'origin/kenneth' into develop Yorick 2015-04-08 12:43:11 +02:00
• ad62094ee7 Working Yorick 2015-04-08 12:42:12 +02:00
• 90ca17e28a ok unknown 2015-04-08 12:13:39 +02:00
• 0c9d41585c Attempt to fix focus problem. Fixed path selection kennyboy55 2015-04-08 11:48:29 +02:00
• 701f2aed4b merge kenneth dev Yorick 2015-04-08 11:22:01 +02:00
• e31b44d43f Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop Yorick 2015-04-08 11:18:41 +02:00
• 82a94ba456 Started with waypoints Yorick 2015-04-08 11:18:30 +02:00
• 2a8ff8e29a Entrance now snaps to side. kennyboy55 2015-04-08 11:18:25 +02:00
• 33bb880018 Fixed scale kennyboy55 2015-04-08 10:55:23 +02:00
• a164f7b781 Improved Agenda module kennyboy55 2015-04-08 10:55:16 +02:00
• 8ed04d356a Added new Waypoint sprite Remco 2015-04-08 10:29:42 +02:00
• 1f6811332e Visitors following paths..sort of.. Yorick 2015-04-07 22:01:07 +02:00
• f2c1544d71 merge banaan dev Yorick 2015-04-07 19:35:38 +02:00
• 32de28204c halverwege Yorick 2015-04-07 19:32:10 +02:00
• 98af73b15e fixed stuff xrgman 2015-04-07 17:07:32 +02:00
• 0c59eb5dd3 Stuff kennyboy55 2015-04-07 16:11:20 +02:00
• 5ec737e707 Added images xrgman 2015-04-07 16:08:05 +02:00
• d6b511bab5 Merge guus dev Yorick 2015-04-07 15:30:17 +02:00
• d60924a05b Merge banaan dev Yorick 2015-04-07 15:22:28 +02:00
• ad4eacc20c kaas Yorick 2015-04-07 15:06:20 +02:00
• c29ccec789 ok unknown 2015-04-07 14:58:47 +02:00
• 65f428c572 New terrain xrgman 2015-04-07 14:56:59 +02:00
• 284823c28b hi Yorick 2015-04-07 14:49:00 +02:00
• 41b4c5db8f Added several thingz Yorick 2015-04-07 14:31:44 +02:00
• 0535d98427 ok unknown 2015-04-07 14:29:24 +02:00
• cba61d4dc5 Merge guus dev Yorick 2015-04-07 13:59:34 +02:00
• 050493a70b Try to fix camera zoom motion. Needs attention kennyboy55 2015-04-07 13:58:29 +02:00
• 5a0def924a Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop Yorick 2015-04-07 13:13:00 +02:00
• ea7ecfcd56 Saven werkt van guus Yorick 2015-04-07 13:12:02 +02:00
• 2d56ac1b89 Added Control Panel and improved Properties Panel. kennyboy55 2015-04-07 13:05:13 +02:00
• a2110d3e58 ok unknown 2015-04-07 12:36:14 +02:00
• 1684976a47 fixed nullpointer xrgman 2015-04-07 12:13:40 +02:00
• 5a9c3f259a oops Yorick 2015-04-07 12:12:42 +02:00
• 3920354ae2 Kaas Yorick 2015-04-07 12:00:04 +02:00
• b2b2388f6f zooi xrgman 2015-04-07 11:58:36 +02:00
• bcbc9b1027 kaas Remco 2015-04-07 11:58:27 +02:00
• 6f58084554 Merge kenneth en develop Yorick 2015-04-07 11:55:55 +02:00