Commit Graph
100 Commits
Author SHA1 Message Date
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
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
xrgman 5ec737e707 Added images 2015-04-07 16:08:05 +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
xrgman 65f428c572 New terrain 2015-04-07 14:56:59 +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
kennyboy55 050493a70b Try to fix camera zoom motion. Needs attention 2015-04-07 13:58:29 +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
kennyboy55 2d56ac1b89 Added Control Panel and improved Properties Panel. 2015-04-07 13:05:13 +02:00
xrgman 1684976a47 fixed nullpointer 2015-04-07 12:13:40 +02:00
Yorick 5a9c3f259a oops 2015-04-07 12:12:42 +02:00
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