[minetest-v04x] branch master updated (eb1aa89 -> a190b6f)
Markus Koschany
apo-guest at moszumanska.debian.org
Fri Feb 20 21:53:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a change to branch master
in repository minetest-v04x.
from eb1aa89 Drop debianization.patch. It is not needed to find the json library.
new 476d284 Imported Upstream version 0.4.12+repack
new 1b86001 Merge tag 'upstream/0.4.12+repack'
new 418ec31 Drop the following patches. They were merged upstream.
new 57f1de1 Update changelog for 0.4.12+repack-1 release.
new d4a073d Drop dynamic-link.patch.
new 67370ca Drop rawlua.patch.
new cbda547 Add FindJson.cmake.patch.
new 3357dbd Update changelog
new 9c1b9ba Readd rawlua.patch.
new f869174 Update changelog.
new a190b6f Set distribution to UNRELEASED.
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 2 +-
README.txt | 32 +-
build/android/AndroidManifest.xml.template | 2 +-
build/android/Makefile | 93 +-
build/android/jni/Android.mk | 19 +-
build/android/openssl_arch.patch | 11 +
.../org/minetest/minetest/MinetestAssetCopy.java | 430 +-
builtin/common/misc_helpers.lua | 98 +-
builtin/common/serialize.lua | 4 +-
builtin/common/strict.lua | 2 +-
builtin/game/builtin_biome.lua | 9 -
builtin/game/chatcommands.lua | 48 +
builtin/game/init.lua | 1 -
builtin/game/misc.lua | 24 -
builtin/game/register.lua | 43 +-
builtin/game/statbars.lua | 4 +-
builtin/mainmenu/common.lua | 68 +-
builtin/mainmenu/dlg_config_world.lua | 67 +-
builtin/mainmenu/dlg_create_world.lua | 6 +-
builtin/mainmenu/init.lua | 9 +-
builtin/mainmenu/init_simple.lua | 4 +
builtin/mainmenu/store.lua | 2 +-
builtin/mainmenu/tab_mods.lua | 4 +-
builtin/mainmenu/tab_multiplayer.lua | 48 +-
builtin/mainmenu/tab_settings.lua | 184 +-
builtin/mainmenu/tab_simple_main.lua | 25 +-
client/shaders/nodes_shader/opengl_fragment.glsl | 7 +-
client/shaders/nodes_shader/opengl_vertex.glsl | 31 +-
.../water_surface_shader/opengl_fragment.glsl | 7 +-
.../water_surface_shader/opengl_vertex.glsl | 30 +-
cmake/Modules/FindIrrlicht.cmake | 8 +-
cmake/Modules/FindSQLite3.cmake | 9 +
cmake/Modules/FindSqlite3.cmake | 18 -
debian/changelog | 28 +
.../{dynamic-link.patch => FindJson.cmake.patch} | 39 +-
debian/patches/desktop-file.patch | 19 -
debian/patches/hurd.patch | 217 -
debian/patches/hyphen-used-as-minus.patch | 22 -
debian/patches/i18n.patch | 4 +-
debian/patches/rawlua.patch | 21 +-
debian/patches/series | 5 +-
doc/lua_api.txt | 5366 +++++++++++---------
doc/menu_lua_api.txt | 20 +-
doc/minetest.6 | 2 +-
fonts/liberation_sans_14.xml | 100 -
fonts/liberation_sans_14_img.png | Bin 27786 -> 0 bytes
games/minetest_game/README.txt | 2 +-
games/minetest_game/game_api.txt | 59 +-
games/minetest_game/minetest.conf | 3 -
games/minetest_game/mods/bones/init.lua | 113 +-
games/minetest_game/mods/creative/init.lua | 1 +
games/minetest_game/mods/default/README.txt | 21 +-
games/minetest_game/mods/default/aliases.lua | 9 +-
games/minetest_game/mods/default/crafting.lua | 6 +
games/minetest_game/mods/default/functions.lua | 83 +-
games/minetest_game/mods/default/init.lua | 12 +-
games/minetest_game/mods/default/legacy.lua | 25 +
games/minetest_game/mods/default/mapgen.lua | 264 +-
games/minetest_game/mods/default/nodes.lua | 1715 ++++---
games/minetest_game/mods/default/player.lua | 2 +-
.../mods/default/textures/default_bronze_ingot.png | Bin 358 -> 232 bytes
.../mods/default/textures/default_clay_lump.png | Bin 333 -> 167 bytes
.../mods/default/textures/default_coal_lump.png | Bin 243 -> 160 bytes
.../mods/default/textures/default_copper_ingot.png | Bin 356 -> 233 bytes
.../mods/default/textures/default_copper_lump.png | Bin 234 -> 177 bytes
.../default/textures/default_furnace_fire_bg.png | Bin 204 -> 289 bytes
.../default/textures/default_furnace_fire_fg.png | Bin 719 -> 660 bytes
.../mods/default/textures/default_gold_lump.png | Bin 199 -> 165 bytes
.../mods/default/textures/default_iron_lump.png | Bin 253 -> 163 bytes
.../mods/default/textures/default_mese_crystal.png | Bin 362 -> 237 bytes
.../mods/default/textures/default_paper.png | Bin 327 -> 200 bytes
.../mods/default/textures/default_rail.png | Bin 414 -> 270 bytes
.../default/textures/default_rail_crossing.png | Bin 364 -> 271 bytes
.../mods/default/textures/default_rail_curved.png | Bin 361 -> 259 bytes
.../default/textures/default_rail_t_junction.png | Bin 374 -> 256 bytes
games/minetest_game/mods/default/trees.lua | 10 +-
games/minetest_game/mods/doors/init.lua | 156 +-
.../{door_close.ogg => doors_door_close.ogg} | Bin
.../sounds/{door_open.ogg => doors_door_open.ogg} | Bin
.../textures/{door_brown.png => doors_brown.png} | Bin
.../textures/{door_glass.png => doors_glass.png} | Bin
.../{door_glass_a.png => doors_glass_a.png} | Bin
.../{door_glass_b.png => doors_glass_b.png} | Bin
.../{door_glass_side.png => doors_glass_side.png} | Bin
.../textures/{door_grey.png => doors_grey.png} | Bin
...obsidian_glass.png => doors_obsidian_glass.png} | Bin
...dian_glass_a.png => doors_obsidian_glass_a.png} | Bin
...dian_glass_b.png => doors_obsidian_glass_b.png} | Bin
...lass_side.png => doors_obsidian_glass_side.png} | Bin
.../textures/{door_steel.png => doors_steel.png} | Bin
.../{door_steel_a.png => doors_steel_a.png} | Bin
.../{door_steel_b.png => doors_steel_b.png} | Bin
.../{door_trapdoor.png => doors_trapdoor.png} | Bin
...r_trapdoor_side.png => doors_trapdoor_side.png} | Bin
.../textures/{door_wood.png => doors_wood.png} | Bin
.../textures/{door_wood_a.png => doors_wood_a.png} | Bin
.../textures/{door_wood_b.png => doors_wood_b.png} | Bin
games/minetest_game/mods/farming/API.txt | 2 +-
games/minetest_game/mods/farming/README.txt | 29 +-
games/minetest_game/mods/farming/init.lua | 21 +-
games/minetest_game/mods/farming/nodes.lua | 8 +
.../mods/farming/textures/farming_cotton_1.png | Bin 95 -> 110 bytes
.../mods/farming/textures/farming_cotton_2.png | Bin 119 -> 120 bytes
.../mods/farming/textures/farming_cotton_3.png | Bin 148 -> 147 bytes
.../mods/farming/textures/farming_cotton_4.png | Bin 179 -> 155 bytes
.../mods/farming/textures/farming_cotton_5.png | Bin 221 -> 160 bytes
.../mods/farming/textures/farming_cotton_6.png | Bin 290 -> 164 bytes
.../mods/farming/textures/farming_cotton_7.png | Bin 317 -> 228 bytes
.../mods/farming/textures/farming_cotton_8.png | Bin 289 -> 331 bytes
.../mods/farming/textures/farming_cotton_seed.png | Bin 271 -> 150 bytes
.../mods/farming/textures/farming_flour.png | Bin 335 -> 164 bytes
.../mods/farming/textures/farming_straw.png | Bin 0 -> 892 bytes
.../mods/farming/textures/farming_wheat.png | Bin 547 -> 249 bytes
.../mods/farming/textures/farming_wheat_1.png | Bin 105 -> 174 bytes
.../mods/farming/textures/farming_wheat_2.png | Bin 143 -> 220 bytes
.../mods/farming/textures/farming_wheat_3.png | Bin 187 -> 319 bytes
.../mods/farming/textures/farming_wheat_4.png | Bin 227 -> 358 bytes
.../mods/farming/textures/farming_wheat_5.png | Bin 298 -> 409 bytes
.../mods/farming/textures/farming_wheat_6.png | Bin 396 -> 456 bytes
.../mods/farming/textures/farming_wheat_7.png | Bin 479 -> 493 bytes
.../mods/farming/textures/farming_wheat_8.png | Bin 582 -> 577 bytes
.../mods/farming/textures/farming_wheat_seed.png | Bin 325 -> 141 bytes
games/minetest_game/mods/screwdriver/readme.txt | 3 +
.../mods/screwdriver/textures/screwdriver.png | Bin 261 -> 182 bytes
games/minetest_game/mods/stairs/init.lua | 13 +
games/minetest_game/mods/tnt/init.lua | 2 +-
games/minimal/mods/default/init.lua | 1 -
games/minimal/mods/default/mapgen.lua | 36 +-
minetest.conf.example | 25 +-
misc/minetest.desktop | 3 +
po/cs/minetest.po | 690 +--
po/de/minetest.po | 18 +-
po/es/minetest.po | 283 +-
po/ja/minetest.po | 891 +---
src/CMakeLists.txt | 52 +-
src/camera.cpp | 2 +-
src/cavegen.cpp | 2 +-
src/cavegen.h | 24 +-
src/cguittfont/CGUITTFont.cpp | 8 +-
src/cguittfont/irrUString.h | 4 +-
src/chat.cpp | 2 +-
src/client.cpp | 231 +-
src/client.h | 45 +-
src/clientiface.cpp | 4 +-
src/clientmap.cpp | 3 +-
src/connection.cpp | 51 +-
src/connection.h | 16 +-
src/constants.h | 18 +-
src/content_cao.cpp | 5 +-
src/content_mapblock.cpp | 11 +-
src/content_sao.cpp | 36 +-
src/craftdef.cpp | 4 +-
src/database-dummy.cpp | 6 +
src/database-dummy.h | 1 +
src/database-leveldb.cpp | 13 +
src/database-leveldb.h | 1 +
src/database-redis.cpp | 24 +
src/database-redis.h | 1 +
src/database-sqlite3.cpp | 42 +-
src/database-sqlite3.h | 3 +-
src/database.h | 1 +
src/debug.cpp | 162 +-
src/debug.h | 44 +-
src/defaultsettings.cpp | 8 +-
src/drawscene.cpp | 123 +-
src/dungeongen.cpp | 5 +-
src/dungeongen.h | 4 +-
src/emerge.cpp | 169 +-
src/emerge.h | 16 +-
src/environment.cpp | 2 +
src/environment.h | 48 +-
src/exceptions.h | 6 -
src/fontengine.cpp | 34 +-
src/game.cpp | 254 +-
src/gettext.cpp | 54 +-
src/gettext.h | 64 +-
src/guiChatConsole.cpp | 30 +-
src/guiEngine.cpp | 3 +-
src/guiFormSpecMenu.cpp | 131 +-
src/guiFormSpecMenu.h | 10 +-
src/guiKeyChangeMenu.cpp | 41 +-
src/guiKeyChangeMenu.h | 8 +-
src/guiPasswordChange.cpp | 24 +-
src/guiTable.cpp | 9 +-
src/guiVolumeChange.cpp | 4 +-
src/hud.cpp | 64 +-
src/inventorymanager.cpp | 4 +-
src/jthread/jevent.h | 4 +-
src/jthread/jsemaphore.h | 4 +-
src/jthread/pthread/jevent.cpp | 2 +-
src/jthread/pthread/jsemaphore.cpp | 20 +-
src/jthread/pthread/jthread.cpp | 7 +-
src/jthread/win32/jsemaphore.cpp | 14 +-
src/light.cpp | 98 +-
src/light.h | 30 +-
src/localplayer.cpp | 33 +-
src/log.cpp | 11 +-
src/main.cpp | 46 +-
src/map.cpp | 135 +-
src/map.h | 25 +-
src/mapblock.cpp | 78 +-
src/mapblock.h | 34 +
src/mapblock_mesh.cpp | 21 +-
src/mapgen.cpp | 82 +-
src/mapgen.h | 21 +-
src/mapgen_singlenode.cpp | 20 +-
src/mapgen_v5.cpp | 244 +-
src/mapgen_v5.h | 12 +-
src/mapgen_v6.cpp | 75 +-
src/mapgen_v6.h | 9 +-
src/mapgen_v7.cpp | 242 +-
src/mapgen_v7.h | 13 +-
src/mapnode.cpp | 31 +-
src/mapnode.h | 36 +-
src/mg_biome.cpp | 72 +-
src/mg_biome.h | 15 +-
src/mg_decoration.cpp | 53 +-
src/mg_decoration.h | 26 +-
src/mg_ore.cpp | 188 +-
src/mg_ore.h | 72 +-
src/mg_schematic.cpp | 36 +-
src/mg_schematic.h | 14 +-
src/mods.cpp | 2 +-
src/nodedef.cpp | 243 +-
src/nodedef.h | 190 +-
src/nodemetadata.cpp | 4 +-
src/noise.h | 8 +-
src/particles.cpp | 340 +-
src/particles.h | 62 +-
src/player.cpp | 6 +-
src/porting.cpp | 124 +-
src/porting.h | 17 +-
src/script/common/c_content.cpp | 1 -
src/script/common/c_converter.cpp | 3 +-
src/script/cpp_api/s_async.cpp | 2 +-
src/script/cpp_api/s_env.cpp | 31 -
src/script/cpp_api/s_env.h | 2 -
src/script/lua_api/l_env.cpp | 39 +-
src/script/lua_api/l_env.h | 13 +-
src/script/lua_api/l_item.cpp | 40 +-
src/script/lua_api/l_mainmenu.cpp | 96 +-
src/script/lua_api/l_mainmenu.h | 10 +-
src/script/lua_api/l_mapgen.cpp | 219 +-
src/script/lua_api/l_mapgen.h | 14 +-
src/script/lua_api/l_object.cpp | 14 +-
src/script/lua_api/l_rollback.cpp | 10 +
src/script/lua_api/l_vmanip.cpp | 84 +-
src/script/lua_api/l_vmanip.h | 9 +-
src/serialization.h | 8 +-
src/server.cpp | 63 +-
src/server.h | 3 +
src/serverlist.cpp | 14 +-
src/serverlist.h | 2 +-
src/settings.cpp | 37 +-
src/settings.h | 14 +-
src/sky.cpp | 24 +-
src/sky.h | 5 +-
src/subgame.cpp | 37 +-
src/test.cpp | 7 +-
src/tile.cpp | 238 +-
src/touchscreengui.cpp | 92 +-
src/touchscreengui.h | 9 +-
src/treegen.cpp | 20 +-
src/treegen.h | 16 +-
src/util/container.h | 99 +-
src/util/numeric.h | 20 +
src/util/string.cpp | 84 +-
src/util/string.h | 359 +-
src/voxel.cpp | 26 +-
src/voxel.h | 15 +-
src/wieldmesh.cpp | 26 +-
textures/base/pack/camera_btn.png | Bin 0 -> 789 bytes
textures/base/pack/debug_btn.png | Bin 0 -> 960 bytes
textures/base/pack/drop_btn.png | Bin 0 -> 561 bytes
textures/base/pack/fast_btn.png | Bin 0 -> 935 bytes
textures/base/pack/fly_btn.png | Bin 0 -> 783 bytes
textures/base/pack/noclip_btn.png | Bin 0 -> 1151 bytes
textures/base/pack/rangeview_btn.png | Bin 0 -> 1604 bytes
util/buildbot/buildwin32.sh | 12 +-
util/buildbot/buildwin64.sh | 12 +-
util/bump_version.sh | 100 +
util/updatepo.sh | 18 +-
282 files changed, 10303 insertions(+), 8092 deletions(-)
create mode 100644 build/android/openssl_arch.patch
delete mode 100644 builtin/game/builtin_biome.lua
create mode 100644 builtin/mainmenu/init_simple.lua
create mode 100644 cmake/Modules/FindSQLite3.cmake
delete mode 100644 cmake/Modules/FindSqlite3.cmake
rename debian/patches/{dynamic-link.patch => FindJson.cmake.patch} (55%)
delete mode 100644 debian/patches/desktop-file.patch
delete mode 100644 debian/patches/hurd.patch
delete mode 100644 debian/patches/hyphen-used-as-minus.patch
delete mode 100644 fonts/liberation_sans_14.xml
delete mode 100644 fonts/liberation_sans_14_img.png
create mode 100644 games/minetest_game/mods/default/legacy.lua
rename games/minetest_game/mods/doors/sounds/{door_close.ogg => doors_door_close.ogg} (100%)
rename games/minetest_game/mods/doors/sounds/{door_open.ogg => doors_door_open.ogg} (100%)
rename games/minetest_game/mods/doors/textures/{door_brown.png => doors_brown.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_glass.png => doors_glass.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_glass_a.png => doors_glass_a.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_glass_b.png => doors_glass_b.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_glass_side.png => doors_glass_side.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_grey.png => doors_grey.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_obsidian_glass.png => doors_obsidian_glass.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_obsidian_glass_a.png => doors_obsidian_glass_a.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_obsidian_glass_b.png => doors_obsidian_glass_b.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_obsidian_glass_side.png => doors_obsidian_glass_side.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_steel.png => doors_steel.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_steel_a.png => doors_steel_a.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_steel_b.png => doors_steel_b.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_trapdoor.png => doors_trapdoor.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_trapdoor_side.png => doors_trapdoor_side.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_wood.png => doors_wood.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_wood_a.png => doors_wood_a.png} (100%)
rename games/minetest_game/mods/doors/textures/{door_wood_b.png => doors_wood_b.png} (100%)
create mode 100644 games/minetest_game/mods/farming/textures/farming_straw.png
mode change 100755 => 100644 src/jthread/win32/jsemaphore.cpp
create mode 100644 textures/base/pack/camera_btn.png
create mode 100644 textures/base/pack/debug_btn.png
create mode 100644 textures/base/pack/drop_btn.png
create mode 100644 textures/base/pack/fast_btn.png
create mode 100644 textures/base/pack/fly_btn.png
create mode 100644 textures/base/pack/noclip_btn.png
create mode 100644 textures/base/pack/rangeview_btn.png
create mode 100755 util/bump_version.sh
--
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