summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fixes for compiling with a newer (system) jsoncpp (#4429)Rogier-52016-08-10
| | | | | | | | | | | | | | | | | | | | | | | * 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.
* Permit usage of std::unordered_map & std::unorderered_set on c++11 compilers ↵Ner'zhul2016-08-10
| | | | | | | | | (#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
* Add simulation categoryRémi Verschelde2016-08-10
|
* Decorations: Fix decoration height check errorsparamat2016-08-05
| | | | | | | | | | 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.
* Mapgen: Remove unused 'flat' and 'trees' flags from mg_flagsparamat2016-08-04
| | | | | | | | | | | | | | | | 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.
* Fix l_request_insecure_environment not ignoring all whitespace (#4395)Dorian Wouters2016-08-04
| | | | | | 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.
* test_map_settings_manager: Fix Wunused-result warningest312016-08-04
|
* Porting: Fix endless loop if image format is not recognizedest312016-08-03
|
* texture_packs.txt: Document special texturesSmallJoker2016-07-30
|
* Documentation: Create texture_packs.txtrubenwardy2016-07-30
| | | | Combine texture_overrides.txt and sections of lua_api.txt
* lua_api.txt: Document how to properly clear node metadatamtango6882016-07-30
|
* Update README.txt (#4368)Nathaniel Olsen2016-07-29
| | | | | | | | | | * Update README.txt As of Ubuntu 16.10, libpng12-dev is replaced with libpng12-0, since libpng12-0 is available in 16.04 repositories, I think that needed to be changed. Also I changed 'git-core' to 'git' for fedora users, keep it consistent with the ubuntu/debian instructions. * Update README.txt
* buildbot: retrieve short commit hash properlyFernando Carmona Varo2016-07-29
| | | | Instead of trying to manually parse the output of 'git show' which can be different across different git configurations, properly use the 'git rev-parse' command that is intended for this purpose.
* Increase android versionCode (#4350)Ner'zhul2016-07-28
| | | | This little update is due to a packaging problem when uploading on play store. They don't permit to re upload an APK with same version code. This case was a fail on openssl packaged version which was old and rejected by Google but they don't remove the APK then i should increase the version code to permit having it on play store
* Upright sprite objects: Horizontally flip the front imageSmallJoker2016-07-27
| | | | | For consistent horizontal sprite structure when seen from front and back Fix code style
* Main menu, lua_api.txt: Fix mod/texture pack screenshot size issuesWuzzy2016-07-27
| | | | | | Recommend mod screenshot size in lua_api.txt Adjust displayed screenshot size of texture packs Document texture pack files in lua_api.txt
* Builtin: Add core.MAP_BLOCKSIZE constantTim2016-07-26
|
* Builtin: Fix check for a player object in core.check_player_privsTim2016-07-26
| | | | | | | core.check_player_privs accepts as first argument a name or player object, but just tested for a string. This caused crashes inside builtin, when being passed any unexpected types. This provides a better (duck-typing like) test, better error reporting.
* Update minetest.conf.example and the settings translation fileest312016-07-24
|
* Mgvalleys / cavegen: Place riverbed nodes under river waterparamat2016-07-21
| | | | | When a CavesNoiseIntersection tunnel intersects a river place biome 'riverbed' nodes in tunnel entrance instead of biome 'top' nodes.
* lua_api.txt: Remove tooltip checkbox[] elementJames Stevenson2016-07-21
|
* HTTP lua API docs: correct some function referencesest312016-07-12
|
* Builtin/profiler: Replace game profiler (#4245)Tim2016-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the setting "profiler.load" to enable profiling. Other settings can be found in settingtypes.txt. * /profiler print [filter] - report statistics to in-game console * /profiler dump [filter] - report statistics to STDOUT and debug.txt * /profiler save [format [filter]] - saves statistics to a file in your worldpath * txt (default) - same treetable format as used by the dump and print commands * csv - ready for spreadsheet import * json - useful for adhoc D3 visualizations * json_pretty - line wrapped and intended json for humans * lua - serialized lua table of the profile-data, for adhoc scripts * /profiler reset - reset all gathered profile data. This can be helpful to discard of any startup measurements that often spike during loading or to get more useful min-values. [filter] allows limiting the output of the data via substring/pattern matching against the modname. Note: Serialized data structures might be subject to change with changed or added measurements. csv might be the most stable, due to flat structure. Changes to the previous version include: * Updated and extended API monitoring * Correct calculation of average (mean) values (undistorted by idleness) * Reduce instrumentation overhead. * Fix crashes related to missing parameters for the future and occasional DIV/0's. * Prevent issues caused by timetravel (overflow, timejump, NTP corrections) * Prevent modname clashes with internal names. * Measure each instrumentation individually and label based on registration order. * Labeling of ABM's and LBM's for easier classification. Giving several ABM's or LBM's the same label will treat them as one. Missing labels will be autogenerated based on name or registration order. * Configurable instrumentation and reporting. Skip e.g. builtin if you don't need it. * Profile the profiler to measure instrumentation overhead.
* Lua_api.txt: Fix description of node drop behaviourDuane2016-07-12
|
* Treegen: Improve use of signed vs. unsigned integersparamat2016-07-12
| | | | | | To fix GCC 6.1.1 compilation warning: 'assuming signed overflow does not occur when assuming that (X - c) > X is always false'
* Run updatepo.shest312016-07-12
|
* Update minetest.conf.example, and settings_translation_file.cppest312016-07-12
|
* Translated using Weblate (French)Onyx Steinheim2016-07-12
| | | | Currently translated at 100.0% (887 of 887 strings)
* Translated using Weblate (Dutch)ikmaak2016-07-12
| | | | Currently translated at 89.6% (795 of 887 strings)
* Translated using Weblate (Indonesian)Muhammad Rifqi Priyo Susanto2016-07-12
| | | | Currently translated at 55.8% (495 of 887 strings)
* Translated using Weblate (Spanish)Roberto Mengíbar Fernández2016-07-12
| | | | Currently translated at 59.0% (524 of 887 strings)
* Translated using Weblate (French)Guillaume Robert2016-07-12
| | | | Currently translated at 91.2% (809 of 887 strings)
* Translated using Weblate (Chinese (China))arsdragonfly2016-07-12
| | | | Currently translated at 75.1% (667 of 887 strings)
* Translated using Weblate (Serbian (cyrillic))Лазар Вукановић2016-07-12
| | | | Currently translated at 31.5% (280 of 887 strings)
* Added translation using Weblate (Serbian (cyrillic))Лазар Вукановић2016-07-12
|
* Translated using Weblate (Esperanto)Tim2016-07-12
| | | | Currently translated at 32.2% (286 of 887 strings)
* Translated using Weblate (Chinese (China))susan2016-07-12
| | | | Currently translated at 74.1% (658 of 887 strings)
* Fix typos (#4298)Snipie2016-07-10
|
* Ubuntu build HOWTO: Suggest to install git instead of git-coreest312016-07-08
| | | | | | | | | | | | The package docs for the git-core Ubuntu package in all supported Ubuntu versions, including 12.04 say: This is a transitional dummy package. The 'git-core' package has been renamed to 'git', which has been installed automatically. This git-core package is now obsolete, and can safely be removed from the system if no other package depends on it. Fixes #4109
* Fix -Wterminate warnings in rollback.cpp as wellest312016-07-08
| | | | Fix #4137 for rollback.cpp as well.
* Fix -Wterminate warning on GCC 6est312016-07-08
| | | | Fixes #4137
* Fix warning in porting::setXorgWindowIcon when building without X11 (#4288)Jay Arndt2016-07-07
|
* Adding minetest.clear_craftFoghrye42016-07-05
| | | | | Modifications by est31: grammar fixes in doc + error messages and a little style fix, no functional change.
* Use mathematical function to determine yaw directionsfan52016-07-05
|
* Fix for cropped text "Toggle Cinematic"Snipie2016-07-05
|
* Remove cinematic toggle on F8rubenwardy2016-07-05
| | | | Also update cinematic mode's description to include mouse
* Finally set a window icon on X11est312016-07-05
| | | | | | | | | | 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
* Temporarily disable "testStartStopWait" Threading unit test on macest312016-07-04
| | | | | | | | | | | 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.
* Fix & make linux conditionals uniform (#4278)Rogier-52016-07-04
| | | | | | | | 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.
* Disable joysticks per default for nowest312016-07-04
| | | | | | | | | | | 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