From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Thu, 14 Jul 2011 20:43:22 +0000 (+0200)
Subject: Merge branch 'upstream/master'
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=3560f0de082a8950a84e2e866981f8bdfd05428a;p=zefram%2Fminetest%2Fminetest_engine.git

Merge branch 'upstream/master'

Conflicts:
	data/oerkki1.png
	src/client.cpp
---

3560f0de082a8950a84e2e866981f8bdfd05428a
diff --cc src/defaultsettings.cpp
index ac1983ed,cda9eb79..cbc78ad3
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@@ -68,10 -70,9 +70,11 @@@ void set_default_settings(
  	g_settings.setDefault("fast_move", "false");
  	g_settings.setDefault("invert_mouse", "false");
  	g_settings.setDefault("enable_farmesh", "false");
 +	g_settings.setDefault("farmesh_trees", "true");
 +	g_settings.setDefault("farmesh_distance", "40");
  	g_settings.setDefault("enable_clouds", "true");
  	g_settings.setDefault("invisible_stone", "false");
+ 	g_settings.setDefault("screenshot_path", ".");
  
  	// Server stuff
  	g_settings.setDefault("enable_experimental", "false");
diff --cc src/mapgen.cpp
index a491ac81,4a2a39ae..d7b6e56c
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@@ -894,17 -898,19 +926,19 @@@ NoiseParams get_cave_noise2_params(u64 
  {
  	/*return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 5, 0.7,
  			200, CAVE_NOISE_SCALE);*/
- 	return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 4, 0.7,
- 			100, CAVE_NOISE_SCALE);
+ 	/*return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 4, 0.7,
+ 			100, CAVE_NOISE_SCALE);*/
+ 	/*return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 5, 0.3,
+ 			100, CAVE_NOISE_SCALE);*/
+ 	return NoiseParams(NOISE_PERLIN_CONTOUR_FLIP_YZ, seed+10325, 4, 0.5,
+ 			50, CAVE_NOISE_SCALE);
+ 	//return NoiseParams(NOISE_CONSTANT_ONE);
  }
  
- //#define CAVE_NOISE_THRESHOLD (2.5/CAVE_NOISE_SCALE)
- #define CAVE_NOISE_THRESHOLD (2.0/CAVE_NOISE_SCALE)
- 
  NoiseParams get_ground_noise1_params(u64 seed)
  {
 -	return NoiseParams(NOISE_PERLIN, seed+983240, 5,
 -			0.60, 100.0, 30.0);
 +	return NoiseParams(NOISE_PERLIN, seed+983240, 4,
 +			0.55, 80.0, 40.0);
  }
  
  NoiseParams get_ground_crumbleness_params(u64 seed)
@@@ -937,9 -943,9 +971,9 @@@ bool val_is_ground(double ground_noise1
  {
  	//return ((double)p.Y < ground_noise1_val);
  
- 	double f = 0.8 + noise2d_perlin(
+ 	double f = 0.55 + noise2d_perlin(
  			0.5+(float)p.X/250, 0.5+(float)p.Z/250,
 -			seed+920381, 3, 0.5);
 +			seed+920381, 3, 0.45);
  	if(f < 0.01)
  		f = 0.01;
  	else if(f >= 1.0)