aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2016-08-10Fixes for compiling with a newer (system) jsoncpp (#4429)Rogier-5
* Move included json code to jsoncpp subdirectory This is needed to avoid having to specify the minetest src directory as a system include when fixing the json includes. * Fix json includes They used "", so that the compiler searches the project's directory first. The result was that when compiling with a system jsoncpp, the project's own version of json.h was still included, instead of the system version. The includes now use <>, so a system location, or one specified with '-Ilocation' is searched only. * Fix for jsoncpp deprecated function warning When compiling with a newer version of jsoncpp (and ENABLE_SYSTEM_JSONCPP=true), jsoncpp emits a warning about a deprecated function that minetest uses.
2016-08-10Permit usage of std::unordered_map & std::unorderered_set on c++11 compilers ↵Ner'zhul
(#4430) This fallback to std::map & std::set for older compilers Use UNORDERED_SET as an example in decoration and ore biome sets Use UNORDERED_MAP as an example in nameidmapping
2016-08-05Decorations: Fix decoration height check errorsparamat
Fix height check comparison from '>=' to '>'. Fix getHeight() for schematic decorations to account for 'deco place center y' flag and for how normal placement sinks schematic 1 node into the ground. Jungletrees were not being placed at y = 46, y = 47 despite having an acceptable 16 nodes of height above ground surface.
2016-08-04Mapgen: Remove unused 'flat' and 'trees' flags from mg_flagsparamat
When the 'flat' and 'trees' flags were moved into mgv6_spflags they were left in mg_flags in an attempt to support old mgv6 worlds. However their appearence in mg_flags causes confusion, also, later, old-world support was found to be broken for mgv6 worlds with 'notrees'. This commit cleans up the mess and comes a month after a thread warning of the change, and explaining the required action, was posted in the news subforum. Only old mgv6 worlds with 'flat' or 'notrees' are affected, a small minority of worlds, the required action being correctly setting these flags in mgv6_spflags. Disable a section of the 'map settings manager' unit test which is to be changed as it is causing problems for pull requests.
2016-08-04Fix l_request_insecure_environment not ignoring all whitespace (#4395)Dorian Wouters
l_request_insecure_environment didn't ignore all whitespace in the secure.trusted_mods config option. Replaces std::remove with std::remove_if and the isspace function.
2016-08-04test_map_settings_manager: Fix Wunused-result warningest31
2016-08-03Porting: Fix endless loop if image format is not recognizedest31
2016-07-27Upright sprite objects: Horizontally flip the front imageSmallJoker
For consistent horizontal sprite structure when seen from front and back Fix code style
2016-07-24Update minetest.conf.example and the settings translation fileest31
2016-07-21Mgvalleys / cavegen: Place riverbed nodes under river waterparamat
When a CavesNoiseIntersection tunnel intersects a river place biome 'riverbed' nodes in tunnel entrance instead of biome 'top' nodes.
2016-07-12Treegen: Improve use of signed vs. unsigned integersparamat
To fix GCC 6.1.1 compilation warning: 'assuming signed overflow does not occur when assuming that (X - c) > X is always false'
2016-07-12Update minetest.conf.example, and settings_translation_file.cppest31
2016-07-10Fix typos (#4298)Snipie
2016-07-08Fix -Wterminate warnings in rollback.cpp as wellest31
Fix #4137 for rollback.cpp as well.
2016-07-08Fix -Wterminate warning on GCC 6est31
Fixes #4137
2016-07-07Fix warning in porting::setXorgWindowIcon when building without X11 (#4288)Jay Arndt
2016-07-05Adding minetest.clear_craftFoghrye4
Modifications by est31: grammar fixes in doc + error messages and a little style fix, no functional change.
2016-07-05Use mathematical function to determine yaw directionsfan5
2016-07-05Fix for cropped text "Toggle Cinematic"Snipie
2016-07-05Remove cinematic toggle on F8rubenwardy
Also update cinematic mode's description to include mouse
2016-07-05Finally set a window icon on X11est31
Since the creation of minetest, it had no window icon on X11. Now we have one. The misc/minetest-xorg-icon-128.png file is a rendering of the misc/minetest.svg file with inkscape, created with something like: inkscape -z -e misc/minetest-xorg-icon-128.png -w 128 -h 128 misc/minetest.svg
2016-07-04Temporarily disable "testStartStopWait" Threading unit test on macest31
The "testStartStopWait" unit test is unreliably failing on mac, for some time already. See bug #3786. Having the unittest fail unreliably doesn't help anybody but mostly inhibits the main feature of travis builds: to test PRs for regressions. Therefore, disable the specific unit test for until bug #3786 is fixed.
2016-07-04Fix & make linux conditionals uniform (#4278)Rogier-5
The source used a hodge-podge of different combinations of different macros to check for linux: 'linux', '__linux', '__linux__'. As '__linux__' is standard (Posix), and the others are not, the source now uniformly uses __linux__. If either linux or __linux are defined, it is made sure that __linux__ is defined as well.
2016-07-04Disable joysticks per default for nowest31
It seems that various different devices register as Joysticks on linux, and their presence has caused lots of confusion amongst minetest users. Therefore, disable the joystick feature. Closes #4261 Closes #4221
2016-07-03Remove top left minetest watermarkest31
Move version information into the window caption. On popular player request. Fixes #4209.
2016-07-03Add MapSettingsManager and new mapgen setting script API functionskwolekr
This commit refactors the majority of the Mapgen settings system. - MapgenParams is now owned by MapSettingsManager, itself a part of ServerMap, instead of the EmergeManager. - New Script API functions added: core.get_mapgen_setting core.get_mapgen_setting_noiseparams, core.set_mapgen_setting, and core.set_mapgen_setting_noiseparams. - minetest.get/set_mapgen_params are deprecated by the above new functions. - It is now possible to view and modify any arbitrary mapgen setting from a mod, rather than the base MapgenParams structure. - MapgenSpecificParams has been removed.
2016-07-03Mapgen: Refactor mapgen creation and managementkwolekr
- Move mapgen creation logic out of EmergeManager and into Mapgen - Internally represent mapgen type as an enum value, instead of a string - Remove the need for a MapgenFactory per mapgen
2016-07-03openbsd's port fix for non Linux systems w/o libRTDavid Carlier
X11 headers are not always in expected locations, add them to include list. Modifications by est31: indentation fixes, commit message improved
2016-06-24Also shut down when SIGTERM was receivedest31
Fixes #4251
2016-06-24Mgflat/fractal/v7/valleys: Denser 3D noise tunnelsparamat
Reduce spread from 96 to primes 61 and 67 (either side of 64) Prime spreads help to keep 3D noise periodic features unaligned 'cave width' 0.2 to preserve tunnel width Reduce octaves to 3 to improve network structure
2016-06-24Player: New get_look, set_look APIraymoo
Deprecate get_look / set_look pitch / yaw
2016-06-17Dungeons: Generalise use, add capabilities, various modificationsparamat
- Generalise node names to c_wall and c_alt_wall - Remove 'mossratio' and instead disable alt_wall loop if c_alt_wall == CONTENT_IGNORE - Use one generalised 3D noise for alternative wall nodes and in mgv6 create moss distribution similar to the previous - Rename rarity noise to density noise and enable the option of multiple dungeons per chunk determined by the value. Recreate previous distribution - Add parameters for min and max rooms per dungeon - Add dungeon y limits - Integrate river water properly Generalisation is needed now that we have sandstone and desert stone dungeons by default and can choose any node for alternative structure. The current code is based around cobble dungeons with mossycobble alternative nodes, the 2 noises controlling the alternative nodes are based on wetness. Enabling multiple dungeons per chunk with definable number of rooms allows the option of very dense and complex underground structures that could interconnect to create megastructures. Y limits are added to be consistent with other mapgen elements, and enable locaton of dungeon or megastructure realms as part of our 'stacked realms' philosophy.
2016-06-14Move unknown node message when applying texture overrides to infostream (#4218)Yutao Yuan
Texture packs have no way to know what nodes are available, so this shouldn't be a error message.
2016-06-11Sky.cpp: Improve code style. Define sky colours as SColorparamat
2016-06-11Make node timers more efficientEkdohibs
2016-06-11Random misc. warning fixes and cleanupskwolekr
- Fix unused c_sand member warning in Valleys Mapgen - Fix some code style - Make some std::string params const ref
2016-06-11Settings: Clean up settings changed callback codekwolekr
2016-06-11Server: Add reason for leave to `on_leaveplayer` callbacksDiego Martinez
2016-06-09Sky: Darker, bluer sky and improved horizon haze at nightparamat
Add new colours 'skycolour_bright_night', 'bgcolour_bright_night' and enable these between sunset end and sunrise start Night sky has same hue as day sky but is darker and more saturated Night horizon haze (bgcolour) is slightly less saturated and slightly brighter than night sky, to be consistent with daytime horizon haze
2016-06-08Sky: Fix sunrisebg texture motion (#4199)Paramat
Top of texture no longer shows above horizon during night and day
2016-06-05Mapgen: Optimize biomemap creation by combining with generateBiomeskwolekr
2016-06-05Biome API: Add per-biome riverbed material and depthparamat
Mgvalleys: Remove riverbed sand placement from base terrain generation Riverbed material placement moved to MapgenBasic::generateBiomes() Document fields and add note that the biome API is still unstable
2016-06-04Mapgen: Performance improvement and fixes for updateLiquid (#4065)MillersMan
- Adds only ~100 nodes per chunk to trans_liquid with similar processing time - Adds liquid nodes themselves instead of potential solid nodes below them - CONTENT_IGNORE nodes are interpreted as if they continue their neighborhood - This allows liquid columns to span multiple chunks without being interrupted - NOTE: Expects an one-node border in generation chunk without liquid changes
2016-06-04Biomes: Define and use biome_t for biome IDskwolekr
2016-06-04PcgRandom: Fix/improve documentationkwolekr
2016-06-04Change internal type for seeds to s32kwolekr
This fixes value truncation (and therefore incompatibility) on platforms with an LP32 data model, such as VAX or MS-DOS.
2016-06-03Initial Gamepad supportest31
Adds initial ingame gamepad support to minetest. Full Formspec support is not implemented yet and can be added by a later change.
2016-06-03Input related generalisationsest31
* Move key types into own file * Use Generalized input methods in game.cpp
2016-06-03Sapier's fix for the RESEND RELIABLE problem (#4170)Robert Kiraly
2016-06-02Mgv7: Always carve river channels in mountain terrainparamat
Previously, rivers were sometimes blocked by vertical walls of mountain terrain due to river carving being disabled when base terrain height was below water_level - 16 Remove now unused base terrain heightmap created in generateTerrain()