166 Commits

Author	SHA1	Message	Date
Perttu Ahola	3882536d40	merged some stuff from upstream while merging delta	2011-07-23 15:46:00 +03:00
Perttu Ahola	8993d9dd83	Jungle biome/whatever thing	2011-07-23 02:04:24 +03:00
Nils Dagsson Moskopp	805ccd449f	Merge branch 'upstream/master'	2011-07-22 20:16:58 +02:00
Perttu Ahola	fe855e004f	Fixed new map generator causing a crash when generating at map limit	2011-07-22 01:37:05 +03:00
Nils Dagsson Moskopp	2c5617709d	* regression fix, clay occurs again now	2011-07-15 06:37:47 +02:00
Nils Dagsson Moskopp	287b735224	* possibly nicer trees	2011-07-15 02:23:41 +02:00
Nils Dagsson Moskopp	3560f0de08	Merge branch 'upstream/master' ... Conflicts: data/oerkki1.png src/client.cpp	2011-07-14 22:43:28 +02:00
Nils Dagsson Moskopp	5383aa847f	* possible fix for large cubic holes in map	2011-07-13 23:12:18 +02:00
Nils Dagsson Moskopp	b96450b586	* slightly different values for 3d perlin noise	2011-07-13 23:10:41 +02:00
Nils Dagsson Moskopp	a676493f46	* regression fix, papyrus should appear again now	2011-07-13 16:21:20 +02:00
Perttu Ahola	3fccc67eb7	fixed block unloading from memory (a better fix coming next)	2011-06-26 21:53:11 +03:00
Perttu Ahola	af6860f6f4	tuned mapgen	2011-06-26 18:51:35 +03:00
Perttu Ahola	91cfbe2891	reorganized a lot of stuff and modified mapgen and objects slightly while doing it	2011-06-26 15:48:56 +03:00
Sebastian Rühl	7efe89ff58	backported cactus, papyrus and clay	2011-06-26 13:47:21 +02:00
Perttu Ahola	a80025c352	moved mapgen stuff around abit	2011-06-25 18:35:32 +03:00
Perttu Ahola	f2c26e2014	moved map generator to separate source files	2011-06-25 18:12:41 +03:00