 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 |
|
 Remco
|
a6f32b5739
|
Editing disabled while running simulator
|
2015-04-09 00:51:18 +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 |
|
 kennyboy55
|
8a92a7a571
|
Added Stages to save file.
Remove selection from save.
|
2015-04-08 22:42:40 +02:00 |
|
|
kennyboy55
|
1563368bf8
|
removed pause button
|
2015-04-08 22:06:50 +02:00 |
|
|
kennyboy55
|
eab4aedc1d
|
Added text to button actions
|
2015-04-08 21:53: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 |
|
|
kennyboy55
|
04fa453e49
|
Added agenda stuff
|
2015-04-08 21:45:03 +02:00 |
|
|
Remco
|
9d88f92a98
|
Deleted useless exclamation points
|
2015-04-08 21:38:04 +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 |
|
 Wesley
|
4c11d4ad2f
|
fixed stuff
lol
|
2015-04-08 21:25:08 +02:00 |
|
 guusvdongen
|
911714f9b5
|
Update Visitor.java
|
2015-04-08 21:15:45 +02:00 |
|
|
Wesley
|
77dae9741e
|
added addPeoplePanel
|
2015-04-08 21:07:59 +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 |
|
|
kennyboy55
|
457da54a5c
|
Fixed agenda module sync
|
2015-04-08 21:01:13 +02:00 |
|
|
kennyboy55
|
c3973cc4e4
|
Fixed stuff
|
2015-04-08 20:57:06 +02:00 |
|
|
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 |
|
 unknown
|
254167ba15
|
print out line op
|
2015-04-08 17:40:22 +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 |
|
|
unknown
|
b8a7d9c02d
|
change
|
2015-04-08 17:24:29 +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 |
|