mirror of
https://github.com/luanti-org/luanti.git
synced 2025-09-30 19:22:14 +00:00
Merge remote-tracking branch 'upstream/master' into Visuals-Vol-2
This commit is contained in:
commit
b6c099073f
183 changed files with 3919 additions and 1642 deletions
|
@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
#include "porting.h"
|
||||
#include "mapgen/mapgen.h" // Mapgen::setDefaultSettings
|
||||
#include "util/string.h"
|
||||
#include "server.h"
|
||||
|
||||
|
||||
/*
|
||||
|
@ -97,7 +98,20 @@ void set_default_settings()
|
|||
// Client
|
||||
settings->setDefault("address", "");
|
||||
settings->setDefault("enable_sound", "true");
|
||||
#if defined(__unix__) && !defined(__APPLE__) && !defined (__ANDROID__)
|
||||
// On Linux+X11 (not Linux+Wayland or Linux+XWayland), I've encountered a bug
|
||||
// where fake mouse events were generated from touch events if in relative
|
||||
// mouse mode, resulting in the touchscreen controls being instantly disabled
|
||||
// again and thus making them unusable.
|
||||
// => We can't switch based on the last input method used.
|
||||
// => Fall back to hardware detection.
|
||||
settings->setDefault("touch_controls", bool_to_cstr(has_touch));
|
||||
#else
|
||||
settings->setDefault("touch_controls", "auto");
|
||||
#endif
|
||||
// Since GUI scaling shouldn't suddenly change during a session, we use
|
||||
// hardware detection for "touch_gui" instead of switching based on the last
|
||||
// input method used.
|
||||
settings->setDefault("touch_gui", bool_to_cstr(has_touch));
|
||||
settings->setDefault("sound_volume", "0.8");
|
||||
settings->setDefault("sound_volume_unfocused", "0.3");
|
||||
|
@ -335,9 +349,6 @@ void set_default_settings()
|
|||
settings->setDefault("antialiasing", "none");
|
||||
settings->setDefault("enable_bloom", "false");
|
||||
settings->setDefault("enable_bloom_debug", "false");
|
||||
settings->setDefault("bloom_strength_factor", "1.0");
|
||||
settings->setDefault("bloom_intensity", "0.05");
|
||||
settings->setDefault("bloom_radius", "1");
|
||||
settings->setDefault("enable_volumetric_lighting", "false");
|
||||
settings->setDefault("enable_bumpmaps", "false");
|
||||
settings->setDefault("enable_water_reflections", "false");
|
||||
|
@ -454,7 +465,9 @@ void set_default_settings()
|
|||
settings->setDefault("enable_pvp", "true");
|
||||
settings->setDefault("enable_mod_channels", "false");
|
||||
settings->setDefault("disallow_empty_password", "false");
|
||||
settings->setDefault("disable_anticheat", "false");
|
||||
settings->setDefault("anticheat_flags", flagdesc_anticheat,
|
||||
AC_DIGGING | AC_INTERACTION | AC_MOVEMENT);
|
||||
settings->setDefault("anticheat_movement_tolerance", "1.0");
|
||||
settings->setDefault("enable_rollback_recording", "false");
|
||||
settings->setDefault("deprecated_lua_api_handling", "log");
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue