From df3c925b3ccae3bdba125e6dc3ecc740739baeab Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Fri, 8 Feb 2013 22:54:01 +0200 Subject: Improved Player Physics --- src/defaultsettings.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index a164d0693..1c673f76c 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -172,6 +172,20 @@ void set_default_settings(Settings *settings) settings->setDefault("congestion_control_max_rate", "400"); settings->setDefault("congestion_control_min_rate", "10"); settings->setDefault("remote_media", ""); + + // physics stuff + settings->setDefault("movement_acceleration_default", "2"); + settings->setDefault("movement_acceleration_air", "0.5"); + settings->setDefault("movement_acceleration_fast", "8"); + settings->setDefault("movement_speed_walk", "4"); + settings->setDefault("movement_speed_crouch", "1.35"); + settings->setDefault("movement_speed_fast", "20"); + settings->setDefault("movement_speed_climb", "2"); + settings->setDefault("movement_speed_jump", "6.5"); + settings->setDefault("movement_liquid_fluidity", "1"); + settings->setDefault("movement_liquid_fluidity_smooth", "0.5"); + settings->setDefault("movement_liquid_sink", "10"); + settings->setDefault("movement_gravity", "9.81"); //mapgen related things settings->setDefault("mg_name", "v6"); -- cgit v1.2.3 From 30b9a4d6b479ecfcb84d4803f5d15ee9b6c7edd6 Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Sun, 3 Feb 2013 16:19:09 +0400 Subject: Add Freetype support --- src/defaultsettings.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 1c673f76c..aebdc0aa8 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "settings.h" +#include "filesys.h" void set_default_settings(Settings *settings) { @@ -132,6 +133,11 @@ void set_default_settings(Settings *settings) settings->setDefault("serverlist_url", "servers.minetest.ru/server.list"); settings->setDefault("serverlist_file", "favoriteservers.txt"); + settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf")); + settings->setDefault("font_size", "13"); + settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf")); + settings->setDefault("mono_font_size", "13"); + // Server stuff // "map-dir" doesn't exist by default. settings->setDefault("default_game", "minetest"); -- cgit v1.2.3 From 65cb318cd98de572c3423122d71a1478959d87b1 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 15 Feb 2013 22:21:23 +0200 Subject: Restore old acceleration behavior until something is actually agreed on --- src/defaultsettings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index aebdc0aa8..5786858fc 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -180,9 +180,9 @@ void set_default_settings(Settings *settings) settings->setDefault("remote_media", ""); // physics stuff - settings->setDefault("movement_acceleration_default", "2"); - settings->setDefault("movement_acceleration_air", "0.5"); - settings->setDefault("movement_acceleration_fast", "8"); + settings->setDefault("movement_acceleration_default", "4"); + settings->setDefault("movement_acceleration_air", "4"); + settings->setDefault("movement_acceleration_fast", "4"); settings->setDefault("movement_speed_walk", "4"); settings->setDefault("movement_speed_crouch", "1.35"); settings->setDefault("movement_speed_fast", "20"); -- cgit v1.2.3 From c88d89d26edb0d7864feb1b8b1d8e79c765ae0ef Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 15 Feb 2013 23:18:19 +0200 Subject: Some kind of middleway values for player acceleration for now --- src/defaultsettings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 5786858fc..e3c6b2f7d 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -180,9 +180,9 @@ void set_default_settings(Settings *settings) settings->setDefault("remote_media", ""); // physics stuff - settings->setDefault("movement_acceleration_default", "4"); - settings->setDefault("movement_acceleration_air", "4"); - settings->setDefault("movement_acceleration_fast", "4"); + settings->setDefault("movement_acceleration_default", "3"); + settings->setDefault("movement_acceleration_air", "2"); + settings->setDefault("movement_acceleration_fast", "10"); settings->setDefault("movement_speed_walk", "4"); settings->setDefault("movement_speed_crouch", "1.35"); settings->setDefault("movement_speed_fast", "20"); -- cgit v1.2.3 From ee07c3f7cf638e854518d2cfcb9c11a64412cc72 Mon Sep 17 00:00:00 2001 From: proller Date: Fri, 22 Feb 2013 02:00:44 +0400 Subject: new auto masterserver --- src/defaultsettings.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index e3c6b2f7d..d3a455ccb 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -130,8 +130,13 @@ void set_default_settings(Settings *settings) settings->setDefault("media_fetch_threads", "8"); - settings->setDefault("serverlist_url", "servers.minetest.ru/server.list"); + settings->setDefault("serverlist_url", "servers.minetest.net"); settings->setDefault("serverlist_file", "favoriteservers.txt"); + settings->setDefault("server_announce", "false"); + settings->setDefault("server_url", ""); + settings->setDefault("server_address", ""); + settings->setDefault("server_name", ""); + settings->setDefault("server_description", ""); settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf")); settings->setDefault("font_size", "13"); -- cgit v1.2.3 From 7f240aea1e55b0714e80ef6ab7172b58b0729f75 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 8 Feb 2013 21:52:23 -0500 Subject: Added debug log level setting --- src/defaultsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index d3a455ccb..6cdaaa496 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -183,7 +183,7 @@ void set_default_settings(Settings *settings) settings->setDefault("congestion_control_max_rate", "400"); settings->setDefault("congestion_control_min_rate", "10"); settings->setDefault("remote_media", ""); - + settings->setDefault("debug_log_level", "0"); // physics stuff settings->setDefault("movement_acceleration_default", "3"); settings->setDefault("movement_acceleration_air", "2"); -- cgit v1.2.3 From b90e431fc785961e7913023999d1f570ad7ca151 Mon Sep 17 00:00:00 2001 From: proller Date: Sun, 24 Feb 2013 18:39:07 +0400 Subject: new adjustable finite liquid --- src/defaultsettings.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 6cdaaa496..f2c9886b4 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -201,6 +201,11 @@ void set_default_settings(Settings *settings) //mapgen related things settings->setDefault("mg_name", "v6"); settings->setDefault("water_level", "1"); + settings->setDefault("liquid_finite", "false"); + settings->setDefault("liquid_update", "1.0"); + settings->setDefault("liquid_relax", "1"); + settings->setDefault("liquid_fast_flood", "1"); + settings->setDefault("chunksize", "5"); settings->setDefault("mg_flags", "trees, caves, v6_biome_blend"); settings->setDefault("mgv6_freq_desert", "0.45"); -- cgit v1.2.3 From 497ff1ecd64c8908f988e15ca879824f2781e3fd Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sun, 24 Feb 2013 18:40:43 +0100 Subject: Change Minetest-c55 to Minetest --- src/defaultsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 6cdaaa496..73a0893e1 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -1,5 +1,5 @@ /* -Minetest-c55 +Minetest Copyright (C) 2010 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -- cgit v1.2.3 From 6d0ea26c2d62c3774ff384cf1bfc2a3372b49a3b Mon Sep 17 00:00:00 2001 From: Sfan5 Date: Sun, 24 Feb 2013 19:38:45 +0100 Subject: Update Copyright Years --- src/defaultsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 73a0893e1..610dd65a4 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -1,6 +1,6 @@ /* Minetest -Copyright (C) 2010 celeron55, Perttu Ahola +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by -- cgit v1.2.3 From 76217939e05bdd8d06fa7113902a74b02deeb915 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Thu, 14 Feb 2013 20:36:58 -0500 Subject: Add emerge queue limit configuration --- src/defaultsettings.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 610dd65a4..f18e9b1e0 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -184,6 +184,10 @@ void set_default_settings(Settings *settings) settings->setDefault("congestion_control_min_rate", "10"); settings->setDefault("remote_media", ""); settings->setDefault("debug_log_level", "0"); + settings->setDefault("emergequeue_limit_total", "256"); + settings->setDefault("emergequeue_limit_diskonly", "5"); + settings->setDefault("emergequeue_limit_generate", "1"); + // physics stuff settings->setDefault("movement_acceleration_default", "3"); settings->setDefault("movement_acceleration_air", "2"); -- cgit v1.2.3 From 5ec5b1cbd64a22e628be2cf03391883c44074811 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 17 Feb 2013 01:47:49 -0500 Subject: Add multi-Emerge thread support --- src/defaultsettings.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index f18e9b1e0..219cda9e7 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -187,6 +187,7 @@ void set_default_settings(Settings *settings) settings->setDefault("emergequeue_limit_total", "256"); settings->setDefault("emergequeue_limit_diskonly", "5"); settings->setDefault("emergequeue_limit_generate", "1"); + settings->setDefault("num_emerge_threads", ""); // physics stuff settings->setDefault("movement_acceleration_default", "3"); -- cgit v1.2.3 From 60e6284f30d31e11c1a464d9a8b3c5c392ceb3f0 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Thu, 21 Feb 2013 17:44:14 -0500 Subject: Tune queue limits, some other adjustments --- src/defaultsettings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 219cda9e7..0e82c4e2f 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -185,8 +185,8 @@ void set_default_settings(Settings *settings) settings->setDefault("remote_media", ""); settings->setDefault("debug_log_level", "0"); settings->setDefault("emergequeue_limit_total", "256"); - settings->setDefault("emergequeue_limit_diskonly", "5"); - settings->setDefault("emergequeue_limit_generate", "1"); + settings->setDefault("emergequeue_limit_diskonly", ""); + settings->setDefault("emergequeue_limit_generate", ""); settings->setDefault("num_emerge_threads", ""); // physics stuff -- cgit v1.2.3 From f00d136ab1523297fdf4707bbc5d40ec9d4f7afb Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 23 Feb 2013 22:06:16 -0500 Subject: Fix selection of # threads, set default to 1 thread --- src/defaultsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/defaultsettings.cpp') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 0e82c4e2f..4307f7610 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -187,7 +187,7 @@ void set_default_settings(Settings *settings) settings->setDefault("emergequeue_limit_total", "256"); settings->setDefault("emergequeue_limit_diskonly", ""); settings->setDefault("emergequeue_limit_generate", ""); - settings->setDefault("num_emerge_threads", ""); + settings->setDefault("num_emerge_threads", "1"); // physics stuff settings->setDefault("movement_acceleration_default", "3"); -- cgit v1.2.3