[minetest-v04x] 01/02: Merge tag 'upstream/0.4.11+repack'

Markus Koschany apo-guest at moszumanska.debian.org
Fri Jan 2 15:35:42 UTC 2015


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

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

commit 9fd8e6c10acb737a9fa291337c8153a436e85d50
Merge: 40decc6 ce83aa8
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Jan 1 20:28:54 2015 +0100

    Merge tag 'upstream/0.4.11+repack'
    
    Upstream version 0.4.11+repack
    
    # gpg: Signature made Thu 01 Jan 2015 20:28:49 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 CMakeLists.txt                                     |   29 +-
 README.txt                                         |   34 +-
 build/android/AndroidManifest.xml.template         |    2 +-
 build/android/Makefile                             |   27 +-
 build/android/jni/Android.mk                       |   43 +-
 builtin/common/misc_helpers.lua                    |  220 +-
 builtin/common/serialize.lua                       |  322 +-
 builtin/common/strict.lua                          |   54 +
 builtin/common/vector.lua                          |   29 +-
 builtin/fstk/buttonbar.lua                         |    9 +-
 builtin/game/auth.lua                              |   66 +-
 builtin/game/builtin_biome.lua                     |    9 +
 builtin/game/chatcommands.lua                      |  109 +-
 builtin/game/falling.lua                           |   50 +-
 builtin/game/features.lua                          |    1 +
 builtin/game/forceloading.lua                      |    2 +-
 builtin/game/init.lua                              |    6 +
 builtin/game/item_entity.lua                       |   26 +-
 builtin/game/misc.lua                              |    6 +-
 builtin/game/mod_profiling.lua                     |  356 ++
 builtin/game/voxelarea.lua                         |   42 +-
 builtin/init.lua                                   |    1 +
 builtin/mainmenu/common.lua                        |   62 +-
 builtin/mainmenu/dlg_create_world.lua              |   13 +-
 builtin/mainmenu/gamemgr.lua                       |    2 +-
 builtin/mainmenu/init.lua                          |  134 +-
 builtin/mainmenu/init_android.lua                  |  102 -
 builtin/mainmenu/modmgr.lua                        |   48 +-
 builtin/mainmenu/tab_credits.lua                   |   17 +-
 builtin/mainmenu/tab_mods.lua                      |    9 +-
 builtin/mainmenu/tab_multiplayer.lua               |   72 +-
 builtin/mainmenu/tab_server.lua                    |   44 +-
 builtin/mainmenu/tab_settings.lua                  |  135 +-
 builtin/mainmenu/tab_simple_main.lua               |   11 +-
 builtin/mainmenu/tab_singleplayer.lua              |    9 +-
 builtin/mainmenu/tab_texturepacks.lua              |   23 +-
 client/shaders/nodes_shader/opengl_vertex.glsl     |   20 +-
 .../water_surface_shader/opengl_vertex.glsl        |   20 +-
 doc/Doxyfile.in                                    |   32 +
 doc/README.android                                 |    8 +-
 doc/fst_api.txt                                    |    4 +-
 doc/lua_api.txt                                    |  340 +-
 doc/mapformat.txt                                  |    2 +-
 doc/menu_lua_api.txt                               |    5 +-
 doc/minetest.6                                     |    6 +
 fonts/fontdejavusansmono.png                       |  Bin 8511 -> 0 bytes
 fonts/liberation_sans_14.xml                       |  100 +
 fonts/liberation_sans_14_img.png                   |  Bin 0 -> 27786 bytes
 fonts/lucida_sans_10.xml                           |  Bin 0 -> 156248 bytes
 fonts/lucida_sans_100.png                          |  Bin 0 -> 12245 bytes
 fonts/lucida_sans_11.xml                           |  Bin 0 -> 157272 bytes
 fonts/lucida_sans_110.png                          |  Bin 0 -> 15193 bytes
 fonts/lucida_sans_12.xml                           |  Bin 0 -> 157058 bytes
 fonts/lucida_sans_120.png                          |  Bin 0 -> 16596 bytes
 fonts/lucida_sans_14.xml                           |  Bin 0 -> 159272 bytes
 fonts/lucida_sans_140.png                          |  Bin 0 -> 47080 bytes
 fonts/lucida_sans_16.xml                           |  Bin 0 -> 160744 bytes
 fonts/lucida_sans_160.png                          |  Bin 0 -> 53771 bytes
 fonts/lucida_sans_18.xml                           |  Bin 0 -> 162284 bytes
 fonts/lucida_sans_180.png                          |  Bin 0 -> 63899 bytes
 fonts/lucida_sans_20.xml                           |  Bin 0 -> 162438 bytes
 fonts/lucida_sans_200.png                          |  Bin 0 -> 76914 bytes
 fonts/lucida_sans_22.xml                           |  Bin 0 -> 162936 bytes
 fonts/lucida_sans_220.png                          |  Bin 0 -> 82941 bytes
 fonts/lucida_sans_24.xml                           |  Bin 0 -> 166358 bytes
 fonts/lucida_sans_240.png                          |  Bin 0 -> 94928 bytes
 fonts/lucida_sans_26.xml                           |  Bin 0 -> 167054 bytes
 fonts/lucida_sans_260.png                          |  Bin 0 -> 105072 bytes
 fonts/lucida_sans_28.xml                           |  Bin 0 -> 167156 bytes
 fonts/lucida_sans_280.png                          |  Bin 0 -> 114619 bytes
 fonts/lucida_sans_36.xml                           |  Bin 0 -> 169606 bytes
 fonts/lucida_sans_360.png                          |  Bin 0 -> 162310 bytes
 fonts/lucida_sans_4.xml                            |  Bin 0 -> 136910 bytes
 fonts/lucida_sans_40.png                           |  Bin 0 -> 8487 bytes
 fonts/lucida_sans_48.xml                           |  Bin 0 -> 171972 bytes
 fonts/lucida_sans_480.png                          |  Bin 0 -> 231593 bytes
 fonts/lucida_sans_56.xml                           |  Bin 0 -> 174174 bytes
 fonts/lucida_sans_560.png                          |  Bin 0 -> 278999 bytes
 fonts/lucida_sans_6.xml                            |  Bin 0 -> 140552 bytes
 fonts/lucida_sans_60.png                           |  Bin 0 -> 15405 bytes
 fonts/lucida_sans_8.xml                            |  Bin 0 -> 154564 bytes
 fonts/lucida_sans_80.png                           |  Bin 0 -> 10040 bytes
 fonts/lucida_sans_9.xml                            |  Bin 0 -> 154830 bytes
 fonts/lucida_sans_90.png                           |  Bin 0 -> 10974 bytes
 fonts/mono_dejavu_sans_10.xml                      |  Bin 0 -> 257014 bytes
 fonts/mono_dejavu_sans_100.png                     |  Bin 0 -> 61308 bytes
 fonts/mono_dejavu_sans_11.xml                      |  Bin 0 -> 263644 bytes
 fonts/mono_dejavu_sans_110.png                     |  Bin 0 -> 74668 bytes
 fonts/mono_dejavu_sans_12.xml                      |  Bin 0 -> 268932 bytes
 fonts/mono_dejavu_sans_120.png                     |  Bin 0 -> 80486 bytes
 fonts/mono_dejavu_sans_14.xml                      |  Bin 0 -> 269188 bytes
 fonts/mono_dejavu_sans_140.png                     |  Bin 0 -> 98222 bytes
 fonts/mono_dejavu_sans_16.xml                      |  Bin 0 -> 275642 bytes
 fonts/mono_dejavu_sans_160.png                     |  Bin 0 -> 111526 bytes
 fonts/mono_dejavu_sans_18.xml                      |  Bin 0 -> 279962 bytes
 fonts/mono_dejavu_sans_180.png                     |  Bin 0 -> 134816 bytes
 fonts/mono_dejavu_sans_20.xml                      |  Bin 0 -> 282588 bytes
 fonts/mono_dejavu_sans_200.png                     |  Bin 0 -> 152413 bytes
 fonts/mono_dejavu_sans_22.xml                      |  Bin 0 -> 283950 bytes
 fonts/mono_dejavu_sans_220.png                     |  Bin 0 -> 168185 bytes
 fonts/mono_dejavu_sans_24.xml                      |  Bin 0 -> 286626 bytes
 fonts/mono_dejavu_sans_240.png                     |  Bin 0 -> 187484 bytes
 fonts/mono_dejavu_sans_26.xml                      |  Bin 0 -> 289710 bytes
 fonts/mono_dejavu_sans_260.png                     |  Bin 0 -> 210322 bytes
 fonts/mono_dejavu_sans_28.xml                      |  Bin 0 -> 292596 bytes
 fonts/mono_dejavu_sans_280.png                     |  Bin 0 -> 223051 bytes
 fonts/mono_dejavu_sans_4.xml                       |  Bin 0 -> 237740 bytes
 fonts/mono_dejavu_sans_40.png                      |  Bin 0 -> 17182 bytes
 fonts/mono_dejavu_sans_6.xml                       |  Bin 0 -> 245472 bytes
 fonts/mono_dejavu_sans_60.png                      |  Bin 0 -> 31749 bytes
 fonts/mono_dejavu_sans_8.xml                       |  Bin 0 -> 251876 bytes
 fonts/mono_dejavu_sans_80.png                      |  Bin 0 -> 49875 bytes
 fonts/mono_dejavu_sans_9.xml                       |  Bin 0 -> 254016 bytes
 fonts/mono_dejavu_sans_90.png                      |  Bin 0 -> 55338 bytes
 games/minetest_game/game_api.txt                   |   88 +-
 games/minetest_game/minetest.conf                  |    2 +-
 games/minetest_game/minetest.conf.example          |   24 +
 games/minetest_game/mods/boats/init.lua            |  123 +-
 games/minetest_game/mods/bucket/init.lua           |   45 +-
 games/minetest_game/mods/default/README.txt        |   32 +-
 games/minetest_game/mods/default/crafting.lua      |   46 +-
 games/minetest_game/mods/default/craftitems.lua    |    2 +
 games/minetest_game/mods/default/functions.lua     |   75 +-
 games/minetest_game/mods/default/furnace.lua       |  283 +
 games/minetest_game/mods/default/init.lua          |    1 +
 games/minetest_game/mods/default/mapgen.lua        |  226 +-
 games/minetest_game/mods/default/nodes.lua         |  462 +-
 games/minetest_game/mods/default/player.lua        |   52 +-
 .../mods/default/textures/crack_anylength.png      |  Bin 252 -> 583 bytes
 .../mods/default/textures/default_apple.png        |  Bin 301 -> 320 bytes
 .../mods/default/textures/default_bronze_block.png |  Bin 368 -> 568 bytes
 .../mods/default/textures/default_bronze_ingot.png |  Bin 224 -> 358 bytes
 .../mods/default/textures/default_chest_front.png  |  Bin 682 -> 630 bytes
 .../mods/default/textures/default_chest_lock.png   |  Bin 780 -> 670 bytes
 .../mods/default/textures/default_chest_side.png   |  Bin 638 -> 576 bytes
 .../mods/default/textures/default_chest_top.png    |  Bin 627 -> 607 bytes
 .../mods/default/textures/default_cobble.png       |  Bin 323 -> 739 bytes
 .../mods/default/textures/default_copper_block.png |  Bin 453 -> 608 bytes
 .../mods/default/textures/default_copper_ingot.png |  Bin 224 -> 356 bytes
 .../textures/default_desert_stone_brick.png        |  Bin 405 -> 516 bytes
 .../mods/default/textures/default_dirt.png         |  Bin 835 -> 730 bytes
 .../default/textures/default_furnace_bottom.png    |  Bin 602 -> 578 bytes
 .../default/textures/default_furnace_front.png     |  Bin 553 -> 656 bytes
 .../textures/default_furnace_front_active.png      |  Bin 4278 -> 1694 bytes
 .../mods/default/textures/default_furnace_side.png |  Bin 602 -> 689 bytes
 .../mods/default/textures/default_furnace_top.png  |  Bin 602 -> 578 bytes
 .../mods/default/textures/default_glass_detail.png |  Bin 0 -> 183 bytes
 .../mods/default/textures/default_gold_block.png   |  Bin 693 -> 648 bytes
 .../mods/default/textures/default_gold_ingot.png   |  Bin 259 -> 313 bytes
 .../mods/default/textures/default_grass.png        |  Bin 657 -> 859 bytes
 .../mods/default/textures/default_grass_1.png      |  Bin 166 -> 226 bytes
 .../mods/default/textures/default_grass_2.png      |  Bin 203 -> 257 bytes
 .../mods/default/textures/default_grass_3.png      |  Bin 229 -> 319 bytes
 .../mods/default/textures/default_grass_4.png      |  Bin 252 -> 443 bytes
 .../mods/default/textures/default_grass_5.png      |  Bin 273 -> 550 bytes
 .../default/textures/default_grass_footsteps.png   |  Bin 771 -> 827 bytes
 .../mods/default/textures/default_grass_side.png   |  Bin 470 -> 473 bytes
 .../mods/default/textures/default_ladder.png       |  Bin 343 -> 703 bytes
 .../mods/default/textures/default_leaves.png       |  Bin 193 -> 744 bytes
 .../mods/default/textures/default_mossycobble.png  |  Bin 689 -> 819 bytes
 .../default/textures/default_obsidian_brick.png    |  Bin 0 -> 418 bytes
 .../mods/default/textures/default_pine_needles.png |  Bin 0 -> 512 bytes
 .../mods/default/textures/default_pine_sapling.png |  Bin 0 -> 406 bytes
 .../mods/default/textures/default_pinetree.png     |  Bin 0 -> 693 bytes
 .../mods/default/textures/default_pinetree_top.png |  Bin 0 -> 802 bytes
 .../mods/default/textures/default_pinewood.png     |  Bin 0 -> 455 bytes
 .../mods/default/textures/default_sign.png         |  Bin 0 -> 699 bytes
 .../mods/default/textures/default_snowball.png     |  Bin 127 -> 268 bytes
 .../mods/default/textures/default_steel_block.png  |  Bin 350 -> 604 bytes
 .../mods/default/textures/default_steel_ingot.png  |  Bin 270 -> 283 bytes
 .../minetest_game/mods/default/textures/heart.png  |  Bin 321 -> 368 bytes
 games/minetest_game/mods/default/trees.lua         |  488 +-
 games/minetest_game/mods/doors/init.lua            |   61 +-
 .../mods/doors/textures/door_brown.png             |  Bin 82 -> 127 bytes
 .../mods/doors/textures/door_grey.png              |  Bin 107 -> 115 bytes
 .../mods/doors/textures/door_steel_a.png           |  Bin 139 -> 449 bytes
 .../mods/doors/textures/door_steel_b.png           |  Bin 121 -> 461 bytes
 .../mods/doors/textures/door_wood_a.png            |  Bin 139 -> 555 bytes
 .../mods/doors/textures/door_wood_b.png            |  Bin 121 -> 539 bytes
 games/minetest_game/mods/dye/init.lua              |   68 +-
 games/minetest_game/mods/farming/api.lua           |   92 +-
 games/minetest_game/mods/farming/init.lua          |    5 +-
 games/minetest_game/mods/farming/nodes.lua         |   74 +-
 .../mods/farming/textures/farming_soil.png         |  Bin 713 -> 835 bytes
 .../mods/farming/textures/farming_soil_wet.png     |  Bin 659 -> 831 bytes
 .../farming/textures/farming_soil_wet_side.png     |  Bin 721 -> 109 bytes
 games/minetest_game/mods/fire/init.lua             |   26 +-
 games/minetest_game/mods/flowers/init.lua          |    9 +-
 games/minetest_game/mods/flowers/mapgen.lua        |   14 +-
 .../flowers/textures/flowers_dandelion_white.png   |  Bin 117 -> 2954 bytes
 .../flowers/textures/flowers_dandelion_yellow.png  |  Bin 116 -> 3013 bytes
 .../mods/flowers/textures/flowers_geranium.png     |  Bin 271 -> 3030 bytes
 .../mods/flowers/textures/flowers_rose.png         |  Bin 122 -> 264 bytes
 .../mods/flowers/textures/flowers_tulip.png        |  Bin 123 -> 3002 bytes
 .../mods/flowers/textures/flowers_viola.png        |  Bin 111 -> 291 bytes
 games/minetest_game/mods/screwdriver/init.lua      |  170 +-
 .../mods/screwdriver/textures/screwdriver.png      |  Bin 769 -> 261 bytes
 .../mods/screwdriver/textures/tool_mode1.png       |  Bin 211 -> 0 bytes
 .../mods/screwdriver/textures/tool_mode2.png       |  Bin 360 -> 0 bytes
 .../mods/screwdriver/textures/tool_mode3.png       |  Bin 367 -> 0 bytes
 .../mods/screwdriver/textures/tool_mode4.png       |  Bin 268 -> 0 bytes
 games/minetest_game/mods/sethome/init.lua          |    4 +-
 games/minetest_game/mods/stairs/init.lua           |    8 +
 games/minetest_game/mods/tnt/README.txt            |   19 +-
 games/minetest_game/mods/tnt/depends.txt           |    1 +
 games/minetest_game/mods/tnt/init.lua              |  470 +-
 .../minetest_game/mods/tnt/textures/tnt_smoke.png  |  Bin 184 -> 202 bytes
 .../vessels/textures/vessels_drinking_glass.png    |  Bin 190 -> 508 bytes
 .../textures/vessels_drinking_glass_inv.png        |  Bin 219 -> 508 bytes
 .../mods/vessels/textures/vessels_glass_bottle.png |  Bin 166 -> 341 bytes
 .../vessels/textures/vessels_glass_bottle_inv.png  |  Bin 283 -> 341 bytes
 .../vessels/textures/vessels_glass_fragments.png   |  Bin 180 -> 741 bytes
 .../mods/vessels/textures/vessels_steel_bottle.png |  Bin 251 -> 425 bytes
 .../vessels/textures/vessels_steel_bottle_inv.png  |  Bin 245 -> 425 bytes
 games/minetest_game/mods/xpanes/init.lua           |  298 +-
 games/minimal/mods/errorhandler_test/init.lua      |  106 +
 games/minimal/mods/experimental/init.lua           |   13 +-
 minetest.conf.example                              |  599 ++-
 misc/Info.plist                                    |   14 +
 misc/minetest-icon.icns                            |  Bin 0 -> 242668 bytes
 po/be/minetest.po                                  |  785 +--
 po/cs/minetest.po                                  | 1126 ++--
 po/da/minetest.po                                  | 1069 ++--
 po/de/minetest.po                                  | 1212 +++--
 po/es/minetest.po                                  | 1204 +++--
 po/et/minetest.po                                  | 1114 ++--
 po/fr/minetest.po                                  | 1232 +++--
 po/hu/minetest.po                                  | 1105 ++--
 po/id/minetest.po                                  | 1129 ++++
 po/it/minetest.po                                  | 1331 ++---
 po/ja/minetest.po                                  | 1250 ++---
 po/ko/minetest.po                                  |  772 +--
 po/ky/minetest.po                                  | 1086 ++--
 po/lt/minetest.po                                  | 1036 ++--
 po/minetest.pot                                    |  770 +--
 po/nb/minetest.po                                  |  850 +--
 po/nl/minetest.po                                  | 1215 +++--
 po/pl/minetest.po                                  | 1219 +++--
 po/pt/minetest.po                                  | 1218 +++--
 po/pt_BR/minetest.po                               | 1215 +++--
 po/ro/minetest.po                                  | 1129 ++--
 po/ru/minetest.po                                  | 1219 +++--
 po/uk/minetest.po                                  | 1096 ++--
 po/zh_CN/minetest.po                               | 1211 +++--
 src/CMakeLists.txt                                 |  195 +-
 src/ban.cpp                                        |   29 +-
 src/base64.cpp                                     |  194 +-
 src/biome.cpp                                      |  205 -
 src/biome.h                                        |   99 -
 src/camera.cpp                                     |  150 +-
 src/camera.h                                       |   20 +-
 src/cavegen.cpp                                    |  108 +-
 src/chat.cpp                                       |   11 +-
 src/chat.h                                         |    3 +-
 src/client.cpp                                     |  154 +-
 src/client.h                                       |   18 +
 src/clientiface.cpp                                |   16 +-
 src/clientiface.h                                  |    8 +
 src/clientmap.cpp                                  |   24 +-
 src/clientmap.h                                    |    4 +
 src/clientmedia.cpp                                |   65 +-
 src/clientmedia.h                                  |    4 +-
 src/clientobject.h                                 |    3 +
 src/clientserver.h                                 |    5 +-
 src/clouds.cpp                                     |   10 +-
 src/cmake_config.h.in                              |    3 +-
 src/collision.cpp                                  |   13 +-
 src/config.h                                       |    7 +-
 src/connection.cpp                                 |   58 +-
 src/connection.h                                   |    7 +-
 src/constants.h                                    |    8 +-
 src/content_cao.cpp                                |  334 +-
 src/content_cao.h                                  |    5 +
 src/content_cso.cpp                                |   13 +-
 src/content_mapblock.cpp                           |  368 +-
 src/content_sao.cpp                                |   10 +-
 src/content_sao.h                                  |    1 -
 src/convert_json.cpp                               |   40 +-
 src/database-dummy.cpp                             |  106 +-
 src/database-dummy.h                               |    8 +-
 src/database-leveldb.cpp                           |  129 +-
 src/database-leveldb.h                             |    8 +-
 src/database-redis.cpp                             |  131 +-
 src/database-redis.h                               |    4 +-
 src/database-sqlite3.cpp                           |  222 +-
 src/database-sqlite3.h                             |   21 +-
 src/database.h                                     |   15 +-
 src/defaultsettings.cpp                            |   62 +-
 src/defaultsettings.h                              |    6 -
 src/drawscene.cpp                                  |   95 +-
 src/drawscene.h                                    |    4 +-
 src/dungeongen.cpp                                 |   33 +-
 src/dungeongen.h                                   |   10 +-
 src/emerge.cpp                                     |   60 +-
 src/emerge.h                                       |   36 +-
 src/environment.cpp                                |  197 +-
 src/environment.h                                  |   13 +
 src/exceptions.h                                   |   12 +
 src/filesys.cpp                                    |  162 +-
 src/fontengine.cpp                                 |  461 ++
 src/fontengine.h                                   |  139 +
 src/game.cpp                                       | 5617 +++++++++++---------
 src/game.h                                         |   54 +-
 src/gamedef.h                                      |    8 +-
 src/gettime.h                                      |    2 +-
 src/guiChatConsole.cpp                             |   40 +-
 src/guiEngine.cpp                                  |   82 +-
 src/guiEngine.h                                    |    3 +
 src/guiFormSpecMenu.cpp                            |  769 ++-
 src/guiFormSpecMenu.h                              |   25 +-
 src/guiKeyChangeMenu.cpp                           |    8 +
 src/guiTable.cpp                                   |   33 +-
 src/httpfetch.cpp                                  |  442 +-
 src/httpfetch.h                                    |   16 +-
 src/hud.cpp                                        |   12 +-
 src/hud.h                                          |    7 +-
 src/inventory.cpp                                  |   30 +-
 src/inventory.h                                    |   28 +-
 src/inventorymanager.cpp                           |   11 +-
 src/irrlichttypes.h                                |   13 +-
 src/itemdef.cpp                                    |  147 +-
 src/jthread/pthread/jsemaphore.cpp                 |    7 +
 src/keycode.cpp                                    |    1 +
 src/localplayer.cpp                                |  106 +-
 src/localplayer.h                                  |    6 +-
 src/log.cpp                                        |   18 +
 src/log.h                                          |    9 +-
 src/main.cpp                                       | 2155 ++++----
 src/mainmenumanager.h                              |   26 +-
 src/map.cpp                                        |  608 ++-
 src/map.h                                          |   30 +-
 src/mapblock.cpp                                   |  104 +-
 src/mapblock.h                                     |   55 +-
 src/mapblock_mesh.cpp                              |  422 +-
 src/mapblock_mesh.h                                |   24 +
 src/mapgen.cpp                                     | 1053 +---
 src/mapgen.h                                       |  262 +-
 src/mapgen_indev.cpp                               |  383 --
 src/mapgen_indev.h                                 |  128 -
 src/mapgen_math.cpp                                |  366 --
 src/mapgen_math.h                                  |   68 -
 src/mapgen_singlenode.cpp                          |   23 +-
 src/mapgen_singlenode.h                            |    5 +-
 src/mapgen_v5.cpp                                  |  522 ++
 src/{mapgen_v7.h => mapgen_v5.h}                   |  105 +-
 src/mapgen_v6.cpp                                  |  252 +-
 src/mapgen_v6.h                                    |   24 +-
 src/mapgen_v7.cpp                                  |  294 +-
 src/mapgen_v7.h                                    |   32 +-
 src/mapnode.cpp                                    |   35 +-
 src/mapnode.h                                      |   44 +-
 src/mesh.cpp                                       | 1070 +++-
 src/mesh.h                                         |   46 +-
 src/mg_biome.cpp                                   |  119 +
 src/mg_biome.h                                     |   77 +
 src/mg_decoration.cpp                              |  351 ++
 src/mg_decoration.h                                |  150 +
 src/mg_ore.cpp                                     |  191 +
 src/mg_ore.h                                       |  124 +
 src/mg_schematic.cpp                               |  400 ++
 src/mg_schematic.h                                 |   92 +
 src/modalMenu.h                                    |    2 +
 src/mods.cpp                                       |   11 +-
 src/nodedef.cpp                                    | 1438 +++--
 src/nodedef.h                                      |  149 +-
 src/nodemetadata.cpp                               |   14 +-
 src/nodetimer.cpp                                  |   14 +-
 src/noise.cpp                                      |  582 +-
 src/noise.h                                        |  215 +-
 src/particles.cpp                                  |   21 +-
 src/player.cpp                                     |   48 +-
 src/player.h                                       |   51 +-
 src/porting.cpp                                    |   41 +-
 src/porting.h                                      |   43 +
 src/profiler.h                                     |    2 +
 src/quicktune_shortcutter.h                        |    5 +
 src/rollback.cpp                                   | 1446 +++--
 src/rollback.h                                     |   93 +-
 src/rollback_interface.cpp                         |  385 +-
 src/rollback_interface.h                           |   57 +-
 src/script/common/c_content.cpp                    |  130 +-
 src/script/common/c_content.h                      |   10 +-
 src/script/common/c_converter.cpp                  |   30 +
 src/script/common/c_converter.h                    |   42 +-
 src/script/common/c_internal.cpp                   |    4 +-
 src/script/cpp_api/s_base.cpp                      |   15 +-
 src/script/cpp_api/s_base.h                        |    4 +-
 src/script/cpp_api/s_entity.cpp                    |    8 +-
 src/script/cpp_api/s_env.cpp                       |   20 +-
 src/script/cpp_api/s_inventory.cpp                 |   12 +-
 src/script/cpp_api/s_item.cpp                      |   12 +-
 src/script/cpp_api/s_node.cpp                      |    9 +-
 src/script/cpp_api/s_nodemeta.cpp                  |   12 +-
 src/script/cpp_api/s_player.cpp                    |   14 +-
 src/script/lua_api/l_env.cpp                       |   80 +-
 src/script/lua_api/l_env.h                         |    3 +
 src/script/lua_api/l_mainmenu.cpp                  |   40 +-
 src/script/lua_api/l_mainmenu.h                    |    2 +
 src/script/lua_api/l_mapgen.cpp                    |  643 ++-
 src/script/lua_api/l_mapgen.h                      |   25 +-
 src/script/lua_api/l_noise.cpp                     |  121 +-
 src/script/lua_api/l_noise.h                       |   14 +-
 src/script/lua_api/l_object.cpp                    |   14 +-
 src/script/lua_api/l_rollback.cpp                  |    2 +-
 src/script/lua_api/l_server.cpp                    |   35 +
 src/script/lua_api/l_server.h                      |    5 +
 src/script/lua_api/l_settings.cpp                  |    5 +-
 src/script/lua_api/l_util.cpp                      |   44 +-
 src/script/lua_api/l_util.h                        |    6 +
 src/script/lua_api/l_vmanip.cpp                    |  120 +-
 src/script/lua_api/l_vmanip.h                      |    5 +
 src/serialization.cpp                              |    9 +-
 src/serialization.h                                |    4 +-
 src/server.cpp                                     |  167 +-
 src/server.h                                       |   10 +-
 src/serverlist.cpp                                 |   36 +-
 src/serverlist.h                                   |    1 +
 src/serverobject.h                                 |    5 -
 src/settings.cpp                                   |  990 ++++
 src/settings.h                                     |  939 +---
 src/shader.cpp                                     |    4 +-
 src/sky.cpp                                        |   57 +-
 src/sky.h                                          |    3 +-
 src/socket.cpp                                     |  188 +-
 src/socket.h                                       |   12 +-
 src/sound_openal.cpp                               |    2 +-
 src/staticobject.cpp                               |   32 +-
 src/subgame.cpp                                    |   39 +-
 src/test.cpp                                       |  385 +-
 src/tile.cpp                                       |  509 +-
 src/tile.h                                         |   34 +-
 src/treegen.cpp                                    |   27 +-
 src/treegen.h                                      |   10 +-
 src/util/numeric.h                                 |   18 +-
 src/util/serialize.cpp                             |   12 +-
 src/util/serialize.h                               |  124 +-
 src/util/string.cpp                                |  283 +-
 src/util/string.h                                  |  412 +-
 src/util/timetaker.cpp                             |   13 +-
 src/version.cpp                                    |   19 +-
 src/version.h                                      |    2 -
 src/voxel.cpp                                      |   70 +-
 src/voxel.h                                        |   20 +-
 src/wieldmesh.cpp                                  |  434 ++
 src/wieldmesh.h                                    |   77 +
 textures/base/pack/blank.png                       |  Bin 0 -> 95 bytes
 textures/base/pack/halo.png                        |  Bin 0 -> 194 bytes
 textures/base/pack/ladder_down.png                 |  Bin 2299 -> 0 bytes
 textures/base/pack/server_flags_creative.png       |  Bin 0 -> 273 bytes
 textures/base/pack/server_flags_damage.png         |  Bin 0 -> 774 bytes
 textures/base/pack/server_flags_pvp.png            |  Bin 0 -> 1056 bytes
 util/buildbot/buildwin32.sh                        |   81 +-
 util/buildbot/buildwin64.sh                        |   31 +-
 util/travis/before_install.sh                      |   29 +
 util/travis/script.sh                              |   24 +
 util/travis/toolchain_mingw.cmake.in               |   17 +
 util/updatepo.sh                                   |    6 +-
 457 files changed, 37732 insertions(+), 28020 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