[minetest-v04x] 03/10: Merge tag 'upstream/0.4.14+repack'

Martin Quinson mquinson at moszumanska.debian.org
Tue May 17 06:39:55 UTC 2016


This is an automated email from the git hooks/post-receive script.

mquinson pushed a commit to branch master
in repository minetest-v04x.

commit b31156feffbb48f0415beaf341f280b50a059c34
Merge: 4d47ca3 a06a2a8
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Tue May 17 06:59:13 2016 +0200

    Merge tag 'upstream/0.4.14+repack'
    
    Upstream version 0.4.14+repack

 .mailmap                                           |   33 +
 .travis.yml                                        |   29 +
 CMakeLists.txt                                     |   20 +-
 CONTRIBUTING.md                                    |  107 +
 README.txt                                         |   13 +-
 build/android/AndroidManifest.xml.template         |   35 -
 build/android/Makefile                             |  445 +-
 build/android/build.gradle                         |   49 +
 build/android/build.xml                            |   16 -
 build/android/jni/Android.mk                       |   56 +-
 build/android/jni/Application.mk                   |    3 +-
 .../{ => patches}/irrlicht-back_button.patch       |   15 +-
 .../{ => patches}/irrlicht-texturehack.patch       |    0
 .../{ => patches}/irrlicht-touchcount.patch        |    0
 build/android/{ => patches}/libiconv_android.patch |    0
 build/android/{ => patches}/libiconv_stdio.patch   |    0
 .../{ => patches}/libvorbis-libogg-fpu.patch       |    0
 build/android/{ => patches}/openssl_arch.patch     |   14 +-
 build/android/project.properties                   |    1 -
 build/android/settings.gradle                      |    2 +
 build/android/src/debug/AndroidManifest.xml        |    4 +
 build/android/src/main/AndroidManifest.xml         |   34 +
 .../net.minetest.minetest}/MinetestAssetCopy.java  |   44 +-
 .../net.minetest.minetest}/MinetestTextEntry.java  |    0
 .../net.minetest.minetest}/MtNativeActivity.java   |   33 +-
 .../{ => src/main}/res/drawable-hdpi/irr_icon.png  |  Bin
 .../{ => src/main}/res/drawable-ldpi/irr_icon.png  |  Bin
 .../{ => src/main}/res/drawable-mdpi/irr_icon.png  |  Bin
 .../{ => src/main}/res/drawable-xhdpi/irr_icon.png |  Bin
 .../{ => src/main}/res/layout/assetcopy.xml        |    6 +-
 build/android/src/main/res/values/strings.xml      |    5 +
 build/android/{ => src/main}/res/values/styles.xml |    0
 builtin/common/filterlist.lua                      |    2 +-
 builtin/common/misc_helpers.lua                    |   59 +-
 builtin/common/serialize.lua                       |   13 +-
 builtin/common/strict.lua                          |   14 +-
 builtin/fstk/buttonbar.lua                         |   61 +-
 builtin/fstk/dialog.lua                            |    8 +-
 builtin/fstk/tabview.lua                           |   36 +-
 builtin/fstk/ui.lua                                |   12 +-
 builtin/game/auth.lua                              |    2 +-
 builtin/game/chatcommands.lua                      |  166 +-
 builtin/game/constants.lua                         |   17 +
 builtin/game/deprecated.lua                        |   16 +-
 builtin/game/falling.lua                           |  176 +-
 builtin/game/features.lua                          |    7 +-
 builtin/game/init.lua                              |    4 +-
 builtin/game/item.lua                              |   89 +-
 builtin/game/item_entity.lua                       |   24 +-
 builtin/game/misc.lua                              |  157 +-
 builtin/game/privileges.lua                        |    1 +
 builtin/game/register.lua                          |   34 +-
 builtin/game/static_spawn.lua                      |   22 +-
 builtin/init.lua                                   |   35 +-
 builtin/mainmenu/common.lua                        |  224 +-
 builtin/mainmenu/dlg_config_world.lua              |   38 +-
 builtin/mainmenu/dlg_create_world.lua              |    6 +-
 builtin/mainmenu/dlg_delete_mod.lua                |    9 +-
 builtin/mainmenu/dlg_delete_world.lua              |    8 +-
 builtin/mainmenu/dlg_rename_modpack.lua            |   12 +-
 builtin/mainmenu/dlg_settings_advanced.lua         |  760 +++
 builtin/mainmenu/init.lua                          |  116 +-
 builtin/mainmenu/init_simple.lua                   |    2 +-
 builtin/mainmenu/modmgr.lua                        |   40 +-
 builtin/mainmenu/tab_credits.lua                   |  138 +-
 builtin/mainmenu/tab_mods.lua                      |    6 +-
 builtin/mainmenu/tab_multiplayer.lua               |  284 +-
 builtin/mainmenu/tab_server.lua                    |    4 +-
 builtin/mainmenu/tab_settings.lua                  |  440 +-
 builtin/mainmenu/tab_simple_main.lua               |  214 +-
 builtin/mainmenu/tab_singleplayer.lua              |    4 +-
 builtin/mainmenu/tab_texturepacks.lua              |   50 +-
 builtin/mainmenu/textures.lua                      |    4 +-
 builtin/settingtypes.txt                           | 1214 +++++
 client/serverlist/.gitignore                       |    2 -
 client/shaders/default_shader/opengl_fragment.glsl |    4 +
 client/shaders/default_shader/opengl_vertex.glsl   |    9 +
 client/shaders/nodes_shader/opengl_fragment.glsl   |   74 +-
 client/shaders/nodes_shader/opengl_vertex.glsl     |  224 +-
 .../shaders/selection_shader/opengl_fragment.glsl  |    9 +
 client/shaders/selection_shader/opengl_vertex.glsl |    9 +
 .../water_surface_shader/opengl_fragment.glsl      |   52 +-
 .../water_surface_shader/opengl_vertex.glsl        |  270 +-
 client/shaders/wielded_shader/opengl_vertex.glsl   |   68 +-
 cmake/Modules/FindJson.cmake                       |    2 +-
 cmake/Modules/FindLua.cmake                        |   25 -
 cmake/Modules/FindLuaJIT.cmake                     |   50 +
 cmake/Modules/FindNcursesw.cmake                   |  204 +
 doc/Doxyfile.in                                    |   45 +-
 doc/lua_api.txt                                    |  632 ++-
 doc/main_page.dox                                  |    8 +
 doc/menu_lua_api.txt                               |    8 +-
 doc/minetest.6                                     |    3 +
 doc/{mapformat.txt => world_format.txt}            |   44 +-
 fonts/lucida_sans_100.png                          |  Bin 12245 -> 12012 bytes
 fonts/lucida_sans_110.png                          |  Bin 15193 -> 14739 bytes
 fonts/lucida_sans_120.png                          |  Bin 16596 -> 16295 bytes
 fonts/lucida_sans_140.png                          |  Bin 47080 -> 42429 bytes
 fonts/lucida_sans_160.png                          |  Bin 53771 -> 48106 bytes
 fonts/lucida_sans_180.png                          |  Bin 63899 -> 56766 bytes
 fonts/lucida_sans_200.png                          |  Bin 76914 -> 69059 bytes
 fonts/lucida_sans_220.png                          |  Bin 82941 -> 74427 bytes
 fonts/lucida_sans_240.png                          |  Bin 94928 -> 83532 bytes
 fonts/lucida_sans_260.png                          |  Bin 105072 -> 93958 bytes
 fonts/lucida_sans_280.png                          |  Bin 114619 -> 101952 bytes
 fonts/lucida_sans_360.png                          |  Bin 162310 -> 143453 bytes
 fonts/lucida_sans_40.png                           |  Bin 8487 -> 7642 bytes
 fonts/lucida_sans_480.png                          |  Bin 231593 -> 205578 bytes
 fonts/lucida_sans_560.png                          |  Bin 278999 -> 246505 bytes
 fonts/lucida_sans_60.png                           |  Bin 15405 -> 13992 bytes
 fonts/lucida_sans_80.png                           |  Bin 10040 -> 9740 bytes
 fonts/lucida_sans_90.png                           |  Bin 10974 -> 10704 bytes
 fonts/mono_dejavu_sans_100.png                     |  Bin 61308 -> 56121 bytes
 fonts/mono_dejavu_sans_110.png                     |  Bin 74668 -> 67613 bytes
 fonts/mono_dejavu_sans_120.png                     |  Bin 80486 -> 73938 bytes
 fonts/mono_dejavu_sans_140.png                     |  Bin 98222 -> 89073 bytes
 fonts/mono_dejavu_sans_160.png                     |  Bin 111526 -> 101939 bytes
 fonts/mono_dejavu_sans_180.png                     |  Bin 134816 -> 122274 bytes
 fonts/mono_dejavu_sans_200.png                     |  Bin 152413 -> 138662 bytes
 fonts/mono_dejavu_sans_220.png                     |  Bin 168185 -> 152844 bytes
 fonts/mono_dejavu_sans_240.png                     |  Bin 187484 -> 170247 bytes
 fonts/mono_dejavu_sans_260.png                     |  Bin 210322 -> 190156 bytes
 fonts/mono_dejavu_sans_280.png                     |  Bin 223051 -> 200848 bytes
 fonts/mono_dejavu_sans_40.png                      |  Bin 17182 -> 15668 bytes
 fonts/mono_dejavu_sans_60.png                      |  Bin 31749 -> 29291 bytes
 fonts/mono_dejavu_sans_80.png                      |  Bin 49875 -> 45552 bytes
 fonts/mono_dejavu_sans_90.png                      |  Bin 55338 -> 50995 bytes
 games/minetest_game/README.txt                     |   29 +-
 games/minetest_game/game.conf                      |    2 +-
 games/minetest_game/game_api.txt                   |  745 ++-
 games/minetest_game/menu/header.png                |  Bin 80804 -> 1921 bytes
 games/minetest_game/minetest.conf.example          |   23 +-
 games/minetest_game/mods/beds/Changelog.txt        |   18 -
 games/minetest_game/mods/beds/README.txt           |    7 +-
 games/minetest_game/mods/beds/api.lua              |  108 +-
 games/minetest_game/mods/beds/beds.lua             |  112 +-
 games/minetest_game/mods/beds/functions.lua        |   74 +-
 games/minetest_game/mods/beds/init.lua             |   17 +-
 games/minetest_game/mods/beds/spawns.lua           |   15 +-
 games/minetest_game/mods/boats/README.txt          |    6 +-
 games/minetest_game/mods/boats/init.lua            |   32 +-
 games/minetest_game/mods/boats/models/boat.obj     | 3111 -----------
 .../minetest_game/mods/boats/models/boats_boat.obj |  358 ++
 .../{boat_inventory.png => boats_inventory.png}    |  Bin
 .../textures/{boat_wield.png => boats_wield.png}   |  Bin
 games/minetest_game/mods/bones/README.txt          |    4 +-
 games/minetest_game/mods/bones/init.lua            |   39 +-
 games/minetest_game/mods/bucket/README.txt         |    2 +-
 .../minetest_game/mods/bucket/textures/bucket.png  |  Bin 163 -> 205 bytes
 .../mods/bucket/textures/bucket_lava.png           |  Bin 167 -> 221 bytes
 .../mods/bucket/textures/bucket_river_water.png    |  Bin 316 -> 221 bytes
 .../mods/bucket/textures/bucket_water.png          |  Bin 169 -> 221 bytes
 games/minetest_game/mods/creative/README.txt       |    5 +-
 games/minetest_game/mods/creative/init.lua         |  254 +-
 .../mods/creative/textures/creative_trash_icon.png |  Bin 0 -> 179 bytes
 games/minetest_game/mods/default/README.txt        |   47 +-
 games/minetest_game/mods/default/aliases.lua       |    8 +-
 games/minetest_game/mods/default/crafting.lua      |   62 +-
 games/minetest_game/mods/default/craftitems.lua    |  178 +-
 games/minetest_game/mods/default/functions.lua     |  218 +-
 games/minetest_game/mods/default/furnace.lua       |  313 +-
 games/minetest_game/mods/default/mapgen.lua        |  637 ++-
 .../mods/default/models/character.b3d              |  Bin 86880 -> 86830 bytes
 .../mods/default/models/character.blend            |  Bin 628432 -> 697616 bytes
 games/minetest_game/mods/default/nodes.lua         |  707 +--
 .../mods/default/schematics/acacia_tree.mts        |  Bin 204 -> 204 bytes
 .../schematics/acacia_tree_from_sapling.mts        |  Bin 0 -> 205 bytes
 .../mods/default/schematics/apple_tree.mts         |  Bin 163 -> 163 bytes
 .../default/schematics/apple_tree_from_sapling.mts |  Bin 0 -> 167 bytes
 .../mods/default/schematics/aspen_tree.mts         |  Bin 0 -> 179 bytes
 .../default/schematics/aspen_tree_from_sapling.mts |  Bin 0 -> 171 bytes
 .../schematics/jungle_tree_from_sapling.mts        |  Bin 0 -> 246 bytes
 .../mods/default/schematics/pine_tree.mts          |  Bin 175 -> 175 bytes
 .../default/schematics/pine_tree_from_sapling.mts  |  Bin 0 -> 172 bytes
 .../schematics/snowy_pine_tree_from_sapling.mts    |  Bin 0 -> 232 bytes
 .../mods/default/textures/default_aspen_leaves.png |  Bin 0 -> 761 bytes
 .../default/textures/default_aspen_sapling.png     |  Bin 0 -> 320 bytes
 .../mods/default/textures/default_aspen_tree.png   |  Bin 0 -> 695 bytes
 .../default/textures/default_aspen_tree_top.png    |  Bin 0 -> 656 bytes
 .../mods/default/textures/default_aspen_wood.png   |  Bin 0 -> 373 bytes
 .../mods/default/textures/default_book_written.png |  Bin 0 -> 228 bytes
 .../mods/default/textures/default_brick_normal.png |  Bin 40247 -> 0 bytes
 .../textures/default_cactus_side_normal.png        |  Bin 16278 -> 0 bytes
 .../default/textures/default_cactus_top_normal.png |  Bin 13506 -> 0 bytes
 .../default/textures/default_cobble_normal.png     |  Bin 42875 -> 0 bytes
 .../default/textures/default_desert_cobble.png     |  Bin 235 -> 280 bytes
 .../textures/default_desert_sand_normal.png        |  Bin 45539 -> 0 bytes
 .../textures/default_desert_stone_brick_normal.png |  Bin 13630 -> 0 bytes
 .../textures/default_desert_stone_normal.png       |  Bin 43180 -> 0 bytes
 .../mods/default/textures/default_dirt_normal.png  |  Bin 16606 -> 0 bytes
 .../default/textures/default_dry_grass_normal.png  |  Bin 19958 -> 0 bytes
 .../default/textures/default_dry_grass_side.png    |  Bin 285 -> 890 bytes
 .../textures/default_dry_grass_side_normal.png     |  Bin 9118 -> 0 bytes
 .../default/textures/default_fence_acacia_wood.png |  Bin 0 -> 232 bytes
 .../default/textures/default_fence_aspen_wood.png  |  Bin 0 -> 450 bytes
 .../default/textures/default_fence_junglewood.png  |  Bin 0 -> 231 bytes
 .../default/textures/default_fence_pine_wood.png   |  Bin 0 -> 233 bytes
 .../mods/default/textures/default_fence_wood.png   |  Bin 0 -> 230 bytes
 .../mods/default/textures/default_flint.png        |  Bin 0 -> 3038 bytes
 .../mods/default/textures/default_grass.png        |  Bin 777 -> 377 bytes
 .../mods/default/textures/default_grass_normal.png |  Bin 19958 -> 0 bytes
 .../mods/default/textures/default_grass_side.png   |  Bin 490 -> 779 bytes
 .../default/textures/default_grass_side_normal.png |  Bin 9118 -> 0 bytes
 .../mods/default/textures/default_gravel.png       |  Bin 201 -> 3570 bytes
 .../default/textures/default_jungletree_normal.png |  Bin 16239 -> 0 bytes
 .../default/textures/default_jungletree_top.png    |  Bin 834 -> 823 bytes
 .../textures/default_jungletree_top_normal.png     |  Bin 8706 -> 0 bytes
 .../default/textures/default_junglewood_normal.png |  Bin 5957 -> 0 bytes
 .../mods/default/textures/default_ladder_steel.png |  Bin 0 -> 3223 bytes
 ...{default_ladder.png => default_ladder_wood.png} |  Bin
 .../textures/default_mineral_coal_normal.png       |  Bin 24834 -> 0 bytes
 .../textures/default_mineral_copper_normal.png     |  Bin 21935 -> 0 bytes
 .../textures/default_mineral_diamond_normal.png    |  Bin 24834 -> 0 bytes
 .../textures/default_mineral_gold_normal.png       |  Bin 24834 -> 0 bytes
 .../textures/default_mineral_iron_normal.png       |  Bin 8062 -> 0 bytes
 .../mods/default/textures/default_mineral_mese.png |  Bin 358 -> 546 bytes
 .../textures/default_mineral_mese_normal.png       |  Bin 24145 -> 0 bytes
 .../textures/default_obsidian_glass_detail.png     |  Bin 0 -> 1167 bytes
 .../mods/default/textures/default_sand_normal.png  |  Bin 41096 -> 0 bytes
 .../textures/default_sandstone_brick_normal.png    |  Bin 13630 -> 0 bytes
 .../mods/default/textures/default_sign.png         |  Bin 442 -> 0 bytes
 .../mods/default/textures/default_sign_steel.png   |  Bin 0 -> 3173 bytes
 .../mods/default/textures/default_sign_wall.png    |  Bin 416 -> 0 bytes
 .../default/textures/default_sign_wall_steel.png   |  Bin 0 -> 3187 bytes
 .../default/textures/default_sign_wall_wood.png    |  Bin 0 -> 3391 bytes
 .../mods/default/textures/default_sign_wood.png    |  Bin 0 -> 3406 bytes
 .../mods/default/textures/default_snow_side.png    |  Bin 360 -> 376 bytes
 .../textures/default_stone_brick_normal.png        |  Bin 41826 -> 0 bytes
 .../mods/default/textures/default_stone_normal.png |  Bin 19949 -> 0 bytes
 .../mods/default/textures/default_tnt_bottom.png   |  Bin 98 -> 0 bytes
 .../mods/default/textures/default_tnt_side.png     |  Bin 122 -> 0 bytes
 .../mods/default/textures/default_tnt_top.png      |  Bin 143 -> 0 bytes
 .../mods/default/textures/default_torch.png        |  Bin 151 -> 0 bytes
 .../default/textures/default_torch_on_ceiling.png  |  Bin 136 -> 0 bytes
 .../mods/default/textures/default_tree_normal.png  |  Bin 9382 -> 0 bytes
 .../default/textures/default_tree_top_normal.png   |  Bin 8706 -> 0 bytes
 .../mods/default/textures/default_wood_normal.png  |  Bin 5957 -> 0 bytes
 .../minetest_game/mods/default/textures/heart.png  |  Bin 293 -> 14830 bytes
 games/minetest_game/mods/default/trees.lua         |  125 +-
 games/minetest_game/mods/doors/README.txt          |   45 +-
 games/minetest_game/mods/doors/init.lua            |  998 ++--
 games/minetest_game/mods/doors/models/door_a.obj   |   40 +
 games/minetest_game/mods/doors/models/door_b.obj   |   40 +
 .../mods/doors/models/doors_fencegate_closed.obj   |  106 +
 .../mods/doors/models/doors_fencegate_open.obj     |  112 +
 .../mods/doors/sounds/doors_door_close.ogg         |  Bin 20157 -> 6161 bytes
 .../mods/doors/sounds/doors_door_open.ogg          |  Bin 11915 -> 6184 bytes
 .../mods/doors/sounds/doors_fencegate_close.ogg    |  Bin 0 -> 10032 bytes
 .../mods/doors/sounds/doors_fencegate_open.ogg     |  Bin 0 -> 8942 bytes
 .../mods/doors/sounds/doors_steel_door_close.ogg   |  Bin 0 -> 8574 bytes
 .../mods/doors/sounds/doors_steel_door_open.ogg    |  Bin 0 -> 5510 bytes
 .../mods/doors/textures/doors_blank.png            |  Bin 0 -> 95 bytes
 .../mods/doors/textures/doors_brown.png            |  Bin 109 -> 0 bytes
 .../mods/doors/textures/doors_door_glass.png       |  Bin 0 -> 3064 bytes
 .../doors/textures/doors_door_obsidian_glass.png   |  Bin 0 -> 2988 bytes
 .../mods/doors/textures/doors_door_steel.png       |  Bin 0 -> 1099 bytes
 .../mods/doors/textures/doors_door_wood.png        |  Bin 0 -> 1662 bytes
 .../mods/doors/textures/doors_glass.png            |  Bin 128 -> 0 bytes
 .../mods/doors/textures/doors_glass_a.png          |  Bin 158 -> 0 bytes
 .../mods/doors/textures/doors_glass_b.png          |  Bin 158 -> 0 bytes
 .../mods/doors/textures/doors_glass_side.png       |  Bin 82 -> 0 bytes
 .../mods/doors/textures/doors_grey.png             |  Bin 105 -> 0 bytes
 .../mods/doors/textures/doors_item_glass.png       |  Bin 0 -> 186 bytes
 .../doors/textures/doors_item_obsidian_glass.png   |  Bin 0 -> 186 bytes
 .../mods/doors/textures/doors_item_steel.png       |  Bin 0 -> 132 bytes
 .../{doors_wood.png => doors_item_wood.png}        |  Bin
 .../mods/doors/textures/doors_obsidian_glass.png   |  Bin 130 -> 0 bytes
 .../mods/doors/textures/doors_obsidian_glass_a.png |  Bin 128 -> 0 bytes
 .../mods/doors/textures/doors_obsidian_glass_b.png |  Bin 128 -> 0 bytes
 .../doors/textures/doors_obsidian_glass_side.png   |  Bin 82 -> 0 bytes
 .../mods/doors/textures/doors_steel.png            |  Bin 132 -> 0 bytes
 .../mods/doors/textures/doors_steel_a.png          |  Bin 273 -> 0 bytes
 .../mods/doors/textures/doors_steel_b.png          |  Bin 260 -> 0 bytes
 .../mods/doors/textures/doors_trapdoor_side.png    |  Bin 173 -> 233 bytes
 .../mods/doors/textures/doors_trapdoor_steel.png   |  Bin 0 -> 153 bytes
 .../doors/textures/doors_trapdoor_steel_side.png   |  Bin 0 -> 101 bytes
 .../mods/doors/textures/doors_wood_a.png           |  Bin 294 -> 0 bytes
 .../mods/doors/textures/doors_wood_b.png           |  Bin 291 -> 0 bytes
 games/minetest_game/mods/dye/README.txt            |    2 +-
 games/minetest_game/mods/dye/init.lua              |  122 +-
 games/minetest_game/mods/farming/API.txt           |   28 -
 games/minetest_game/mods/farming/README.txt        |    6 +-
 games/minetest_game/mods/farming/api.lua           |   31 +-
 games/minetest_game/mods/farming/nodes.lua         |   13 +-
 games/minetest_game/mods/fire/README.txt           |    8 +-
 games/minetest_game/mods/fire/init.lua             |  243 +-
 .../mods/fire/sounds/fire_extinguish_flame.1.ogg   |  Bin 0 -> 9583 bytes
 .../mods/fire/sounds/fire_extinguish_flame.2.ogg   |  Bin 0 -> 7977 bytes
 .../mods/fire/sounds/fire_extinguish_flame.3.ogg   |  Bin 0 -> 6499 bytes
 .../mods/fire/textures/fire_flint_steel.png        |  Bin 0 -> 3108 bytes
 games/minetest_game/mods/flowers/README.txt        |    9 +-
 games/minetest_game/mods/flowers/init.lua          |  292 +-
 games/minetest_game/mods/flowers/mapgen.lua        |   77 +-
 .../mods/flowers/schematics/waterlily.mts          |  Bin 0 -> 92 bytes
 .../textures/flowers_mushroom_spores_brown.png     |  Bin 94 -> 0 bytes
 .../textures/flowers_mushroom_spores_red.png       |  Bin 92 -> 0 bytes
 .../mods/flowers/textures/flowers_waterlily.png    |  Bin 0 -> 3363 bytes
 .../minetest_game/mods/give_initial_stuff/init.lua |   52 +-
 games/minetest_game/mods/screwdriver/init.lua      |   13 +-
 games/minetest_game/mods/screwdriver/readme.txt    |    6 +-
 games/minetest_game/mods/stairs/README.txt         |    2 +-
 games/minetest_game/mods/stairs/init.lua           |   15 +-
 games/minetest_game/mods/tnt/README.txt            |    3 +-
 games/minetest_game/mods/tnt/init.lua              |  461 +-
 .../minetest_game/mods/tnt/textures/tnt_blast.png  |  Bin 0 -> 855 bytes
 games/minetest_game/mods/vessels/README.txt        |    2 +-
 games/minetest_game/mods/vessels/init.lua          |   56 +-
 games/minetest_game/mods/walls/depends.txt         |    1 +
 games/minetest_game/mods/walls/init.lua            |   61 +
 games/minetest_game/mods/wool/README.txt           |    4 +-
 games/minetest_game/mods/wool/init.lua             |    2 +-
 games/minetest_game/mods/xpanes/README.txt         |    4 +-
 games/minetest_game/mods/xpanes/init.lua           |   64 +-
 games/minimal/mods/default/mapgen.lua              |    2 +-
 minetest.conf.example                              | 2027 ++++++--
 misc/minetest.appdata.xml                          |    5 +-
 misc/minetest.desktop                              |    2 +-
 misc/{minetest-icon.svg => minetest.svg}           |    2 +-
 po/be/minetest.po                                  | 4013 +++++++++++++--
 po/ca/minetest.po                                  | 4214 +++++++++++++++
 po/cs/minetest.po                                  | 4577 ++++++++++++++---
 po/da/minetest.po                                  | 4693 ++++++++++++++---
 po/de/minetest.po                                  | 5409 ++++++++++++++++----
 po/eo/minetest.po                                  | 4229 +++++++++++++++
 po/es/minetest.po                                  | 4587 ++++++++++++++---
 po/et/minetest.po                                  | 4591 ++++++++++++++---
 po/fr/minetest.po                                  | 5287 ++++++++++++++++---
 po/he/minetest.po                                  | 4047 +++++++++++++++
 po/hu/minetest.po                                  | 4967 +++++++++++++++---
 po/id/minetest.po                                  | 4697 ++++++++++++++---
 po/it/minetest.po                                  | 5161 ++++++++++++++++---
 po/ja/minetest.po                                  | 4653 ++++++++++++++---
 po/jbo/minetest.po                                 | 4120 +++++++++++++++
 po/ko/minetest.po                                  | 4018 +++++++++++++--
 po/ky/minetest.po                                  | 4455 +++++++++++++---
 po/lt/minetest.po                                  | 4473 +++++++++++++---
 po/minetest.pot                                    | 3557 +++++++++++--
 po/nb/minetest.po                                  | 4101 ++++++++++++---
 po/nl/minetest.po                                  | 5272 +++++++++++++++----
 po/pl/minetest.po                                  | 4707 +++++++++++++----
 po/pt/minetest.po                                  | 4864 ++++++++++++++----
 po/pt_BR/minetest.po                               | 5040 ++++++++++++++----
 po/ro/minetest.po                                  | 4552 +++++++++++++---
 po/ru/minetest.po                                  | 4934 +++++++++++++++---
 po/tr/minetest.po                                  | 4551 +++++++++++++---
 po/uk/minetest.po                                  | 4633 +++++++++++++----
 po/zh_CN/minetest.po                               | 4726 +++++++++++++----
 po/zh_TW/minetest.po                               | 4524 ++++++++++++++++
 src/CMakeLists.txt                                 |   63 +-
 src/ban.cpp                                        |   22 +-
 src/ban.h                                          |    8 +-
 src/camera.cpp                                     |  211 +-
 src/camera.h                                       |   46 +-
 src/cavegen.cpp                                    |   19 +-
 src/cavegen.h                                      |    6 +-
 src/cguittfont/CMakeLists.txt                      |    2 +-
 src/chat.cpp                                       |   86 +-
 src/chat.h                                         |   27 +-
 src/chat_interface.h                               |   82 +
 src/client.cpp                                     |  191 +-
 src/client.h                                       |   33 +-
 src/client/clientlauncher.cpp                      |   49 +-
 src/client/clientlauncher.h                        |    4 +-
 src/client/inputhandler.h                          |   20 +-
 src/client/tile.cpp                                |  153 +-
 src/client/tile.h                                  |    1 -
 src/clientiface.cpp                                |   52 +-
 src/clientiface.h                                  |   28 +-
 src/clientmap.cpp                                  |  280 +-
 src/clientmap.h                                    |   13 +-
 src/clientmedia.cpp                                |    2 +-
 src/clientobject.cpp                               |    2 +-
 src/clientobject.h                                 |    2 +-
 src/clouds.cpp                                     |    2 +-
 src/clouds.h                                       |    6 +-
 src/cmake_config.h.in                              |    8 +
 src/collision.cpp                                  |  319 +-
 src/collision.h                                    |   10 +-
 src/content_cao.cpp                                |  121 +-
 src/content_cao.h                                  |   17 +-
 src/content_mapblock.cpp                           |  383 +-
 src/content_mapnode.cpp                            |   66 -
 src/content_mapnode.h                              |    4 -
 src/content_nodemeta.cpp                           |   14 +-
 src/content_nodemeta.h                             |    4 +-
 src/content_sao.cpp                                |   52 +-
 src/content_sao.h                                  |   11 +-
 src/convert_json.cpp                               |    8 +-
 src/craftdef.cpp                                   |   14 +-
 src/database-dummy.cpp                             |    1 +
 src/database-leveldb.cpp                           |    4 +-
 src/database-redis.cpp                             |   37 +-
 src/database-sqlite3.cpp                           |  111 +-
 src/database-sqlite3.h                             |    4 +
 src/debug.cpp                                      |  170 +-
 src/debug.h                                        |   57 +-
 src/defaultsettings.cpp                            |   48 +-
 src/drawscene.cpp                                  |  192 +-
 src/drawscene.h                                    |    8 +-
 src/dungeongen.cpp                                 |   31 +-
 src/dungeongen.h                                   |    1 +
 src/emerge.cpp                                     |  778 +--
 src/emerge.h                                       |  123 +-
 src/environment.cpp                                |  644 ++-
 src/environment.h                                  |  161 +-
 src/event_manager.h                                |    8 +-
 src/exceptions.h                                   |    6 +
 src/filesys.cpp                                    |   40 +-
 src/filesys.h                                      |    4 +
 src/fontengine.cpp                                 |    2 +-
 src/game.cpp                                       |  594 ++-
 src/gamedef.h                                      |    6 +
 src/gameparams.h                                   |    9 +-
 src/genericobject.cpp                              |    2 +-
 src/gettext.cpp                                    |  133 +-
 src/gettext.h                                      |   14 +-
 src/guiChatConsole.cpp                             |  171 +-
 src/guiChatConsole.h                               |   17 +-
 src/guiEngine.cpp                                  |   12 +-
 src/guiFileSelectMenu.cpp                          |    1 +
 src/guiFormSpecMenu.cpp                            |  262 +-
 src/guiFormSpecMenu.h                              |   87 +-
 src/guiKeyChangeMenu.cpp                           |    6 +-
 src/guiTable.cpp                                   |   51 +-
 src/guiscalingfilter.cpp                           |    4 +-
 src/httpfetch.cpp                                  |   81 +-
 src/httpfetch.h                                    |    3 +
 src/hud.cpp                                        |  311 +-
 src/hud.h                                          |   58 +-
 src/inventory.cpp                                  |   24 +-
 src/inventorymanager.cpp                           |   10 +-
 src/irrlichttypes.h                                |   15 +
 src/itemdef.cpp                                    |  125 +-
 src/itemdef.h                                      |    1 +
 src/jthread/CMakeLists.txt                         |   14 -
 src/jthread/LICENSE.MIT                            |   20 -
 src/jthread/jevent.h                               |   59 -
 src/jthread/jmutex.h                               |   79 -
 src/jthread/jmutexautolock.h                       |   43 -
 src/jthread/jthread.h                              |  117 -
 src/jthread/pthread/jevent.cpp                     |   67 -
 src/jthread/pthread/jmutex.cpp                     |   58 -
 src/jthread/pthread/jsemaphore.cpp                 |  156 -
 src/jthread/pthread/jthread.cpp                    |  168 -
 src/jthread/win32/jevent.cpp                       |   43 -
 src/jthread/win32/jmutex.cpp                       |   68 -
 src/jthread/win32/jsemaphore.cpp                   |  104 -
 src/jthread/win32/jthread.cpp                      |  146 -
 src/localplayer.cpp                                |   63 +-
 src/localplayer.h                                  |    5 +-
 src/log.cpp                                        |  407 +-
 src/log.h                                          |  216 +-
 src/luaentity_common.h                             |   30 -
 src/main.cpp                                       |  274 +-
 src/mainmenumanager.h                              |   21 +-
 src/map.cpp                                        |  431 +-
 src/map.h                                          |   10 +-
 src/mapblock.cpp                                   |  140 +-
 src/mapblock.h                                     |   14 +-
 src/mapblock_mesh.cpp                              |  272 +-
 src/mapblock_mesh.h                                |   32 +-
 src/mapgen.cpp                                     |  132 +-
 src/mapgen.h                                       |   37 +-
 src/{mapgen_v5.cpp => mapgen_flat.cpp}             |  425 +-
 src/{mapgen_v5.h => mapgen_flat.h}                 |   65 +-
 src/mapgen_fractal.cpp                             |  746 +++
 src/{mapgen_v5.h => mapgen_fractal.h}              |   75 +-
 src/mapgen_singlenode.cpp                          |   28 +-
 src/mapgen_singlenode.h                            |    5 +-
 src/mapgen_v5.cpp                                  |  197 +-
 src/mapgen_v5.h                                    |   13 +-
 src/mapgen_v6.cpp                                  |   78 +-
 src/mapgen_v6.h                                    |   19 +-
 src/mapgen_v7.cpp                                  |  400 +-
 src/mapgen_v7.h                                    |   18 +-
 src/mapgen_valleys.cpp                             | 1017 ++++
 src/mapgen_valleys.h                               |  187 +
 src/mapnode.cpp                                    |  115 +-
 src/mapnode.h                                      |    6 +-
 src/mapsector.cpp                                  |    2 +-
 src/mesh.cpp                                       |  347 +-
 src/mesh.h                                         |    8 +-
 src/mg_biome.cpp                                   |    4 +-
 src/mg_decoration.cpp                              |   48 +-
 src/mg_decoration.h                                |   11 +-
 src/mg_ore.cpp                                     |  134 +-
 src/mg_ore.h                                       |   33 +-
 src/mg_schematic.cpp                               |   82 +-
 src/mg_schematic.h                                 |    5 +-
 src/minimap.cpp                                    |   94 +-
 src/minimap.h                                      |   23 +-
 src/modalMenu.h                                    |    6 +-
 src/mods.cpp                                       |    9 +-
 src/mods.h                                         |   18 -
 src/nameidmapping.cpp                              |    2 +-
 src/network/clientpackethandler.cpp                |   31 +-
 src/network/connection.cpp                         |  145 +-
 src/network/connection.h                           |   62 +-
 src/network/networkpacket.cpp                      |    3 +
 src/network/networkprotocol.h                      |   59 +-
 src/network/serverpackethandler.cpp                |  181 +-
 src/nodedef.cpp                                    |  240 +-
 src/nodedef.h                                      |   74 +-
 src/nodemetadata.cpp                               |   31 +-
 src/nodemetadata.h                                 |    6 +-
 src/nodetimer.cpp                                  |   24 +-
 src/noise.cpp                                      |   16 +-
 src/objdef.h                                       |    4 +
 src/object_properties.cpp                          |   22 +-
 src/object_properties.h                            |    9 +-
 src/particles.cpp                                  |  182 +-
 src/particles.h                                    |   10 +-
 src/pathfinder.cpp                                 |  906 +++-
 src/pathfinder.h                                   |  298 +-
 src/player.cpp                                     |   63 +-
 src/player.h                                       |   18 +-
 src/porting.cpp                                    |  257 +-
 src/porting.h                                      |  170 +-
 src/porting_android.cpp                            |  114 +-
 src/porting_android.h                              |    6 +-
 src/profiler.h                                     |   20 +-
 src/quicktune.cpp                                  |   14 +-
 src/rollback.cpp                                   |   10 +-
 src/rollback_interface.cpp                         |    2 +-
 src/script/common/c_content.cpp                    |  179 +-
 src/script/common/c_converter.cpp                  |    9 +
 src/script/common/c_converter.h                    |    2 +
 src/script/common/c_internal.cpp                   |   49 +-
 src/script/common/c_internal.h                     |   25 +
 src/script/common/c_types.h                        |    4 +-
 src/script/cpp_api/s_async.cpp                     |   95 +-
 src/script/cpp_api/s_async.h                       |   30 +-
 src/script/cpp_api/s_base.cpp                      |   64 +-
 src/script/cpp_api/s_base.h                        |   20 +-
 src/script/cpp_api/s_entity.cpp                    |   31 +-
 src/script/cpp_api/s_env.cpp                       |  195 +-
 src/script/cpp_api/s_env.h                         |   20 +-
 src/script/cpp_api/s_internal.h                    |   42 +-
 src/script/cpp_api/s_inventory.cpp                 |   33 +-
 src/script/cpp_api/s_item.cpp                      |   56 +-
 src/script/cpp_api/s_item.h                        |    2 +
 src/script/cpp_api/s_mainmenu.cpp                  |   10 +-
 src/script/cpp_api/s_node.cpp                      |   47 +-
 src/script/cpp_api/s_nodemeta.cpp                  |   33 +-
 src/script/cpp_api/s_player.cpp                    |    6 +-
 src/script/cpp_api/s_security.cpp                  |   13 +-
 src/script/cpp_api/s_security.h                    |    5 +-
 src/script/cpp_api/s_server.cpp                    |   12 +-
 src/script/lua_api/CMakeLists.txt                  |    1 +
 src/script/lua_api/l_areastore.cpp                 |   72 +-
 src/script/lua_api/l_areastore.h                   |   18 +-
 src/script/lua_api/l_base.cpp                      |    4 +-
 src/script/lua_api/l_env.cpp                       |  166 +-
 src/script/lua_api/l_env.h                         |   50 +-
 src/script/lua_api/l_http.cpp                      |  193 +
 src/{logoutputbuffer.h => script/lua_api/l_http.h} |   58 +-
 src/script/lua_api/l_internal.h                    |   10 +
 src/script/lua_api/l_inventory.cpp                 |    3 +-
 src/script/lua_api/l_item.cpp                      |    2 +-
 src/script/lua_api/l_mainmenu.cpp                  |   53 +-
 src/script/lua_api/l_mainmenu.h                    |    2 -
 src/script/lua_api/l_mapgen.cpp                    |  181 +-
 src/script/lua_api/l_mapgen.h                      |   10 +-
 src/script/lua_api/l_nodemeta.cpp                  |   21 +-
 src/script/lua_api/l_nodetimer.cpp                 |    6 +
 src/script/lua_api/l_noise.cpp                     |  126 +-
 src/script/lua_api/l_noise.h                       |   33 +
 src/script/lua_api/l_object.cpp                    |  132 +-
 src/script/lua_api/l_particles.cpp                 |    6 +
 src/script/lua_api/l_rollback.cpp                  |    4 +
 src/script/lua_api/l_server.cpp                    |   25 +-
 src/script/lua_api/l_server.h                      |    3 +
 src/script/lua_api/l_util.cpp                      |  140 +-
 src/script/lua_api/l_util.h                        |    9 +-
 src/script/lua_api/l_vmanip.cpp                    |   35 +-
 src/script/scripting_game.cpp                      |    3 +
 src/script/scripting_mainmenu.cpp                  |    2 +-
 src/serialization.cpp                              |    4 +-
 src/serialization.h                                |   12 +-
 src/server.cpp                                     |  578 ++-
 src/server.h                                       |   33 +-
 src/serverlist.cpp                                 |   10 +-
 src/serverobject.cpp                               |    2 +-
 src/settings.cpp                                   |   50 +-
 src/settings.h                                     |    6 +-
 src/settings_translation_file.cpp                  |  620 +++
 src/shader.cpp                                     |   65 +-
 src/shader.h                                       |    3 +
 src/sky.cpp                                        |    9 +-
 src/sky.h                                          |    5 +-
 src/socket.cpp                                     |   16 +-
 src/socket.h                                       |    6 +-
 src/sound_openal.cpp                               |  172 +-
 src/staticobject.cpp                               |   14 +-
 src/staticobject.h                                 |    2 +-
 src/strfnd.h                                       |  176 -
 src/subgame.cpp                                    |   52 +-
 src/terminal_chat_console.cpp                      |  453 ++
 src/terminal_chat_console.h                        |  131 +
 src/threading/CMakeLists.txt                       |    7 +
 src/threading/atomic.h                             |  139 +
 src/threading/event.cpp                            |   89 +
 src/threading/event.h                              |   72 +
 src/threading/mutex.cpp                            |  108 +
 src/threading/mutex.h                              |   81 +
 src/threading/mutex_auto_lock.h                    |   60 +
 src/threading/semaphore.cpp                        |  162 +
 .../jsemaphore.h => threading/semaphore.h}         |   51 +-
 src/threading/thread.cpp                           |  430 ++
 src/threading/thread.h                             |  183 +
 src/threads.h                                      |   69 +-
 src/tool.cpp                                       |   10 +-
 src/touchscreengui.cpp                             |  631 ++-
 src/touchscreengui.h                               |  116 +-
 src/unittest/CMakeLists.txt                        |    1 +
 src/unittest/test.cpp                              |   18 +-
 src/unittest/test.h                                |   91 +-
 src/unittest/test_areastore.cpp                    |   69 +-
 src/unittest/test_collision.cpp                    |   32 +-
 src/unittest/test_serialization.cpp                |  263 +
 src/unittest/test_threading.cpp                    |  182 +
 src/unittest/test_utilities.cpp                    |   35 +-
 src/util/CMakeLists.txt                            |    1 +
 src/{ => util}/areastore.cpp                       |  192 +-
 src/{ => util}/areastore.h                         |  180 +-
 src/util/auth.cpp                                  |  107 +-
 src/util/auth.h                                    |   35 +-
 src/util/basic_macros.h                            |   53 +
 src/util/container.h                               |  171 +-
 src/util/numeric.cpp                               |   11 +-
 src/util/numeric.h                                 |   19 +-
 src/util/serialize.cpp                             |   73 +-
 src/util/serialize.h                               |  251 +-
 src/util/srp.cpp                                   |  693 ++-
 src/util/srp.h                                     |   91 +-
 src/util/strfnd.h                                  |   82 +
 src/util/string.h                                  |   81 +-
 src/util/thread.h                                  |   64 +-
 src/wieldmesh.cpp                                  |  116 +-
 src/wieldmesh.h                                    |    8 +-
 textures/base/pack/camera_btn.png                  |  Bin 789 -> 729 bytes
 textures/base/pack/chat_btn.png                    |  Bin 777 -> 399 bytes
 textures/base/pack/debug_btn.png                   |  Bin 960 -> 895 bytes
 textures/base/pack/dirt_bg.png                     |  Bin 1586 -> 0 bytes
 textures/base/pack/down.png                        |  Bin 1917 -> 1328 bytes
 textures/base/pack/down_arrow.png                  |  Bin 843 -> 373 bytes
 textures/base/pack/drop_btn.png                    |  Bin 561 -> 1035 bytes
 textures/base/pack/fast_btn.png                    |  Bin 935 -> 875 bytes
 textures/base/pack/fly_btn.png                     |  Bin 783 -> 720 bytes
 textures/base/pack/gear_icon.png                   |  Bin 0 -> 1005 bytes
 textures/base/pack/halo.png                        |  Bin 194 -> 144 bytes
 textures/base/pack/inventory_btn.png               |  Bin 733 -> 343 bytes
 textures/base/pack/jump_btn.png                    |  Bin 621 -> 434 bytes
 textures/base/pack/left_arrow.png                  |  Bin 742 -> 400 bytes
 textures/base/pack/logo.png                        |  Bin 12190 -> 12188 bytes
 textures/base/pack/menu_bg.png                     |  Bin 0 -> 124 bytes
 textures/base/pack/menu_header.png                 |  Bin 133115 -> 1628 bytes
 textures/base/pack/minimap_mask_round.png          |  Bin 4081 -> 1858 bytes
 textures/base/pack/minimap_mask_square.png         |  Bin 1951 -> 420 bytes
 textures/base/pack/minimap_overlay_round.png       |  Bin 20630 -> 22044 bytes
 textures/base/pack/minimap_overlay_square.png      |  Bin 2889 -> 1686 bytes
 textures/base/pack/no_screenshot.png               |  Bin 476 -> 140 bytes
 textures/base/pack/noclip_btn.png                  |  Bin 1151 -> 1087 bytes
 textures/base/pack/object_marker_red.png           |  Bin 0 -> 449 bytes
 textures/base/pack/player_marker.png               |  Bin 3885 -> 2178 bytes
 textures/base/pack/rangeview_btn.png               |  Bin 1604 -> 1476 bytes
 textures/base/pack/rare_controls.png               |  Bin 0 -> 349 bytes
 textures/base/pack/right_arrow.png                 |  Bin 770 -> 396 bytes
 textures/base/pack/server_flags_damage.png         |  Bin 774 -> 713 bytes
 textures/base/pack/server_flags_favorite.png       |  Bin 0 -> 916 bytes
 textures/base/pack/server_flags_pvp.png            |  Bin 1056 -> 1048 bytes
 textures/base/pack/smoke_puff.png                  |  Bin 1334 -> 1233 bytes
 textures/base/pack/sunrisebg.png                   |  Bin 4587 -> 4231 bytes
 textures/base/pack/unknown_item.png                |  Bin 294 -> 292 bytes
 textures/base/pack/up_arrow.png                    |  Bin 704 -> 373 bytes
 util/buildbot/buildwin32.sh                        |   26 +-
 util/buildbot/buildwin64.sh                        |   22 +-
 util/bump_version.sh                               |    8 +-
 util/travis/before_install.sh                      |   42 +-
 util/travis/script.sh                              |   20 +-
 util/updatepo.sh                                   |    3 +-
 681 files changed, 147648 insertions(+), 36758 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-v04x.git



More information about the Pkg-games-commits mailing list