Commit graph

30 commits

Author SHA1 Message Date
EEva
ee97f86dfb Adding final zmap 2013-07-18 02:02:10 +02:00
Fabien
00c6731815 add profit 2013-07-18 01:14:36 +02:00
Fabien
2c1f7d4b41 Adding average profit 2013-07-18 00:33:43 +02:00
EEva
f685ff89a6 Adding zmap 2013-07-17 23:58:24 +02:00
EEva
796d085aca BMODEL + 1 2013-07-17 21:12:45 +02:00
EEva
a9a8fa2124 merge 2013-07-17 20:30:56 +02:00
mmoriame
095691f935 adding correction 2013-07-17 20:26:38 +02:00
EEva
184a2e008d merge 2013-07-17 20:23:15 +02:00
mmoriame
dde9b40764 adding age again 2013-07-17 20:19:43 +02:00
EEva
4763ad436f Fixing collective strategy 2013-07-17 19:09:00 +02:00
EEva
c6559c220c Fixing 2013-07-17 19:00:55 +02:00
Fabien
dea74c75ed strategy button filled 2013-07-17 18:41:57 +02:00
Fabien
7bb80721f2 Merge branch 'master' of https://github.com/mpo-csss/beedza
Conflicts:
	Source/main.nlogo
2013-07-17 18:40:39 +02:00
mmoriame
69552b753f adding color to bee-keeper 2013-07-17 18:37:37 +02:00
Fabien
2c1d9710ba Adding strategy chooser 2013-07-17 18:36:47 +02:00
mmoriame
f9e3b0f276 adding bee-keepers in centroid 2013-07-17 18:06:53 +02:00
mmoriame
4413649e21 adding bee-keepers 2013-07-17 17:36:04 +02:00
EEva
2f2eaff0d9 useless comment 2013-07-17 17:32:08 +02:00
EEva
f65708f28e Adding yearly seasons 2013-07-17 17:17:09 +02:00
EEva
31265af4fb Adding seasons 2013-07-17 16:10:47 +02:00
EEva
de7593936d Putting up together again the main file 2013-07-17 11:56:02 +02:00
EEva
1d814b0ca1 Restructuring (2nd pass) 2013-07-17 11:33:47 +02:00
EEva
5da047679f Structuring 2013-07-17 11:12:09 +02:00
EEva
e64d1644a1 Finishing GIS integration 2013-07-16 21:53:39 +02:00
Vincenzo Cardile
0c582c99c3 added comment 2013-07-15 18:25:51 +02:00
EEva
527853ff66 Balancing time-to-live etc. 2013-07-15 15:10:59 +02:00
EEva
3ad955811b Adding life/death for hives 2013-07-15 12:29:52 +02:00
EEva
c32c353b01 Adding pollinisation 2013-07-12 22:33:23 +02:00
EEva
eb9d5ebbfa Basic 2nd layer 2013-07-12 16:33:17 +02:00
EEva
ef2d33045e Empty source file to start with 2013-07-11 01:05:44 +02:00