Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
This file has been truncated, but you can view the full file.
diff -ruN minetest-db_backends/builtin/builtin.lua minetest-digging_animation/builtin/builtin.lua
--- minetest-db_backends/builtin/builtin.lua 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/builtin/builtin.lua 2012-10-31 18:50:34.000000000 +0100
@@ -22,4 +22,5 @@
dofile(minetest.get_modpath("__builtin").."/chatcommands.lua")
dofile(minetest.get_modpath("__builtin").."/static_spawn.lua")
dofile(minetest.get_modpath("__builtin").."/detached_inventory.lua")
+dofile(minetest.get_modpath("__builtin").."/falling.lua")
diff -ruN minetest-db_backends/builtin/chatcommands.lua minetest-digging_animation/builtin/chatcommands.lua
--- minetest-db_backends/builtin/chatcommands.lua 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/builtin/chatcommands.lua 2012-11-02 13:29:52.000000000 +0100
@@ -215,8 +215,8 @@
privs = {password=true},
func = function(name, param)
toname = param
- if toname == "" then
- minetest.chat_send_player(name, "Name field required")
+ if not toname then
+ minetest.chat_send_player(toname, "Name field required")
return
end
minetest.set_player_password(toname, '')
diff -ruN minetest-db_backends/builtin/falling.lua minetest-digging_animation/builtin/falling.lua
--- minetest-db_backends/builtin/falling.lua 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/builtin/falling.lua 2012-11-04 10:27:36.000000000 +0100
@@ -0,0 +1,141 @@
+-- Minetest: builtin/item.lua
+
+--
+-- Falling stuff
+--
+
+minetest.register_entity("__builtin:falling_node", {
+ initial_properties = {
+ physical = true,
+ collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
+ visual = "wielditem",
+ textures = {},
+ visual_size = {x=0.667, y=0.667},
+ },
+
+ nodename = "",
+
+ set_node = function(self, nodename)
+ self.nodename = nodename
+ local stack = ItemStack(nodename)
+ local itemtable = stack:to_table()
+ local itemname = nil
+ if itemtable then
+ itemname = stack:to_table().name
+ end
+ local item_texture = nil
+ local item_type = ""
+ if minetest.registered_items[itemname] then
+ item_texture = minetest.registered_items[itemname].inventory_image
+ item_type = minetest.registered_items[itemname].type
+ end
+ prop = {
+ is_visible = true,
+ textures = {nodename},
+ }
+ self.object:set_properties(prop)
+ end,
+
+ get_staticdata = function(self)
+ return self.nodename
+ end,
+
+ on_activate = function(self, staticdata)
+ self.nodename = staticdata
+ self.object:set_armor_groups({immortal=1})
+ --self.object:setacceleration({x=0, y=-10, z=0})
+ self:set_node(self.nodename)
+ end,
+
+ on_step = function(self, dtime)
+ -- Set gravity
+ self.object:setacceleration({x=0, y=-10, z=0})
+ -- Turn to actual sand when collides to ground or just move
+ local pos = self.object:getpos()
+ local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point
+ local bcn = minetest.env:get_node(bcp)
+ -- Note: walkable is in the node definition, not in item groups
+ if minetest.registered_nodes[bcn.name] and
+ minetest.registered_nodes[bcn.name].walkable then
+ local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
+ -- Check what's here
+ local n2 = minetest.env:get_node(np)
+ -- If it's not air or liquid, remove node and replace it with
+ -- it's drops
+ if n2.name ~= "air" and (not minetest.registered_nodes[n2.name] or
+ minetest.registered_nodes[n2.name].liquidtype == "none") then
+ local drops = minetest.get_node_drops(n2.name, "")
+ minetest.env:remove_node(np)
+ -- Add dropped items
+ local _, dropped_item
+ for _, dropped_item in ipairs(drops) do
+ minetest.env:add_item(np, dropped_item)
+ end
+ -- Run script hook
+ local _, callback
+ for _, callback in ipairs(minetest.registered_on_dignodes) do
+ callback(np, n2, nil)
+ end
+ end
+ -- Create node and remove entity
+ minetest.env:add_node(np, {name=self.nodename})
+ self.object:remove()
+ else
+ -- Do nothing
+ end
+ end
+})
+
+function spawn_falling_node(p, nodename)
+ obj = minetest.env:add_entity(p, "__builtin:falling_node")
+ obj:get_luaentity():set_node(nodename)
+end
+
+--
+-- Some common functions
+--
+
+function nodeupdate_single(p)
+ n = minetest.env:get_node(p)
+ if minetest.get_node_group(n.name, "falling_node") ~= 0 then
+ p_bottom = {x=p.x, y=p.y-1, z=p.z}
+ n_bottom = minetest.env:get_node(p_bottom)
+ -- Note: walkable is in the node definition, not in item groups
+ if minetest.registered_nodes[n_bottom.name] and
+ not minetest.registered_nodes[n_bottom.name].walkable then
+ minetest.env:remove_node(p)
+ spawn_falling_node(p, n.name)
+ nodeupdate(p)
+ end
+ end
+end
+
+function nodeupdate(p)
+ -- Round p to prevent falling entities to get stuck
+ p.x = math.floor(p.x+0.5)
+ p.y = math.floor(p.y+0.5)
+ p.z = math.floor(p.z+0.5)
+
+ for x = -1,1 do
+ for y = -1,1 do
+ for z = -1,1 do
+ p2 = {x=p.x+x, y=p.y+y, z=p.z+z}
+ nodeupdate_single(p2)
+ end
+ end
+ end
+end
+
+--
+-- Global callbacks
+--
+
+function on_placenode(p, node)
+ nodeupdate(p)
+end
+minetest.register_on_placenode(on_placenode)
+
+function on_dignode(p, node)
+ nodeupdate(p)
+end
+minetest.register_on_dignode(on_dignode)
diff -ruN minetest-db_backends/builtin/misc_register.lua minetest-digging_animation/builtin/misc_register.lua
--- minetest-db_backends/builtin/misc_register.lua 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/builtin/misc_register.lua 2012-11-03 18:58:16.000000000 +0100
@@ -259,6 +259,7 @@
diggable = false,
buildable_to = true,
air_equivalent = true,
+ drop = "",
groups = {not_in_creative_inventory=1},
})
@@ -274,6 +275,7 @@
diggable = false,
buildable_to = true, -- A way to remove accidentally placed ignores
air_equivalent = true,
+ drop = "",
groups = {not_in_creative_inventory=1},
})
diff -ruN minetest-db_backends/cmake/Modules/FindMySQL.cmake minetest-digging_animation/cmake/Modules/FindMySQL.cmake
--- minetest-db_backends/cmake/Modules/FindMySQL.cmake 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/cmake/Modules/FindMySQL.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-# - Find mysqlclient
-# Find the native MySQL includes and library
-#
-# MYSQL_INCLUDE_DIR - where to find mysql.h, etc.
-# MYSQL_LIBRARIES - List of libraries when using MySQL.
-# MYSQL_FOUND - True if MySQL found.
-
-IF (MYSQL_INCLUDE_DIR)
- # Already in cache, be silent
- SET(MYSQL_FIND_QUIETLY TRUE)
-ENDIF (MYSQL_INCLUDE_DIR)
-
-FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
- /usr/local/include/mysql
- /usr/include/mysql
-)
-
-SET(MYSQL_NAMES mysqlclient mysqlclient_r)
-FIND_LIBRARY(MYSQL_LIBRARY
- NAMES ${MYSQL_NAMES}
- PATHS /usr/lib /usr/local/lib
- PATH_SUFFIXES mysql
-)
-
-IF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
- SET(MYSQL_FOUND TRUE)
- SET( MYSQL_LIBRARIES ${MYSQL_LIBRARY} )
-ELSE (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
- SET(MYSQL_FOUND FALSE)
- SET( MYSQL_LIBRARIES )
-ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
-
-IF (MYSQL_FOUND)
- IF (NOT MYSQL_FIND_QUIETLY)
- MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARY}")
- ENDIF (NOT MYSQL_FIND_QUIETLY)
-ELSE (MYSQL_FOUND)
- IF (MYSQL_FIND_REQUIRED)
- MESSAGE(STATUS "Looked for MySQL libraries named ${MYSQL_NAMES}.")
- MESSAGE(FATAL_ERROR "Could NOT find MySQL library")
- ENDIF (MYSQL_FIND_REQUIRED)
-ENDIF (MYSQL_FOUND)
-
-MARK_AS_ADVANCED(
- MYSQL_LIBRARY
- MYSQL_INCLUDE_DIR
- )
diff -ruN minetest-db_backends/CMakeLists.txt minetest-digging_animation/CMakeLists.txt
--- minetest-db_backends/CMakeLists.txt 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/CMakeLists.txt 2012-11-02 13:29:52.000000000 +0100
@@ -9,10 +9,10 @@
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
-# Also remember to set MT_PROTOCOL_VERSION in clientserver.h when releasing
+# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
set(VERSION_MAJOR 0)
set(VERSION_MINOR 4)
-set(VERSION_PATCH 3^)
+set(VERSION_PATCH 3)
if(VERSION_EXTRA)
set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
endif()
diff -ruN minetest-db_backends/doc/lua_api.txt minetest-digging_animation/doc/lua_api.txt
--- minetest-db_backends/doc/lua_api.txt 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/doc/lua_api.txt 2012-11-03 20:35:37.000000000 +0100
@@ -456,6 +456,7 @@
- disable_jump: Player (and possibly other things) cannot jump from node
- fall_damage_add_percent: damage speed = speed * (1 + value/100)
- bouncy: value is bounce speed in percent
+- falling_node: if there is no walkable block under the node it will fall
Known damage and digging time defining groups
----------------------------------------------
@@ -1346,6 +1347,8 @@
liquid_alternative_flowing = "", -- Flowing version of source liquid
liquid_alternative_source = "", -- Source version of flowing liquid
liquid_viscosity = 0, -- Higher viscosity = slower flow (max. 7)
+ liquid_renewable = true, -- Can new liquid source be created by placing
+ two or more sources nearly?
light_source = 0, -- Amount of light emitted by node
damage_per_second = 0, -- If player is inside node, this damage is caused
node_box = {type="regular"}, -- See "Node boxes"
diff -ruN minetest-db_backends/games/minimal/mods/bucket/init.lua minetest-digging_animation/games/minimal/mods/bucket/init.lua
--- minetest-db_backends/games/minimal/mods/bucket/init.lua 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/games/minimal/mods/bucket/init.lua 2012-11-02 13:29:52.000000000 +0100
@@ -40,19 +40,14 @@
if pointed_thing.type ~= "node" then
return
end
- -- Check if pointing to a buildable node
+ -- Check if pointing to a liquid
n = minetest.env:get_node(pointed_thing.under)
- if minetest.registered_nodes[n.name].buildable_to then
- -- buildable
- minetest.env:add_node(pointed_thing.under, {name=source})
- else
- n = minetest.env:get_node(pointed_thing.above)
- -- not buildable
- -- check if its allowed to replace the node
- if not minetest.registered_nodes[n.name].buildable_to then
- return
- end
+ if bucket.liquids[n.name] == nil then
+ -- Not a liquid
minetest.env:add_node(pointed_thing.above, {name=source})
+ elseif n.name ~= source then
+ -- It's a liquid
+ minetest.env:add_node(pointed_thing.under, {name=source})
end
return {name="bucket:bucket_empty"}
end
diff -ruN minetest-db_backends/games/minimal/mods/default/init.lua minetest-digging_animation/games/minimal/mods/default/init.lua
--- minetest-db_backends/games/minimal/mods/default/init.lua 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/games/minimal/mods/default/init.lua 2012-11-02 13:29:52.000000000 +0100
@@ -769,7 +769,7 @@
description = "Sand",
tiles ={"default_sand.png"},
is_ground_content = true,
- groups = {crumbly=3},
+ groups = {crumbly=3, falling_node=1},
sounds = default.node_sound_sand_defaults(),
})
@@ -777,7 +777,7 @@
description = "Gravel",
tiles ={"default_gravel.png"},
is_ground_content = true,
- groups = {crumbly=2},
+ groups = {crumbly=2, falling_node=1},
sounds = default.node_sound_dirt_defaults({
footstep = {name="default_gravel_footstep", gain=0.45},
}),
@@ -1586,73 +1586,22 @@
minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
minetest.register_alias("mapgen_mese", "default:mese")
---
--- Some common functions
---
-
-default.falling_node_names = {}
-
-function nodeupdate_single(p)
- n = minetest.env:get_node(p)
- if default.falling_node_names[n.name] ~= nil then
- p_bottom = {x=p.x, y=p.y-1, z=p.z}
- n_bottom = minetest.env:get_node(p_bottom)
- if n_bottom.name == "air" then
- minetest.env:remove_node(p)
- minetest.env:add_entity(p, "default:falling_"..n.name)
- nodeupdate(p)
- end
- end
+-- Support old code
+function default.spawn_falling_node(p, nodename)
+ spawn_falling_node(p, nodename)
end
-function nodeupdate(p)
- for x = -1,1 do
- for y = -1,1 do
- for z = -1,1 do
- p2 = {x=p.x+x, y=p.y+y, z=p.z+z}
- nodeupdate_single(p2)
- end
- end
- end
-end
-
---
--- Falling stuff
---
-
+-- Horrible crap to support old code
+-- Don't use this and never do what this does, it's completely wrong!
+-- (More specifically, the client and the C++ code doesn't get the group)
function default.register_falling_node(nodename, texture)
- default.falling_node_names[nodename] = true
- -- Override naming conventions for stuff like :default:falling_default:sand
- minetest.register_entity(":default:falling_"..nodename, {
- -- Static definition
- physical = true,
- collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
- visual = "cube",
- textures = {texture,texture,texture,texture,texture,texture},
- -- State
- -- Methods
- on_step = function(self, dtime)
- -- Set gravity
- self.object:setacceleration({x=0, y=-10, z=0})
- -- Turn to actual sand when collides to ground or just move
- local pos = self.object:getpos()
- local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point
- local bcn = minetest.env:get_node(bcp)
- if bcn.name ~= "air" then
- -- Turn to a sand node
- local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
- minetest.env:add_node(np, {name=nodename})
- self.object:remove()
- else
- -- Do nothing
- end
- end
- })
+ minetest.log("error", debug.traceback())
+ minetest.log('error', "WARNING: default.register_falling_node is deprecated")
+ if minetest.registered_nodes[nodename] then
+ minetest.registered_nodes[nodename].groups.falling_node = 1
+ end
end
-default.register_falling_node("default:sand", "default_sand.png")
-default.register_falling_node("default:gravel", "default_gravel.png")
-
--
-- Global callbacks
--
@@ -1665,13 +1614,11 @@
function on_placenode(p, node)
--print("on_placenode")
- nodeupdate(p)
end
minetest.register_on_placenode(on_placenode)
function on_dignode(p, node)
--print("on_dignode")
- nodeupdate(p)
end
minetest.register_on_dignode(on_dignode)
diff -ruN minetest-db_backends/.git/COMMIT_EDITMSG minetest-digging_animation/.git/COMMIT_EDITMSG
--- minetest-db_backends/.git/COMMIT_EDITMSG 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/COMMIT_EDITMSG 2012-11-03 18:29:01.000000000 +0100
@@ -0,0 +1 @@
+Make air and ignore drop nothing
diff -ruN minetest-db_backends/.git/config minetest-digging_animation/.git/config
--- minetest-db_backends/.git/config 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/config 2012-11-04 10:30:57.000000000 +0100
@@ -0,0 +1,20 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+[remote "origin"]
+ fetch = +refs/heads/*:refs/remotes/origin/*
+ url = https://github.com/PilzAdam/minetest.git
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
+[remote "community"]
+ url = https://github.com/minetest/minetest.git
+ fetch = +refs/heads/*:refs/remotes/community/*
+[remote "upstream"]
+ url = https://github.com/celeron55/minetest.git
+ fetch = +refs/heads/*:refs/remotes/upstream/*
+[remote "TANK"]
+ url = https://github.com/jordan4ibanez/minetest.git
+ fetch = +refs/heads/*:refs/remotes/TANK/*
diff -ruN minetest-db_backends/.git/description minetest-digging_animation/.git/description
--- minetest-db_backends/.git/description 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/description 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff -ruN minetest-db_backends/.git/FETCH_HEAD minetest-digging_animation/.git/FETCH_HEAD
--- minetest-db_backends/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/FETCH_HEAD 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1,16 @@
+4fb6c07535cff9a385344f5025b25892b828ebc4 not-for-merge branch 'c55sound' of https://github.com/jordan4ibanez/minetest
+7eccdb90773c9cb5283572dd0cf47ca3b3fa44d7 not-for-merge branch 'chunkymapgen' of https://github.com/jordan4ibanez/minetest
+6e6caba2f5eaa1086aebade39b32f91042a54652 not-for-merge branch 'digging_time_groups' of https://github.com/jordan4ibanez/minetest
+ca0fd4173cb18dd54219a1e8f05ec412e4d707ec not-for-merge branch 'mainmenutabs' of https://github.com/jordan4ibanez/minetest
+e6f5c18357197dcc9d6dd7ba9df50e0d84440717 not-for-merge branch 'master' of https://github.com/jordan4ibanez/minetest
+7678e6d964d270409a50d4ddd28f99baf40c3ba9 not-for-merge branch 'meshanim_rebased' of https://github.com/jordan4ibanez/minetest
+ce1fb15048c06eb3e1d9b34cc191b34d4d101f6e not-for-merge branch 'metadatastuff' of https://github.com/jordan4ibanez/minetest
+fb3ac49335496e3ebc4601a58d6afb356d7b42d2 not-for-merge branch 'next' of https://github.com/jordan4ibanez/minetest
+7372282a725cc9633eba3bb7bae8f4055e3235bb not-for-merge branch 'oldmaster' of https://github.com/jordan4ibanez/minetest
+1f48220f32f7e630c90311dcbdcba173b1df1814 not-for-merge branch 'patch-1' of https://github.com/jordan4ibanez/minetest
+e759ed71440456544ef5062d2355a8bf59aaa6fc not-for-merge branch 'patch-2' of https://github.com/jordan4ibanez/minetest
+bafaa8603fcd365f764defd7476b798ae8e426fc not-for-merge branch 'patch-3' of https://github.com/jordan4ibanez/minetest
+37d6c3a2f19854caf6dfeb352cb9f6c50bb52757 not-for-merge branch 'patch-4' of https://github.com/jordan4ibanez/minetest
+46bceebe2f53be05afb1fe42cf8087ee02337c53 not-for-merge branch 'randomstuff' of https://github.com/jordan4ibanez/minetest
+bc0e5c0063d2af107f81853c5ff555c57d1a9e3a not-for-merge branch 'stable' of https://github.com/jordan4ibanez/minetest
+960009d619c161a6f60a21edd880d751626e5b91 not-for-merge branch 'stable-0.2.20110922' of https://github.com/jordan4ibanez/minetest
diff -ruN minetest-db_backends/.git/HEAD minetest-digging_animation/.git/HEAD
--- minetest-db_backends/.git/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/HEAD 2012-11-04 15:03:41.078740911 +0100
@@ -0,0 +1 @@
+ref: refs/heads/digging_animation
diff -ruN minetest-db_backends/.git/hooks/applypatch-msg.sample minetest-digging_animation/.git/hooks/applypatch-msg.sample
--- minetest-db_backends/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/hooks/applypatch-msg.sample 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit. The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+ exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:
diff -ruN minetest-db_backends/.git/hooks/commit-msg.sample minetest-digging_animation/.git/hooks/commit-msg.sample
--- minetest-db_backends/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/hooks/commit-msg.sample 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message. The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit. The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+ sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
+ echo >&2 Duplicate Signed-off-by lines.
+ exit 1
+}
diff -ruN minetest-db_backends/.git/hooks/post-update.sample minetest-digging_animation/.git/hooks/post-update.sample
--- minetest-db_backends/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/hooks/post-update.sample 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff -ruN minetest-db_backends/.git/hooks/pre-applypatch.sample minetest-digging_animation/.git/hooks/pre-applypatch.sample
--- minetest-db_backends/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/hooks/pre-applypatch.sample 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:
diff -ruN minetest-db_backends/.git/hooks/pre-commit.sample minetest-digging_animation/.git/hooks/pre-commit.sample
--- minetest-db_backends/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/hooks/pre-commit.sample 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+ against=HEAD
+else
+ # Initial commit: diff against an empty tree object
+ against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+ # Note that the use of brackets around a tr range is ok here, (it's
+ # even required, for portability to Solaris 10's /usr/bin/tr), since
+ # the square bracket bytes happen to fall in the designated range.
+ test $(git diff --cached --name-only --diff-filter=A -z $against |
+ LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+ echo "Error: Attempt to add a non-ascii file name."
+ echo
+ echo "This can cause problems if you want to work"
+ echo "with people on other platforms."
+ echo
+ echo "To be portable it is advisable to rename the file ..."
+ echo
+ echo "If you know what you are doing you can disable this"
+ echo "check using:"
+ echo
+ echo " git config hooks.allownonascii true"
+ echo
+ exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff -ruN minetest-db_backends/.git/hooks/prepare-commit-msg.sample minetest-digging_animation/.git/hooks/prepare-commit-msg.sample
--- minetest-db_backends/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/hooks/prepare-commit-msg.sample 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source. The hook's purpose is to edit the commit
+# message file. If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output. It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited. This is rarely a good idea.
+
+case "$2,$3" in
+ merge,)
+ /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+# /usr/bin/perl -i.bak -pe '
+# print "\n" . `git diff --cached --name-status -r`
+# if /^#/ && $first++ == 0' "$1" ;;
+
+ *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
diff -ruN minetest-db_backends/.git/hooks/pre-rebase.sample minetest-digging_animation/.git/hooks/pre-rebase.sample
--- minetest-db_backends/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/hooks/pre-rebase.sample 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+ topic="refs/heads/$2"
+else
+ topic=`git symbolic-ref HEAD` ||
+ exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+ ;;
+*)
+ exit 0 ;# we do not interrupt others.
+ ;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master. Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+ echo >&2 "No such branch $topic"
+ exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+ echo >&2 "$topic is fully merged to master; better remove it."
+ exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next? If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+ not_in_topic=`git rev-list "^$topic" master`
+ if test -z "$not_in_topic"
+ then
+ echo >&2 "$topic is already up-to-date with master"
+ exit 1 ;# we could allow it, but there is no point.
+ else
+ exit 0
+ fi
+else
+ not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+ /usr/bin/perl -e '
+ my $topic = $ARGV[0];
+ my $msg = "* $topic has commits already merged to public branch:\n";
+ my (%not_in_next) = map {
+ /^([0-9a-f]+) /;
+ ($1 => 1);
+ } split(/\n/, $ARGV[1]);
+ for my $elem (map {
+ /^([0-9a-f]+) (.*)$/;
+ [$1 => $2];
+ } split(/\n/, $ARGV[2])) {
+ if (!exists $not_in_next{$elem->[0]}) {
+ if ($msg) {
+ print STDERR $msg;
+ undef $msg;
+ }
+ print STDERR " $elem->[1]\n";
+ }
+ }
+ ' "$topic" "$not_in_next" "$not_in_master"
+ exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+ merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+ it is deleted. If you need to build on top of it to correct
+ earlier mistakes, a new topic branch is created by forking at
+ the tip of the "master". This is not strictly necessary, but
+ it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+ branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next". Young
+ topic branches can have stupid mistakes you would rather
+ clean up before publishing, and things that have not been
+ merged into other branches can be easily rebased without
+ affecting other people. But once it is published, you would
+ not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+ Then you can delete it. More importantly, you should not
+ build on top of it -- other people may already want to
+ change things related to the topic as patches against your
+ "master", so if you need further changes, it is better to
+ fork the topic (perhaps with the same name) afresh from the
+ tip of "master".
+
+Let's look at this example:
+
+ o---o---o---o---o---o---o---o---o---o "next"
+ / / / /
+ / a---a---b A / /
+ / / / /
+ / / c---c---c---c B /
+ / / / \ /
+ / / / b---b C \ /
+ / / / / \ /
+ ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished. It has been fully merged up to "master" and "next",
+ and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+ git rev-list ^master ^topic next
+ git rev-list ^master next
+
+ if these match, topic has not merged in next at all.
+
+To compute (2):
+
+ git rev-list master..topic
+
+ if this is empty, it is fully merged to "master".
+
+DOC_END
diff -ruN minetest-db_backends/.git/hooks/update.sample minetest-digging_animation/.git/hooks/update.sample
--- minetest-db_backends/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/hooks/update.sample 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+# This boolean sets whether unannotated tags will be allowed into the
+# repository. By default they won't be.
+# hooks.allowdeletetag
+# This boolean sets whether deleting tags will be allowed in the
+# repository. By default they won't be.
+# hooks.allowmodifytag
+# This boolean sets whether a tag may be modified after creation. By default
+# it won't be.
+# hooks.allowdeletebranch
+# This boolean sets whether deleting branches will be allowed in the
+# repository. By default they won't be.
+# hooks.denycreatebranch
+# This boolean sets whether remotely creating branches will be denied
+# in the repository. By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+ echo "Don't run this script from the command line." >&2
+ echo " (if you want, you could supply GIT_DIR then run" >&2
+ echo " $0 <ref> <oldrev> <newrev>)" >&2
+ exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+ echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+ exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+ echo "*** Project description file hasn't been set" >&2
+ exit 1
+ ;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+ newrev_type=delete
+else
+ newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+ refs/tags/*,commit)
+ # un-annotated tag
+ short_refname=${refname##refs/tags/}
+ if [ "$allowunannotated" != "true" ]; then
+ echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+ echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+ exit 1
+ fi
+ ;;
+ refs/tags/*,delete)
+ # delete tag
+ if [ "$allowdeletetag" != "true" ]; then
+ echo "*** Deleting a tag is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/tags/*,tag)
+ # annotated tag
+ if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+ then
+ echo "*** Tag '$refname' already exists." >&2
+ echo "*** Modifying a tag is not allowed in this repository." >&2
+ exit 1
+ fi
+ ;;
+ refs/heads/*,commit)
+ # branch
+ if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+ echo "*** Creating a branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/heads/*,delete)
+ # delete branch
+ if [ "$allowdeletebranch" != "true" ]; then
+ echo "*** Deleting a branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ refs/remotes/*,commit)
+ # tracking branch
+ ;;
+ refs/remotes/*,delete)
+ # delete tracking branch
+ if [ "$allowdeletebranch" != "true" ]; then
+ echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+ exit 1
+ fi
+ ;;
+ *)
+ # Anything else (is there anything else?)
+ echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+ exit 1
+ ;;
+esac
+
+# --- Finished
+exit 0
BinÀrdateien minetest-db_backends/.git/index and minetest-digging_animation/.git/index sind verschieden.
diff -ruN minetest-db_backends/.git/info/exclude minetest-digging_animation/.git/info/exclude
--- minetest-db_backends/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/info/exclude 2012-10-28 18:49:18.000000000 +0100
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff -ruN minetest-db_backends/.git/logs/HEAD minetest-digging_animation/.git/logs/HEAD
--- minetest-db_backends/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/HEAD 2012-11-04 15:03:41.078740911 +0100
@@ -0,0 +1,42 @@
+0000000000000000000000000000000000000000 25cf3757b29a0397e201a4719788ead3dc76ec94 PilzAdam <adam-k@outlook.com> 1351446593 +0100 clone: from https://github.com/PilzAdam/minetest.git
+25cf3757b29a0397e201a4719788ead3dc76ec94 10dc2b30fbe34eeed85c01dabc615d0b64ca1cd5 PilzAdam <adam-k@outlook.com> 1351706771 +0100 commit: Move falling to builtin
+10dc2b30fbe34eeed85c01dabc615d0b64ca1cd5 df2ad89518fdda1b29da9be8fb6f45394d49e6b0 PilzAdam <adam-k@outlook.com> 1351706880 +0100 commit: Remove a useless comment
+df2ad89518fdda1b29da9be8fb6f45394d49e6b0 0443d36abf56c7c62a59940ae696f53e26b4c0de PilzAdam <adam-k@outlook.com> 1351769604 +0100 commit: Add falling_node to special groups in lua-api.txt
+0443d36abf56c7c62a59940ae696f53e26b4c0de 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351792152 +0100 commit: Add functions to the default mod of minimal game to support old code
+7fcf153adab121bfd50b246f32e074adab3a3b6d 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351858487 +0100 checkout: moving from master to water
+7fcf153adab121bfd50b246f32e074adab3a3b6d 4948663612203fa1f5dc34da7cc6eade461a55da PilzAdam <adam-k@outlook.com> 1351858506 +0100 merge community/master: Fast-forward
+4948663612203fa1f5dc34da7cc6eade461a55da e7d2b67eb485b7ab75c94a442b369d7d11aaff15 PilzAdam <adam-k@outlook.com> 1351858629 +0100 commit: Support old field liquid_viscosity
+e7d2b67eb485b7ab75c94a442b369d7d11aaff15 bab5aeef00b3d4656b091c0cb1d2728b699afbcf PilzAdam <adam-k@outlook.com> 1351858849 +0100 commit: Update lua-api.txt
+bab5aeef00b3d4656b091c0cb1d2728b699afbcf 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351858918 +0100 checkout: moving from water to master
+7fcf153adab121bfd50b246f32e074adab3a3b6d bab5aeef00b3d4656b091c0cb1d2728b699afbcf PilzAdam <adam-k@outlook.com> 1351859381 +0100 checkout: moving from master to water
+bab5aeef00b3d4656b091c0cb1d2728b699afbcf 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351859392 +0100 checkout: moving from water to master
+7fcf153adab121bfd50b246f32e074adab3a3b6d 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351866196 +0100 checkout: moving from master to pow
+7fcf153adab121bfd50b246f32e074adab3a3b6d e31ac6089e758bce64d9c92e0e234395acb285b4 PilzAdam <adam-k@outlook.com> 1351866353 +0100 commit: Replace pow() with multiplikation to improve speed
+e31ac6089e758bce64d9c92e0e234395acb285b4 e31ac6089e758bce64d9c92e0e234395acb285b4 PilzAdam <adam-k@outlook.com> 1351869372 +0100 checkout: moving from pow to pow
+e31ac6089e758bce64d9c92e0e234395acb285b4 c1bcd7cc362cae4f62027ff9bbc738fee06d4a17 PilzAdam <adam-k@outlook.com> 1351869454 +0100 commit: Use pow when there is no speed benefit
+c1bcd7cc362cae4f62027ff9bbc738fee06d4a17 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351869785 +0100 checkout: moving from pow to master
+7fcf153adab121bfd50b246f32e074adab3a3b6d 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351869861 +0100 checkout: moving from master to pow
+7fcf153adab121bfd50b246f32e074adab3a3b6d b701f8a878b7c76a33d7c3540a4b5e9c6e6b31ac PilzAdam <adam-k@outlook.com> 1351869897 +0100 commit: Replace pow() with multiplikation to improve speed
+b701f8a878b7c76a33d7c3540a4b5e9c6e6b31ac 8adad36a667bd9dc0bd2c0955858cb3a1883ea05 PilzAdam <adam-k@outlook.com> 1351870562 +0100 merge upstream/master: Fast-forward
+8adad36a667bd9dc0bd2c0955858cb3a1883ea05 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351870584 +0100 checkout: moving from pow to master
+7fcf153adab121bfd50b246f32e074adab3a3b6d 8adad36a667bd9dc0bd2c0955858cb3a1883ea05 PilzAdam <adam-k@outlook.com> 1351870588 +0100 merge upstream/master: Fast-forward
+8adad36a667bd9dc0bd2c0955858cb3a1883ea05 8adad36a667bd9dc0bd2c0955858cb3a1883ea05 PilzAdam <adam-k@outlook.com> 1351873205 +0100 checkout: moving from master to master
+8adad36a667bd9dc0bd2c0955858cb3a1883ea05 2863a3291a5cc9be8eeff063cd187a783e58c163 PilzAdam <adam-k@outlook.com> 1351873241 +0100 merge upstream/master: Fast-forward
+2863a3291a5cc9be8eeff063cd187a783e58c163 41c00e87d42580881d8c7001f39014814e3b55f2 PilzAdam <adam-k@outlook.com> 1351877400 +0100 merge upstream/master: Fast-forward
+41c00e87d42580881d8c7001f39014814e3b55f2 41c00e87d42580881d8c7001f39014814e3b55f2 PilzAdam <adam-k@outlook.com> 1351962375 +0100 checkout: moving from master to falling
+41c00e87d42580881d8c7001f39014814e3b55f2 21317be49362ed13701ab5ab609020f8bfbec418 PilzAdam <adam-k@outlook.com> 1351962469 +0100 commit: Fix a bug in falling code where entities get stuck
+21317be49362ed13701ab5ab609020f8bfbec418 41c00e87d42580881d8c7001f39014814e3b55f2 PilzAdam <adam-k@outlook.com> 1351963615 +0100 checkout: moving from falling to master
+41c00e87d42580881d8c7001f39014814e3b55f2 41c00e87d42580881d8c7001f39014814e3b55f2 PilzAdam <adam-k@outlook.com> 1351963683 +0100 checkout: moving from master to air
+41c00e87d42580881d8c7001f39014814e3b55f2 936411e4d144eb5d5d11d84c7e6f2df29ef70a8c PilzAdam <adam-k@outlook.com> 1351963741 +0100 commit: Make air and ignore drop nothing
+936411e4d144eb5d5d11d84c7e6f2df29ef70a8c 41c00e87d42580881d8c7001f39014814e3b55f2 PilzAdam <adam-k@outlook.com> 1351964278 +0100 checkout: moving from air to master
+41c00e87d42580881d8c7001f39014814e3b55f2 755df5f659899e961a7b1875837088fbc6cc1a55 PilzAdam <adam-k@outlook.com> 1351964283 +0100 merge upstream/master: Fast-forward
+755df5f659899e961a7b1875837088fbc6cc1a55 21317be49362ed13701ab5ab609020f8bfbec418 PilzAdam <adam-k@outlook.com> 1351964386 +0100 checkout: moving from master to falling
+21317be49362ed13701ab5ab609020f8bfbec418 755df5f659899e961a7b1875837088fbc6cc1a55 PilzAdam <adam-k@outlook.com> 1351965496 +0100 checkout: moving from falling to master
+755df5f659899e961a7b1875837088fbc6cc1a55 755df5f659899e961a7b1875837088fbc6cc1a55 PilzAdam <adam-k@outlook.com> 1351968114 +0100 checkout: moving from master to fly
+755df5f659899e961a7b1875837088fbc6cc1a55 755df5f659899e961a7b1875837088fbc6cc1a55 PilzAdam <adam-k@outlook.com> 1351970017 +0100 checkout: moving from fly to master
+755df5f659899e961a7b1875837088fbc6cc1a55 3cab24fbcfbbeb12cdd9f085167969e1a934bd59 PilzAdam <adam-k@outlook.com> 1351971337 +0100 merge upstream/master: Fast-forward
+3cab24fbcfbbeb12cdd9f085167969e1a934bd59 23837e43525e332ea140b58e0f5d1e2b89f1149f PilzAdam <adam-k@outlook.com> 1352021256 +0100 merge upstream/master: Fast-forward
+23837e43525e332ea140b58e0f5d1e2b89f1149f 23837e43525e332ea140b58e0f5d1e2b89f1149f PilzAdam <adam-k@outlook.com> 1352021433 +0100 checkout: moving from master to digging_animation
+23837e43525e332ea140b58e0f5d1e2b89f1149f e680a2ef1b244e3f30f47cb2cf30b257575db26f PilzAdam <adam-k@outlook.com> 1352021509 +0100 merge TANK/patch-4: Merge made by the 'recursive' strategy.
+e680a2ef1b244e3f30f47cb2cf30b257575db26f 23837e43525e332ea140b58e0f5d1e2b89f1149f PilzAdam <adam-k@outlook.com> 1352023316 +0100 checkout: moving from digging_animation to master
+23837e43525e332ea140b58e0f5d1e2b89f1149f e680a2ef1b244e3f30f47cb2cf30b257575db26f PilzAdam <adam-k@outlook.com> 1352037821 +0100 checkout: moving from master to digging_animation
diff -ruN minetest-db_backends/.git/logs/refs/heads/digging_animation minetest-digging_animation/.git/logs/refs/heads/digging_animation
--- minetest-db_backends/.git/logs/refs/heads/digging_animation 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/heads/digging_animation 2012-11-04 10:32:10.000000000 +0100
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 23837e43525e332ea140b58e0f5d1e2b89f1149f PilzAdam <adam-k@outlook.com> 1352021429 +0100 branch: Created from master
+23837e43525e332ea140b58e0f5d1e2b89f1149f e680a2ef1b244e3f30f47cb2cf30b257575db26f PilzAdam <adam-k@outlook.com> 1352021509 +0100 merge TANK/patch-4: Merge made by the 'recursive' strategy.
diff -ruN minetest-db_backends/.git/logs/refs/heads/master minetest-digging_animation/.git/logs/refs/heads/master
--- minetest-db_backends/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/heads/master 2012-11-04 10:27:36.000000000 +0100
@@ -0,0 +1,11 @@
+0000000000000000000000000000000000000000 25cf3757b29a0397e201a4719788ead3dc76ec94 PilzAdam <adam-k@outlook.com> 1351446593 +0100 clone: from https://github.com/PilzAdam/minetest.git
+25cf3757b29a0397e201a4719788ead3dc76ec94 10dc2b30fbe34eeed85c01dabc615d0b64ca1cd5 PilzAdam <adam-k@outlook.com> 1351706771 +0100 commit: Move falling to builtin
+10dc2b30fbe34eeed85c01dabc615d0b64ca1cd5 df2ad89518fdda1b29da9be8fb6f45394d49e6b0 PilzAdam <adam-k@outlook.com> 1351706880 +0100 commit: Remove a useless comment
+df2ad89518fdda1b29da9be8fb6f45394d49e6b0 0443d36abf56c7c62a59940ae696f53e26b4c0de PilzAdam <adam-k@outlook.com> 1351769604 +0100 commit: Add falling_node to special groups in lua-api.txt
+0443d36abf56c7c62a59940ae696f53e26b4c0de 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351792152 +0100 commit: Add functions to the default mod of minimal game to support old code
+7fcf153adab121bfd50b246f32e074adab3a3b6d 8adad36a667bd9dc0bd2c0955858cb3a1883ea05 PilzAdam <adam-k@outlook.com> 1351870588 +0100 merge upstream/master: Fast-forward
+8adad36a667bd9dc0bd2c0955858cb3a1883ea05 2863a3291a5cc9be8eeff063cd187a783e58c163 PilzAdam <adam-k@outlook.com> 1351873241 +0100 merge upstream/master: Fast-forward
+2863a3291a5cc9be8eeff063cd187a783e58c163 41c00e87d42580881d8c7001f39014814e3b55f2 PilzAdam <adam-k@outlook.com> 1351877400 +0100 merge upstream/master: Fast-forward
+41c00e87d42580881d8c7001f39014814e3b55f2 755df5f659899e961a7b1875837088fbc6cc1a55 PilzAdam <adam-k@outlook.com> 1351964283 +0100 merge upstream/master: Fast-forward
+755df5f659899e961a7b1875837088fbc6cc1a55 3cab24fbcfbbeb12cdd9f085167969e1a934bd59 PilzAdam <adam-k@outlook.com> 1351971337 +0100 merge upstream/master: Fast-forward
+3cab24fbcfbbeb12cdd9f085167969e1a934bd59 23837e43525e332ea140b58e0f5d1e2b89f1149f PilzAdam <adam-k@outlook.com> 1352021256 +0100 merge upstream/master: Fast-forward
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/client_requests_blocks_2 minetest-digging_animation/.git/logs/refs/remotes/community/client_requests_blocks_2
--- minetest-db_backends/.git/logs/refs/remotes/community/client_requests_blocks_2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/client_requests_blocks_2 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 3d4a1389efd74db7a6cd39561712282dc7d7b542 Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/db_backends minetest-digging_animation/.git/logs/refs/remotes/community/db_backends
--- minetest-db_backends/.git/logs/refs/remotes/community/db_backends 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/db_backends 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 2e7c8b3f05a5da45bddc36e26292789b19b6560b Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/master minetest-digging_animation/.git/logs/refs/remotes/community/master
--- minetest-db_backends/.git/logs/refs/remotes/community/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/master 2012-11-02 13:30:28.000000000 +0100
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 4948663612203fa1f5dc34da7cc6eade461a55da Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
+4948663612203fa1f5dc34da7cc6eade461a55da cf1633a396431cb6d13ee97b8dca593a0ff53179 Adam <adam@ubuntu.ubuntu-domain> 1351859428 +0100 fetch community: fast-forward
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/meta_set_nodedef minetest-digging_animation/.git/logs/refs/remotes/community/meta_set_nodedef
--- minetest-db_backends/.git/logs/refs/remotes/community/meta_set_nodedef 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/meta_set_nodedef 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 51577c8b789d0f24282600b895974885ff422595 Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/stable-0.2 minetest-digging_animation/.git/logs/refs/remotes/community/stable-0.2
--- minetest-db_backends/.git/logs/refs/remotes/community/stable-0.2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/stable-0.2 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 960009d619c161a6f60a21edd880d751626e5b91 Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/stable-0.3 minetest-digging_animation/.git/logs/refs/remotes/community/stable-0.3
--- minetest-db_backends/.git/logs/refs/remotes/community/stable-0.3 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/stable-0.3 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 073964a12fb180f7bb0277337399a39ea84ef06e Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/stable-0.4 minetest-digging_animation/.git/logs/refs/remotes/community/stable-0.4
--- minetest-db_backends/.git/logs/refs/remotes/community/stable-0.4 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/stable-0.4 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 9696ed31a41b5e3ca85bad4a29c190a0d25c7752 Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/sticky_entities minetest-digging_animation/.git/logs/refs/remotes/community/sticky_entities
--- minetest-db_backends/.git/logs/refs/remotes/community/sticky_entities 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/sticky_entities 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 595511e1406147f01252e5f376e6b320ccabe51a Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/community/unicode minetest-digging_animation/.git/logs/refs/remotes/community/unicode
--- minetest-db_backends/.git/logs/refs/remotes/community/unicode 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/community/unicode 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 4ce01ca04d246d4edf5e9bbba70246032e51e47c Adam <adam@ubuntu.ubuntu-domain> 1351858465 +0100 fetch community: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/origin/digging_animation minetest-digging_animation/.git/logs/refs/remotes/origin/digging_animation
--- minetest-db_backends/.git/logs/refs/remotes/origin/digging_animation 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/origin/digging_animation 2012-11-04 10:56:32.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 e680a2ef1b244e3f30f47cb2cf30b257575db26f PilzAdam <adam-k@outlook.com> 1352022992 +0100 update by push
diff -ruN minetest-db_backends/.git/logs/refs/remotes/origin/HEAD minetest-digging_animation/.git/logs/refs/remotes/origin/HEAD
--- minetest-db_backends/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/origin/HEAD 2012-10-28 18:49:53.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 25cf3757b29a0397e201a4719788ead3dc76ec94 PilzAdam <adam-k@outlook.com> 1351446593 +0100 clone: from https://github.com/PilzAdam/minetest.git
diff -ruN minetest-db_backends/.git/logs/refs/remotes/origin/master minetest-digging_animation/.git/logs/refs/remotes/origin/master
--- minetest-db_backends/.git/logs/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/origin/master 2012-11-04 10:27:48.000000000 +0100
@@ -0,0 +1,10 @@
+25cf3757b29a0397e201a4719788ead3dc76ec94 10dc2b30fbe34eeed85c01dabc615d0b64ca1cd5 PilzAdam <adam-k@outlook.com> 1351706786 +0100 update by push
+10dc2b30fbe34eeed85c01dabc615d0b64ca1cd5 df2ad89518fdda1b29da9be8fb6f45394d49e6b0 PilzAdam <adam-k@outlook.com> 1351706893 +0100 update by push
+df2ad89518fdda1b29da9be8fb6f45394d49e6b0 0443d36abf56c7c62a59940ae696f53e26b4c0de PilzAdam <adam-k@outlook.com> 1351769615 +0100 update by push
+0443d36abf56c7c62a59940ae696f53e26b4c0de 7fcf153adab121bfd50b246f32e074adab3a3b6d PilzAdam <adam-k@outlook.com> 1351792165 +0100 update by push
+7fcf153adab121bfd50b246f32e074adab3a3b6d 8adad36a667bd9dc0bd2c0955858cb3a1883ea05 PilzAdam <adam-k@outlook.com> 1351870599 +0100 update by push
+8adad36a667bd9dc0bd2c0955858cb3a1883ea05 2863a3291a5cc9be8eeff063cd187a783e58c163 PilzAdam <adam-k@outlook.com> 1351873255 +0100 update by push
+2863a3291a5cc9be8eeff063cd187a783e58c163 41c00e87d42580881d8c7001f39014814e3b55f2 PilzAdam <adam-k@outlook.com> 1351877414 +0100 update by push
+41c00e87d42580881d8c7001f39014814e3b55f2 755df5f659899e961a7b1875837088fbc6cc1a55 PilzAdam <adam-k@outlook.com> 1351964296 +0100 update by push
+755df5f659899e961a7b1875837088fbc6cc1a55 3cab24fbcfbbeb12cdd9f085167969e1a934bd59 PilzAdam <adam-k@outlook.com> 1351971349 +0100 update by push
+3cab24fbcfbbeb12cdd9f085167969e1a934bd59 23837e43525e332ea140b58e0f5d1e2b89f1149f PilzAdam <adam-k@outlook.com> 1352021268 +0100 update by push
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/c55sound minetest-digging_animation/.git/logs/refs/remotes/TANK/c55sound
--- minetest-db_backends/.git/logs/refs/remotes/TANK/c55sound 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/c55sound 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 4fb6c07535cff9a385344f5025b25892b828ebc4 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/chunkymapgen minetest-digging_animation/.git/logs/refs/remotes/TANK/chunkymapgen
--- minetest-db_backends/.git/logs/refs/remotes/TANK/chunkymapgen 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/chunkymapgen 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 7eccdb90773c9cb5283572dd0cf47ca3b3fa44d7 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/digging_time_groups minetest-digging_animation/.git/logs/refs/remotes/TANK/digging_time_groups
--- minetest-db_backends/.git/logs/refs/remotes/TANK/digging_time_groups 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/digging_time_groups 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 6e6caba2f5eaa1086aebade39b32f91042a54652 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/mainmenutabs minetest-digging_animation/.git/logs/refs/remotes/TANK/mainmenutabs
--- minetest-db_backends/.git/logs/refs/remotes/TANK/mainmenutabs 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/mainmenutabs 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 ca0fd4173cb18dd54219a1e8f05ec412e4d707ec Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/master minetest-digging_animation/.git/logs/refs/remotes/TANK/master
--- minetest-db_backends/.git/logs/refs/remotes/TANK/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/master 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 e6f5c18357197dcc9d6dd7ba9df50e0d84440717 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/meshanim_rebased minetest-digging_animation/.git/logs/refs/remotes/TANK/meshanim_rebased
--- minetest-db_backends/.git/logs/refs/remotes/TANK/meshanim_rebased 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/meshanim_rebased 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 7678e6d964d270409a50d4ddd28f99baf40c3ba9 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/metadatastuff minetest-digging_animation/.git/logs/refs/remotes/TANK/metadatastuff
--- minetest-db_backends/.git/logs/refs/remotes/TANK/metadatastuff 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/metadatastuff 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 ce1fb15048c06eb3e1d9b34cc191b34d4d101f6e Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/next minetest-digging_animation/.git/logs/refs/remotes/TANK/next
--- minetest-db_backends/.git/logs/refs/remotes/TANK/next 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/next 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 fb3ac49335496e3ebc4601a58d6afb356d7b42d2 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/oldmaster minetest-digging_animation/.git/logs/refs/remotes/TANK/oldmaster
--- minetest-db_backends/.git/logs/refs/remotes/TANK/oldmaster 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/oldmaster 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 7372282a725cc9633eba3bb7bae8f4055e3235bb Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/patch-1 minetest-digging_animation/.git/logs/refs/remotes/TANK/patch-1
--- minetest-db_backends/.git/logs/refs/remotes/TANK/patch-1 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/patch-1 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 1f48220f32f7e630c90311dcbdcba173b1df1814 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/patch-2 minetest-digging_animation/.git/logs/refs/remotes/TANK/patch-2
--- minetest-db_backends/.git/logs/refs/remotes/TANK/patch-2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/patch-2 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 e759ed71440456544ef5062d2355a8bf59aaa6fc Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/patch-3 minetest-digging_animation/.git/logs/refs/remotes/TANK/patch-3
--- minetest-db_backends/.git/logs/refs/remotes/TANK/patch-3 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/patch-3 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 bafaa8603fcd365f764defd7476b798ae8e426fc Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/patch-4 minetest-digging_animation/.git/logs/refs/remotes/TANK/patch-4
--- minetest-db_backends/.git/logs/refs/remotes/TANK/patch-4 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/patch-4 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 37d6c3a2f19854caf6dfeb352cb9f6c50bb52757 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/randomstuff minetest-digging_animation/.git/logs/refs/remotes/TANK/randomstuff
--- minetest-db_backends/.git/logs/refs/remotes/TANK/randomstuff 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/randomstuff 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 46bceebe2f53be05afb1fe42cf8087ee02337c53 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/stable minetest-digging_animation/.git/logs/refs/remotes/TANK/stable
--- minetest-db_backends/.git/logs/refs/remotes/TANK/stable 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/stable 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 bc0e5c0063d2af107f81853c5ff555c57d1a9e3a Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/TANK/stable-0.2.20110922 minetest-digging_animation/.git/logs/refs/remotes/TANK/stable-0.2.20110922
--- minetest-db_backends/.git/logs/refs/remotes/TANK/stable-0.2.20110922 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/TANK/stable-0.2.20110922 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 960009d619c161a6f60a21edd880d751626e5b91 Adam <adam@ubuntu.ubuntu-domain> 1352021489 +0100 fetch TANK: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/upstream/client_requests_blocks_2 minetest-digging_animation/.git/logs/refs/remotes/upstream/client_requests_blocks_2
--- minetest-db_backends/.git/logs/refs/remotes/upstream/client_requests_blocks_2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/upstream/client_requests_blocks_2 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 3d4a1389efd74db7a6cd39561712282dc7d7b542 Adam <adam@ubuntu.ubuntu-domain> 1351858451 +0100 fetch upstream: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/upstream/master minetest-digging_animation/.git/logs/refs/remotes/upstream/master
--- minetest-db_backends/.git/logs/refs/remotes/upstream/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/upstream/master 2012-11-04 10:27:31.000000000 +0100
@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 63e73f29cc9aa43721a84e48072607fc1d913877 Adam <adam@ubuntu.ubuntu-domain> 1351858451 +0100 fetch upstream: storing head
+63e73f29cc9aa43721a84e48072607fc1d913877 8adad36a667bd9dc0bd2c0955858cb3a1883ea05 Adam <adam@ubuntu.ubuntu-domain> 1351870556 +0100 fetch upstream: fast-forward
+8adad36a667bd9dc0bd2c0955858cb3a1883ea05 2863a3291a5cc9be8eeff063cd187a783e58c163 Adam <adam@ubuntu.ubuntu-domain> 1351873200 +0100 fetch upstream: fast-forward
+2863a3291a5cc9be8eeff063cd187a783e58c163 41c00e87d42580881d8c7001f39014814e3b55f2 Adam <adam@ubuntu.ubuntu-domain> 1351877395 +0100 fetch upstream: fast-forward
+41c00e87d42580881d8c7001f39014814e3b55f2 755df5f659899e961a7b1875837088fbc6cc1a55 Adam <adam@ubuntu.ubuntu-domain> 1351964272 +0100 fetch upstream: fast-forward
+755df5f659899e961a7b1875837088fbc6cc1a55 3cab24fbcfbbeb12cdd9f085167969e1a934bd59 Adam <adam@ubuntu.ubuntu-domain> 1351971322 +0100 fetch upstream: fast-forward
+3cab24fbcfbbeb12cdd9f085167969e1a934bd59 23837e43525e332ea140b58e0f5d1e2b89f1149f Adam <adam@ubuntu.ubuntu-domain> 1352021251 +0100 fetch upstream: fast-forward
diff -ruN minetest-db_backends/.git/logs/refs/remotes/upstream/meta_set_nodedef minetest-digging_animation/.git/logs/refs/remotes/upstream/meta_set_nodedef
--- minetest-db_backends/.git/logs/refs/remotes/upstream/meta_set_nodedef 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/upstream/meta_set_nodedef 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 51577c8b789d0f24282600b895974885ff422595 Adam <adam@ubuntu.ubuntu-domain> 1351858451 +0100 fetch upstream: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/upstream/stable-0.2 minetest-digging_animation/.git/logs/refs/remotes/upstream/stable-0.2
--- minetest-db_backends/.git/logs/refs/remotes/upstream/stable-0.2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/upstream/stable-0.2 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 960009d619c161a6f60a21edd880d751626e5b91 Adam <adam@ubuntu.ubuntu-domain> 1351858451 +0100 fetch upstream: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/upstream/stable-0.3 minetest-digging_animation/.git/logs/refs/remotes/upstream/stable-0.3
--- minetest-db_backends/.git/logs/refs/remotes/upstream/stable-0.3 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/upstream/stable-0.3 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 073964a12fb180f7bb0277337399a39ea84ef06e Adam <adam@ubuntu.ubuntu-domain> 1351858451 +0100 fetch upstream: storing head
diff -ruN minetest-db_backends/.git/logs/refs/remotes/upstream/stable-0.4 minetest-digging_animation/.git/logs/refs/remotes/upstream/stable-0.4
--- minetest-db_backends/.git/logs/refs/remotes/upstream/stable-0.4 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/logs/refs/remotes/upstream/stable-0.4 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 9696ed31a41b5e3ca85bad4a29c190a0d25c7752 Adam <adam@ubuntu.ubuntu-domain> 1351858451 +0100 fetch upstream: storing head
BinÀrdateien minetest-db_backends/.git/objects/01/8ffaaf2d1bfcd79c6553dcbf9f8c3ce97598b9 and minetest-digging_animation/.git/objects/01/8ffaaf2d1bfcd79c6553dcbf9f8c3ce97598b9 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/03/5bb27c67b7592b89ff03a0fa17bca82ddea377 and minetest-digging_animation/.git/objects/03/5bb27c67b7592b89ff03a0fa17bca82ddea377 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/04/43d36abf56c7c62a59940ae696f53e26b4c0de and minetest-digging_animation/.git/objects/04/43d36abf56c7c62a59940ae696f53e26b4c0de sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/08/316f09d6ec6988363303daf68410d245d194d0 and minetest-digging_animation/.git/objects/08/316f09d6ec6988363303daf68410d245d194d0 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/09/900ce1f664ab3ba8d272e84c8c8fbc81ba8ee3 and minetest-digging_animation/.git/objects/09/900ce1f664ab3ba8d272e84c8c8fbc81ba8ee3 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/0f/0701c79d66843cfa8d8d7aa545f763d185a189 and minetest-digging_animation/.git/objects/0f/0701c79d66843cfa8d8d7aa545f763d185a189 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/10/dc2b30fbe34eeed85c01dabc615d0b64ca1cd5 and minetest-digging_animation/.git/objects/10/dc2b30fbe34eeed85c01dabc615d0b64ca1cd5 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/11/046da823a001d96d48c9d105e7b28954ed4604 and minetest-digging_animation/.git/objects/11/046da823a001d96d48c9d105e7b28954ed4604 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/21/317be49362ed13701ab5ab609020f8bfbec418 and minetest-digging_animation/.git/objects/21/317be49362ed13701ab5ab609020f8bfbec418 sind verschieden.
diff -ruN minetest-db_backends/.git/objects/23/837e43525e332ea140b58e0f5d1e2b89f1149f minetest-digging_animation/.git/objects/23/837e43525e332ea140b58e0f5d1e2b89f1149f
--- minetest-db_backends/.git/objects/23/837e43525e332ea140b58e0f5d1e2b89f1149f 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/23/837e43525e332ea140b58e0f5d1e2b89f1149f 2012-11-04 10:27:31.000000000 +0100
@@ -0,0 +1,2 @@
+x•ÁN!D=óx^† 1F/ÞLüšY2Ì°²_/õî¥ÕõÒÕåËŸ§Ó,nZ%myôœÏf !
+cp‘VåHq)‘ ƚØÅU:èJÑGDB!}6r3‹EÛŒpvRfûë—bIÙi‘Ä€¹p8;\žå’GƒÉ+a˜ëí\*Œ¥üõÜnÌÓöTzË¥lwŸì FnkÆ9'®9gCï4ú7È^©®—ž3Tzïtmp+µ‚XËþ—â>ºœÓ±2ö’>ÁöÒ?*ø>ÎT F7©%ºÂJ
®­ûí yp}
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/24/2b58ca01817768b973fe8a268990be9d9f6b34 and minetest-digging_animation/.git/objects/24/2b58ca01817768b973fe8a268990be9d9f6b34 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/28/45f3a67de7ed93228982da25769242ee9f5f2e and minetest-digging_animation/.git/objects/28/45f3a67de7ed93228982da25769242ee9f5f2e sind verschieden.
diff -ruN minetest-db_backends/.git/objects/28/63a3291a5cc9be8eeff063cd187a783e58c163 minetest-digging_animation/.git/objects/28/63a3291a5cc9be8eeff063cd187a783e58c163
--- minetest-db_backends/.git/objects/28/63a3291a5cc9be8eeff063cd187a783e58c163 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/28/63a3291a5cc9be8eeff063cd187a783e58c163 2012-11-02 17:20:00.000000000 +0100
@@ -0,0 +1,2 @@
+xŽMJ1F]çµ€:™ê€AdfãÚ+T*Õ3ühH£Çwœ#ž{<x|ŸôZó»ú§9TAպ픺`œçà#q$·2oZÝUÍ'm'Nnåuõ1mI0&+ž
+/!8e$ÃÇŒõ:æ<àrë…áUŽèèè|­œË‹ôú‹£åoèdá-¢¹ÛûÇ©ÿ«Í{þœôïÜ®Pòבp˕gî
R*.r”‡5¿¥¬VÉ
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/2e/3d14987c808e44cce1dd108b6c3224fc158ecf and minetest-digging_animation/.git/objects/2e/3d14987c808e44cce1dd108b6c3224fc158ecf sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/30/14907e0f57402f9e34acbbcf02e517b6ec3464 and minetest-digging_animation/.git/objects/30/14907e0f57402f9e34acbbcf02e517b6ec3464 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/30/18326189f3d9c9f07f37e60853cd974927c19c and minetest-digging_animation/.git/objects/30/18326189f3d9c9f07f37e60853cd974927c19c sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/30/681efae060754667e284b9a0d495f0b8450574 and minetest-digging_animation/.git/objects/30/681efae060754667e284b9a0d495f0b8450574 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/35/336a8276725ff0f5d923dd6589f729e08b6208 and minetest-digging_animation/.git/objects/35/336a8276725ff0f5d923dd6589f729e08b6208 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/36/dd6b2aab3c55223c1bafecab7f53fdd2eab2bd and minetest-digging_animation/.git/objects/36/dd6b2aab3c55223c1bafecab7f53fdd2eab2bd sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/36/f1ab085dc850c246ec5375c7c421cff4bf66fd and minetest-digging_animation/.git/objects/36/f1ab085dc850c246ec5375c7c421cff4bf66fd sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/37/ee570adfc7e6ed19ace2214295beb1e87f51a2 and minetest-digging_animation/.git/objects/37/ee570adfc7e6ed19ace2214295beb1e87f51a2 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/39/12727c32605a6cf28811014f8fa8737b6fe3e9 and minetest-digging_animation/.git/objects/39/12727c32605a6cf28811014f8fa8737b6fe3e9 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/3b/445d94d6a1d9d8c98fcb5b20251ede89b32e72 and minetest-digging_animation/.git/objects/3b/445d94d6a1d9d8c98fcb5b20251ede89b32e72 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/3c/ab24fbcfbbeb12cdd9f085167969e1a934bd59 and minetest-digging_animation/.git/objects/3c/ab24fbcfbbeb12cdd9f085167969e1a934bd59 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/40/b35b8a004b1cc81b73297b42bd4f427f19615e and minetest-digging_animation/.git/objects/40/b35b8a004b1cc81b73297b42bd4f427f19615e sind verschieden.
diff -ruN minetest-db_backends/.git/objects/41/c00e87d42580881d8c7001f39014814e3b55f2 minetest-digging_animation/.git/objects/41/c00e87d42580881d8c7001f39014814e3b55f2
--- minetest-db_backends/.git/objects/41/c00e87d42580881d8c7001f39014814e3b55f2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/41/c00e87d42580881d8c7001f39014814e3b55f2 2012-11-02 18:29:55.000000000 +0100
@@ -0,0 +1,3 @@
+xÎ1nÃ0 ÐÎ>·“ŽdŠèÖ¥W Š"[J9~•N\þûŸZÖõâ@=y5##>ÑxB")ILƒšÎ %ò„ižW$ënRmk0EŠ %šN³%³ó¹¬'L£Œ‰-$Åȝ쟔
+Ÿ²Ô ÇëãŒ}¯÷Ãfþ
+Ȕ0c„—ûŸÓÿ·Ü*|Yußá})Yàš–­–-„få’-÷С
#OMSÓÝGٞ²ÉÜîŸWûÉÊokôÅà–E­û%àL„
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/43/6fd9095229465e892e77ee6745a41556cae894 and minetest-digging_animation/.git/objects/43/6fd9095229465e892e77ee6745a41556cae894 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/46/6531efa8fa07a03fdaa14d1288d7001f90b0b5 and minetest-digging_animation/.git/objects/46/6531efa8fa07a03fdaa14d1288d7001f90b0b5 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/46/8a3891255079c8b7d54e2a9c57d851b4d55b9f and minetest-digging_animation/.git/objects/46/8a3891255079c8b7d54e2a9c57d851b4d55b9f sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/49/6937850a75f2331bb5be24f905da3ed5a2199b and minetest-digging_animation/.git/objects/49/6937850a75f2331bb5be24f905da3ed5a2199b sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/4a/7f4167eec0fb21d1a7e0e7afd5977f18268885 and minetest-digging_animation/.git/objects/4a/7f4167eec0fb21d1a7e0e7afd5977f18268885 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/4b/232949184798e47b59a1153dc2177cdcede985 and minetest-digging_animation/.git/objects/4b/232949184798e47b59a1153dc2177cdcede985 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/4f/f6c6b48a10b69811453575994300a71be1a418 and minetest-digging_animation/.git/objects/4f/f6c6b48a10b69811453575994300a71be1a418 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/5d/ed75a25a8fa1a699ccb1f50bf190567dc51979 and minetest-digging_animation/.git/objects/5d/ed75a25a8fa1a699ccb1f50bf190567dc51979 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/5f/4d8e06348ce019a4b2c51d081cabab1063e27f and minetest-digging_animation/.git/objects/5f/4d8e06348ce019a4b2c51d081cabab1063e27f sind verschieden.
diff -ruN minetest-db_backends/.git/objects/63/e73f29cc9aa43721a84e48072607fc1d913877 minetest-digging_animation/.git/objects/63/e73f29cc9aa43721a84e48072607fc1d913877
--- minetest-db_backends/.git/objects/63/e73f29cc9aa43721a84e48072607fc1d913877 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/63/e73f29cc9aa43721a84e48072607fc1d913877 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1,2 @@
+x•KN1DYû-±ø;mKÁ"q…¶Ý£Øqp<,8=Ãöl_}T•zkë£ÍÝÌà%YNY9Wt Èم¥6b1É-N‘7Ä,®4ø2A»T :Œ»[š€¬¥"‹* ÷LÙä„ §`ýXRQÎPŠšŽŠ%;µ]ŠÑ,Ñþ`C&.YÐ6ßû€·µ~œfjðŽkíp~éÛ¬œŸRoÏ ŒSŽw‰RŠîw&ÿ;(Ž<N ×­Vü±ñmÂœF eôö·â±Ñm/âØ?
+Õº^N0;Äm­sœ|xug
\ Kein Zeilenumbruch am Dateiende.
diff -ruN minetest-db_backends/.git/objects/75/5df5f659899e961a7b1875837088fbc6cc1a55 minetest-digging_animation/.git/objects/75/5df5f659899e961a7b1875837088fbc6cc1a55
--- minetest-db_backends/.git/objects/75/5df5f659899e961a7b1875837088fbc6cc1a55 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/75/5df5f659899e961a7b1875837088fbc6cc1a55 2012-11-03 18:37:52.000000000 +0100
@@ -0,0 +1,3 @@
+x•O9N1$ö+Z"^hÛíKB°_ðØíÝÑŒ'áõ8œ€TjÕѕê¶ÍŽ
+œ1ƒFIc1ŽP•ÀšbšŠTP±‘n²œ4YGlŒw ™Ù»LÊxô^fŸ¢,:Œ$/‰õdLQ¿ú -Iɔ%O&›,‡…’c[T.*pq}ñì÷Úàc^¿ßsÜà%Œ,oõìk­ËSªÛ+Hmd°€ÐÂG­×1§ó¿âÊíÆpœë
+?Oþê𚜆Òêö÷Åsœ›מ0 qÏ0ßöÚr«ìµßçýöšëf€
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/77/c594de2c9e8a217be01e18572cee3184f220b8 and minetest-digging_animation/.git/objects/77/c594de2c9e8a217be01e18572cee3184f220b8 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/78/4ecbc00586ddf188b6297d4ae4022b012dbc0e and minetest-digging_animation/.git/objects/78/4ecbc00586ddf188b6297d4ae4022b012dbc0e sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/7b/da3174118966f2daf3aadf1f422e6114ed5ebe and minetest-digging_animation/.git/objects/7b/da3174118966f2daf3aadf1f422e6114ed5ebe sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/7f/cf153adab121bfd50b246f32e074adab3a3b6d and minetest-digging_animation/.git/objects/7f/cf153adab121bfd50b246f32e074adab3a3b6d sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/80/a4ecd155f29abed596f9874b7f3c5651a83aee and minetest-digging_animation/.git/objects/80/a4ecd155f29abed596f9874b7f3c5651a83aee sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/82/b360152d6aa9d91f948868fe2592a122381f95 and minetest-digging_animation/.git/objects/82/b360152d6aa9d91f948868fe2592a122381f95 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/89/ea597244a8db651b711af17f7a4ca09a0e5d8c and minetest-digging_animation/.git/objects/89/ea597244a8db651b711af17f7a4ca09a0e5d8c sind verschieden.
diff -ruN minetest-db_backends/.git/objects/8a/dad36a667bd9dc0bd2c0955858cb3a1883ea05 minetest-digging_animation/.git/objects/8a/dad36a667bd9dc0bd2c0955858cb3a1883ea05
--- minetest-db_backends/.git/objects/8a/dad36a667bd9dc0bd2c0955858cb3a1883ea05 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/8a/dad36a667bd9dc0bd2c0955858cb3a1883ea05 2012-11-02 16:35:56.000000000 +0100
@@ -0,0 +1,5 @@
+x•MJ1…]÷)
+ÜèBM:?•€ˆ@oPIW;a’IÌ€ðôöF÷nÞâñ}ð^¬¥€JãÕèÌ൲Úp í£X¥
+ŒÞV‘ÙX¡…$‹j±ajÔù4À*FµÎ>FO;†³$§Y;³žF¹x©â/PÈՑC0¢%¥ŒÊhA:öѲ
JRœh‡Úá-å
+<ҞwÇ纍\ëñ>ÖòRéP%àN ÓÞîwÿ[œ^¹0Ž-gèü¹ñyÀõŒ3¬œ–¿­^Šé[ŠžÃõrs —4P¶<RËéH#ÕŒ
+©Ž^¿΍yùÀ®n:
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/8c/99c4fa73b837b80e57f9246ff0c82632507953 and minetest-digging_animation/.git/objects/8c/99c4fa73b837b80e57f9246ff0c82632507953 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/92/6830e0df7b95d4e53c917db07236ef3e19e991 and minetest-digging_animation/.git/objects/92/6830e0df7b95d4e53c917db07236ef3e19e991 sind verschieden.
diff -ruN minetest-db_backends/.git/objects/93/6411e4d144eb5d5d11d84c7e6f2df29ef70a8c minetest-digging_animation/.git/objects/93/6411e4d144eb5d5d11d84c7e6f2df29ef70a8c
--- minetest-db_backends/.git/objects/93/6411e4d144eb5d5d11d84c7e6f2df29ef70a8c 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/93/6411e4d144eb5d5d11d84c7e6f2df29ef70a8c 2012-11-03 18:29:01.000000000 +0100
@@ -0,0 +1 @@
+x•ŽAŠ!Egí)j?dšÒ²UÃ̹‚­e"Ö f3§ŸŸB6ñà=~êû^'h>æƒÄ`±ŽQ— †cZ×TP‹%·.’ /¬žqH›À”Å»ÌÚzôž²O‘Š GÉ‹Y­-ZÅ׌÷×úøûÍq‡s<öŽýô×|ôŸ}¥ŸKa1Ž >‘ÕA{SÞÕ%n±ˆ-Cœµ>òèOh}Þk»©ƒøJm
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/94/3645eba49c0f13be795a43cee560401a673d6b and minetest-digging_animation/.git/objects/94/3645eba49c0f13be795a43cee560401a673d6b sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/95/ac4101f0d50cd091772ca85280157a6d696634 and minetest-digging_animation/.git/objects/95/ac4101f0d50cd091772ca85280157a6d696634 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/99/3eb2a205cdb1a0f15a86b7233731c04aac7669 and minetest-digging_animation/.git/objects/99/3eb2a205cdb1a0f15a86b7233731c04aac7669 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/9b/d40d1f3d5ac126cf5c468e0e768ee0006b9bb4 and minetest-digging_animation/.git/objects/9b/d40d1f3d5ac126cf5c468e0e768ee0006b9bb4 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/9d/202bb0a38e3a83d9814bc6cfd8bbcf72ff3316 and minetest-digging_animation/.git/objects/9d/202bb0a38e3a83d9814bc6cfd8bbcf72ff3316 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/9d/c84c72ccdb51db82a54182ec86f2ff7fd32f94 and minetest-digging_animation/.git/objects/9d/c84c72ccdb51db82a54182ec86f2ff7fd32f94 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/a1/f445d75f73618645e39eb8e1e6b7cb7f6c8c20 and minetest-digging_animation/.git/objects/a1/f445d75f73618645e39eb8e1e6b7cb7f6c8c20 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/b5/219ce334f60ea99f186cc5e2f755f16ef32b30 and minetest-digging_animation/.git/objects/b5/219ce334f60ea99f186cc5e2f755f16ef32b30 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/b7/01f8a878b7c76a33d7c3540a4b5e9c6e6b31ac and minetest-digging_animation/.git/objects/b7/01f8a878b7c76a33d7c3540a4b5e9c6e6b31ac sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/b9/98279c506073f046a3920222113d1a0d5496be and minetest-digging_animation/.git/objects/b9/98279c506073f046a3920222113d1a0d5496be sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/b9/ec82e18f64f5123c62dc2485567e6e40531213 and minetest-digging_animation/.git/objects/b9/ec82e18f64f5123c62dc2485567e6e40531213 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/ba/b5aeef00b3d4656b091c0cb1d2728b699afbcf and minetest-digging_animation/.git/objects/ba/b5aeef00b3d4656b091c0cb1d2728b699afbcf sind verschieden.
diff -ruN minetest-db_backends/.git/objects/c1/bcd7cc362cae4f62027ff9bbc738fee06d4a17 minetest-digging_animation/.git/objects/c1/bcd7cc362cae4f62027ff9bbc738fee06d4a17
--- minetest-db_backends/.git/objects/c1/bcd7cc362cae4f62027ff9bbc738fee06d4a17 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/c1/bcd7cc362cae4f62027ff9bbc738fee06d4a17 2012-11-02 16:17:34.000000000 +0100
@@ -0,0 +1,3 @@
+x•ŽA
+ƒ0»Î)þŸŽ$æ'(¥œA7=@Ÿ(5F4"ôôõ
+ÝÌb``bNi(T±9• ÇÚ²Aðì¢ì”šñ¬#`¬d©Œ­ukƒ˜ý‚©ŽòÑÊÆ¡6Mˆ°Üºè*HTšõ‘ÆP5&°ð[éóB¯aü>[Ÿèæ^>Œ•1çÏ5æt'¥j¬cÃt–JJqØc¯àïPŒWМwÚ{LTz, a¥)Ó:-Lè†"~-MÆ
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/cf/1633a396431cb6d13ee97b8dca593a0ff53179 and minetest-digging_animation/.git/objects/cf/1633a396431cb6d13ee97b8dca593a0ff53179 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/cf/28058430df19223faea895d69f580c66fc7be7 and minetest-digging_animation/.git/objects/cf/28058430df19223faea895d69f580c66fc7be7 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/d3/3a82c645e4a99cec22ffeea3fe39acd5e9259c and minetest-digging_animation/.git/objects/d3/3a82c645e4a99cec22ffeea3fe39acd5e9259c sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/db/3bd6ed2520c5139fd4a9f45b50ffa4004398c7 and minetest-digging_animation/.git/objects/db/3bd6ed2520c5139fd4a9f45b50ffa4004398c7 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/de/364a5c6afc28bc454e52c7bf9a3949a76149d5 and minetest-digging_animation/.git/objects/de/364a5c6afc28bc454e52c7bf9a3949a76149d5 sind verschieden.
diff -ruN minetest-db_backends/.git/objects/df/2ad89518fdda1b29da9be8fb6f45394d49e6b0 minetest-digging_animation/.git/objects/df/2ad89518fdda1b29da9be8fb6f45394d49e6b0
--- minetest-db_backends/.git/objects/df/2ad89518fdda1b29da9be8fb6f45394d49e6b0 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/df/2ad89518fdda1b29da9be8fb6f45394d49e6b0 2012-10-31 19:08:00.000000000 +0100
@@ -0,0 +1,4 @@
+x•ŽMjÃ0F³Ö)ffôgJHoPrƒ‘fDL¬*Ør=}Ý#d󌏗[­SëèÐU’°£Á—‹.ŽY
+o­F"¯4©yñ¢ß%Ûä°$u^Ue I8åHA0EŸ™²Ã[ŽŸŠù÷SžÂï<=omëskÏsnõ
+ä
ÇሄhöuÏëú¶hîZۏöê¬ë
+ÿW{±ù(NJ±
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/e0/04877e2e493616909f0a72fa14808e64af2b02 and minetest-digging_animation/.git/objects/e0/04877e2e493616909f0a72fa14808e64af2b02 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/e2/e23d27d1a462c2a684accb81a63918b430c12e and minetest-digging_animation/.git/objects/e2/e23d27d1a462c2a684accb81a63918b430c12e sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/e3/1ac6089e758bce64d9c92e0e234395acb285b4 and minetest-digging_animation/.git/objects/e3/1ac6089e758bce64d9c92e0e234395acb285b4 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/e6/76c56c438c8eb54859e2d4ae1db0d7c22f1aeb and minetest-digging_animation/.git/objects/e6/76c56c438c8eb54859e2d4ae1db0d7c22f1aeb sind verschieden.
diff -ruN minetest-db_backends/.git/objects/e6/80a2ef1b244e3f30f47cb2cf30b257575db26f minetest-digging_animation/.git/objects/e6/80a2ef1b244e3f30f47cb2cf30b257575db26f
--- minetest-db_backends/.git/objects/e6/80a2ef1b244e3f30f47cb2cf30b257575db26f 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/e6/80a2ef1b244e3f30f47cb2cf30b257575db26f 2012-11-04 10:32:10.000000000 +0100
@@ -0,0 +1,2 @@
+x•ÏœN!`ëy
+º-Ìž\~†!1Æ­ÆÂÞ\à2Cf
aŸ^Àæ'ç+Ž¯9§Î€€‡Þˆ˜4DÚp ÑZ(€EOB€V;r@«‰PL7lT:rDI-4I)Aq§WâQ áV”{iÂâ%ŠvÕÊc\B$7žw6.^sçŽ0ÚLxï{mì3].3{ƑóñZïýZëñäk~a0  ¹e8ŸF;îtú7œÞ©mÄåÚiî
ý‘ÊÆ\Ãâwvúº|ŒoØý>«K¥WÒ¶É7–”±§ZŠ_@seÖ
\ Kein Zeilenumbruch am Dateiende.
diff -ruN minetest-db_backends/.git/objects/e7/d2b67eb485b7ab75c94a442b369d7d11aaff15 minetest-digging_animation/.git/objects/e7/d2b67eb485b7ab75c94a442b369d7d11aaff15
--- minetest-db_backends/.git/objects/e7/d2b67eb485b7ab75c94a442b369d7d11aaff15 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/e7/d2b67eb485b7ab75c94a442b369d7d11aaff15 2012-11-02 13:17:09.000000000 +0100
@@ -0,0 +1 @@
+x•ŽKjÃ0@»Ö)fR4úŒ-(¥¹A!ã‘LEìŒëȅäôñºy‹žè<×.à[[K”|;%ÈvÄÈ=
óŸó(60KG”ÌÂk¹5)ôDžÐ9ëGÆ1fñ!s'B…s „cfÃ[ûÑŸëô<ežáƒw¯_ºµIõú.:úˆ}ìÉ%8XŽÖìvßkåß¡9oË¢k2ŒµìœêïVóå¯ÞEïµ=Ì þšMu
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/e8/7c354828e193453463940e737bc6b97848ed77 and minetest-digging_animation/.git/objects/e8/7c354828e193453463940e737bc6b97848ed77 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/ec/eda3521e26416ebe9fd2cdb6ad6e4f7ace488d and minetest-digging_animation/.git/objects/ec/eda3521e26416ebe9fd2cdb6ad6e4f7ace488d sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/ee/2394d803827c57a87b5ab53f50a0872302efee and minetest-digging_animation/.git/objects/ee/2394d803827c57a87b5ab53f50a0872302efee sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/ef/784972e7dae777887a0fdb2626226959337dec and minetest-digging_animation/.git/objects/ef/784972e7dae777887a0fdb2626226959337dec sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/f1/3ec2600bbdb5c7a55d9c5880d0603c127b6818 and minetest-digging_animation/.git/objects/f1/3ec2600bbdb5c7a55d9c5880d0603c127b6818 sind verschieden.
diff -ruN minetest-db_backends/.git/objects/f2/811fa9c4cc00dbaf71795bde331f293c8dae48 minetest-digging_animation/.git/objects/f2/811fa9c4cc00dbaf71795bde331f293c8dae48
--- minetest-db_backends/.git/objects/f2/811fa9c4cc00dbaf71795bde331f293c8dae48 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/objects/f2/811fa9c4cc00dbaf71795bde331f293c8dae48 2012-10-31 19:05:18.000000000 +0100
@@ -0,0 +1,3 @@
+x“œNì@ …©óÖV»ɅÑP *$nA93Nbi~¢±³°÷鯓EôL7Jæ;çÈ>3„<ÀýÝãÃMÛ6m 3 Œ\NŠœ†•ƒ¶œ@tG°Ã;'RŽK HIÉoßßVìLdÓyµŸ>ñ"2z»É}‘[·ë8*(4±hAåœ  3Á <ÿ}œÝDs¡ç4í|YSºž/³—Ýo7L¬ŒÿHŽg*PؙšÒ,…“ÂÄïô§ašˆ:wŲå(Dþ˜¥SŽt<šM÷ͲC¶\e‹4>oã9þšL€œ%YLæxèû}Zœ§®;ü*×L]XñpúY\?SXšHÎJ±Û]¯[¡RÁo¶œ‚õRA{Z
+9Ž~TÀ[ô
+Ìjq¶…NT3e\­<¿ß­›Q]ŽÑZWã*jÆõ²àgªp÷€èfò=§³­*—šU‚=«oûæ?&~Á
\ Kein Zeilenumbruch am Dateiende.
BinÀrdateien minetest-db_backends/.git/objects/f9/78b87c584a2093cbe11a6611738d1b9a633adf and minetest-digging_animation/.git/objects/f9/78b87c584a2093cbe11a6611738d1b9a633adf sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/ff/8ef5276deec6788b0f6a6bb6b9d655ba5c6869 and minetest-digging_animation/.git/objects/ff/8ef5276deec6788b0f6a6bb6b9d655ba5c6869 sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/pack/pack-5db0c4234509b89cb25d14a6249c76d1f3576268.idx and minetest-digging_animation/.git/objects/pack/pack-5db0c4234509b89cb25d14a6249c76d1f3576268.idx sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/pack/pack-5db0c4234509b89cb25d14a6249c76d1f3576268.pack and minetest-digging_animation/.git/objects/pack/pack-5db0c4234509b89cb25d14a6249c76d1f3576268.pack sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/pack/pack-8c8e417a4d3fb5c78dfb7b756abc879a052d7f7d.idx and minetest-digging_animation/.git/objects/pack/pack-8c8e417a4d3fb5c78dfb7b756abc879a052d7f7d.idx sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/pack/pack-8c8e417a4d3fb5c78dfb7b756abc879a052d7f7d.pack and minetest-digging_animation/.git/objects/pack/pack-8c8e417a4d3fb5c78dfb7b756abc879a052d7f7d.pack sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/pack/pack-be59170c5b96cff48edadea84359bd32cc807f1b.idx and minetest-digging_animation/.git/objects/pack/pack-be59170c5b96cff48edadea84359bd32cc807f1b.idx sind verschieden.
BinÀrdateien minetest-db_backends/.git/objects/pack/pack-be59170c5b96cff48edadea84359bd32cc807f1b.pack and minetest-digging_animation/.git/objects/pack/pack-be59170c5b96cff48edadea84359bd32cc807f1b.pack sind verschieden.
diff -ruN minetest-db_backends/.git/ORIG_HEAD minetest-digging_animation/.git/ORIG_HEAD
--- minetest-db_backends/.git/ORIG_HEAD 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/ORIG_HEAD 2012-11-04 10:31:49.000000000 +0100
@@ -0,0 +1 @@
+23837e43525e332ea140b58e0f5d1e2b89f1149f
diff -ruN minetest-db_backends/.git/packed-refs minetest-digging_animation/.git/packed-refs
--- minetest-db_backends/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/packed-refs 2012-10-28 18:49:53.000000000 +0100
@@ -0,0 +1,35 @@
+# pack-refs with: peeled
+3d4a1389efd74db7a6cd39561712282dc7d7b542 refs/remotes/origin/client_requests_blocks_2
+25cf3757b29a0397e201a4719788ead3dc76ec94 refs/remotes/origin/master
+51577c8b789d0f24282600b895974885ff422595 refs/remotes/origin/meta_set_nodedef
+960009d619c161a6f60a21edd880d751626e5b91 refs/remotes/origin/stable-0.2
+073964a12fb180f7bb0277337399a39ea84ef06e refs/remotes/origin/stable-0.3
+9696ed31a41b5e3ca85bad4a29c190a0d25c7752 refs/remotes/origin/stable-0.4
+ff1471ba6d266597c7a4379605547b6c1201db34 refs/tags/0.2.20110731_3
+7244f091115c467cd5c0020bb2fb74f70c4114e5 refs/tags/0.2.20110922
+bdf54908aa0b8dabbc67f1925de88bc88a70c935 refs/tags/0.2.20110922_1
+960009d619c161a6f60a21edd880d751626e5b91 refs/tags/0.2.20110922_2
+f446fbf0175fc3ebae18487bcea7c033d09d953b refs/tags/0.2.20110922_3
+f65d157786d09a4756a52ec52f821c02a5f0efad refs/tags/0.3.0
+bc0e5c0063d2af107f81853c5ff555c57d1a9e3a refs/tags/0.3.1
+073964a12fb180f7bb0277337399a39ea84ef06e refs/tags/0.3.2
+c349708eab121c60a0872b38160599c3ab9568cf refs/tags/0.3.dev-20111021
+b0ba05c9ac021032801952ff1220ed4ab1b1bd45 refs/tags/0.4.0
+e3ddbe8c6b70d260f89dfdb0aa7ecb7dab0a12f6 refs/tags/0.4.1
+d38b465b7c11e5f22632b60b88d65fd1e72282af refs/tags/0.4.2-rc1
+9696ed31a41b5e3ca85bad4a29c190a0d25c7752 refs/tags/0.4.3
+74c6836f2fd5c80e901bae604973b700b06727d8 refs/tags/0.4.dev-20111201-0
+bc00cdeb2ce5eda90d8ddae49e417ee253661421 refs/tags/0.4.dev-20111202-1
+cd608b187732b46f18726e14a379695a2f2ad7d0 refs/tags/0.4.dev-20111203-1
+3965d432ca461f9ac292d639a1df886d6e5a2da1 refs/tags/0.4.dev-20111203-2
+fdf7b3bcdfd62aab2563d92b728e98b3518bbc52 refs/tags/0.4.dev-20111203-3
+a00e908f52c20f156158b70dd3a79d24f30221a6 refs/tags/0.4.dev-20111204-1
+e06d4555bf9d179b25bbd207cb6e7416ca05f137 refs/tags/0.4.dev-20111209-1
+569156b01302ea4ba45d11ff5524b62dbc6a9aa0 refs/tags/0.4.dev-20120106-1
+cb05a28745ae4f4f6ad6f4b922bc1b465c6287fa refs/tags/0.4.dev-20120122-1
+fb3ac49335496e3ebc4601a58d6afb356d7b42d2 refs/tags/0.4.dev-20120318
+94f1ab4da3296be707f9164d7a2f7cd61e357e12 refs/tags/0.4.dev-20120320
+684b0047512ce78b97ef5973898fa84cc26f1e48 refs/tags/0.4.dev-20120326
+e4485f5412230e4c8fa21f402ee655a19e1e26c6 refs/tags/0.4.dev-20120408
+3bea1a944e881008f288322394864f3b944758d5 refs/tags/0.4.dev-20120603
+a8eb68142efe54aebdfd293c2eeb93ad999acd25 refs/tags/0.4.dev-20120606
diff -ruN minetest-db_backends/.git/refs/heads/digging_animation minetest-digging_animation/.git/refs/heads/digging_animation
--- minetest-db_backends/.git/refs/heads/digging_animation 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/heads/digging_animation 2012-11-04 10:32:10.000000000 +0100
@@ -0,0 +1 @@
+e680a2ef1b244e3f30f47cb2cf30b257575db26f
diff -ruN minetest-db_backends/.git/refs/heads/master minetest-digging_animation/.git/refs/heads/master
--- minetest-db_backends/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/heads/master 2012-11-04 10:27:36.000000000 +0100
@@ -0,0 +1 @@
+23837e43525e332ea140b58e0f5d1e2b89f1149f
diff -ruN minetest-db_backends/.git/refs/remotes/community/client_requests_blocks_2 minetest-digging_animation/.git/refs/remotes/community/client_requests_blocks_2
--- minetest-db_backends/.git/refs/remotes/community/client_requests_blocks_2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/client_requests_blocks_2 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+3d4a1389efd74db7a6cd39561712282dc7d7b542
diff -ruN minetest-db_backends/.git/refs/remotes/community/db_backends minetest-digging_animation/.git/refs/remotes/community/db_backends
--- minetest-db_backends/.git/refs/remotes/community/db_backends 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/db_backends 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+2e7c8b3f05a5da45bddc36e26292789b19b6560b
diff -ruN minetest-db_backends/.git/refs/remotes/community/master minetest-digging_animation/.git/refs/remotes/community/master
--- minetest-db_backends/.git/refs/remotes/community/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/master 2012-11-02 13:30:28.000000000 +0100
@@ -0,0 +1 @@
+cf1633a396431cb6d13ee97b8dca593a0ff53179
diff -ruN minetest-db_backends/.git/refs/remotes/community/meta_set_nodedef minetest-digging_animation/.git/refs/remotes/community/meta_set_nodedef
--- minetest-db_backends/.git/refs/remotes/community/meta_set_nodedef 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/meta_set_nodedef 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+51577c8b789d0f24282600b895974885ff422595
diff -ruN minetest-db_backends/.git/refs/remotes/community/stable-0.2 minetest-digging_animation/.git/refs/remotes/community/stable-0.2
--- minetest-db_backends/.git/refs/remotes/community/stable-0.2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/stable-0.2 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+960009d619c161a6f60a21edd880d751626e5b91
diff -ruN minetest-db_backends/.git/refs/remotes/community/stable-0.3 minetest-digging_animation/.git/refs/remotes/community/stable-0.3
--- minetest-db_backends/.git/refs/remotes/community/stable-0.3 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/stable-0.3 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+073964a12fb180f7bb0277337399a39ea84ef06e
diff -ruN minetest-db_backends/.git/refs/remotes/community/stable-0.4 minetest-digging_animation/.git/refs/remotes/community/stable-0.4
--- minetest-db_backends/.git/refs/remotes/community/stable-0.4 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/stable-0.4 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+9696ed31a41b5e3ca85bad4a29c190a0d25c7752
diff -ruN minetest-db_backends/.git/refs/remotes/community/sticky_entities minetest-digging_animation/.git/refs/remotes/community/sticky_entities
--- minetest-db_backends/.git/refs/remotes/community/sticky_entities 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/sticky_entities 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+595511e1406147f01252e5f376e6b320ccabe51a
diff -ruN minetest-db_backends/.git/refs/remotes/community/unicode minetest-digging_animation/.git/refs/remotes/community/unicode
--- minetest-db_backends/.git/refs/remotes/community/unicode 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/community/unicode 2012-11-02 13:14:25.000000000 +0100
@@ -0,0 +1 @@
+4ce01ca04d246d4edf5e9bbba70246032e51e47c
diff -ruN minetest-db_backends/.git/refs/remotes/origin/digging_animation minetest-digging_animation/.git/refs/remotes/origin/digging_animation
--- minetest-db_backends/.git/refs/remotes/origin/digging_animation 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/origin/digging_animation 2012-11-04 10:56:32.000000000 +0100
@@ -0,0 +1 @@
+e680a2ef1b244e3f30f47cb2cf30b257575db26f
diff -ruN minetest-db_backends/.git/refs/remotes/origin/HEAD minetest-digging_animation/.git/refs/remotes/origin/HEAD
--- minetest-db_backends/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/origin/HEAD 2012-10-28 18:49:53.000000000 +0100
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master
diff -ruN minetest-db_backends/.git/refs/remotes/origin/master minetest-digging_animation/.git/refs/remotes/origin/master
--- minetest-db_backends/.git/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/origin/master 2012-11-04 10:27:48.000000000 +0100
@@ -0,0 +1 @@
+23837e43525e332ea140b58e0f5d1e2b89f1149f
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/c55sound minetest-digging_animation/.git/refs/remotes/TANK/c55sound
--- minetest-db_backends/.git/refs/remotes/TANK/c55sound 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/c55sound 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+4fb6c07535cff9a385344f5025b25892b828ebc4
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/chunkymapgen minetest-digging_animation/.git/refs/remotes/TANK/chunkymapgen
--- minetest-db_backends/.git/refs/remotes/TANK/chunkymapgen 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/chunkymapgen 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+7eccdb90773c9cb5283572dd0cf47ca3b3fa44d7
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/digging_time_groups minetest-digging_animation/.git/refs/remotes/TANK/digging_time_groups
--- minetest-db_backends/.git/refs/remotes/TANK/digging_time_groups 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/digging_time_groups 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+6e6caba2f5eaa1086aebade39b32f91042a54652
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/mainmenutabs minetest-digging_animation/.git/refs/remotes/TANK/mainmenutabs
--- minetest-db_backends/.git/refs/remotes/TANK/mainmenutabs 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/mainmenutabs 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+ca0fd4173cb18dd54219a1e8f05ec412e4d707ec
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/master minetest-digging_animation/.git/refs/remotes/TANK/master
--- minetest-db_backends/.git/refs/remotes/TANK/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/master 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+e6f5c18357197dcc9d6dd7ba9df50e0d84440717
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/meshanim_rebased minetest-digging_animation/.git/refs/remotes/TANK/meshanim_rebased
--- minetest-db_backends/.git/refs/remotes/TANK/meshanim_rebased 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/meshanim_rebased 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+7678e6d964d270409a50d4ddd28f99baf40c3ba9
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/metadatastuff minetest-digging_animation/.git/refs/remotes/TANK/metadatastuff
--- minetest-db_backends/.git/refs/remotes/TANK/metadatastuff 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/metadatastuff 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+ce1fb15048c06eb3e1d9b34cc191b34d4d101f6e
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/next minetest-digging_animation/.git/refs/remotes/TANK/next
--- minetest-db_backends/.git/refs/remotes/TANK/next 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/next 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+fb3ac49335496e3ebc4601a58d6afb356d7b42d2
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/oldmaster minetest-digging_animation/.git/refs/remotes/TANK/oldmaster
--- minetest-db_backends/.git/refs/remotes/TANK/oldmaster 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/oldmaster 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+7372282a725cc9633eba3bb7bae8f4055e3235bb
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/patch-1 minetest-digging_animation/.git/refs/remotes/TANK/patch-1
--- minetest-db_backends/.git/refs/remotes/TANK/patch-1 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/patch-1 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+1f48220f32f7e630c90311dcbdcba173b1df1814
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/patch-2 minetest-digging_animation/.git/refs/remotes/TANK/patch-2
--- minetest-db_backends/.git/refs/remotes/TANK/patch-2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/patch-2 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+e759ed71440456544ef5062d2355a8bf59aaa6fc
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/patch-3 minetest-digging_animation/.git/refs/remotes/TANK/patch-3
--- minetest-db_backends/.git/refs/remotes/TANK/patch-3 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/patch-3 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+bafaa8603fcd365f764defd7476b798ae8e426fc
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/patch-4 minetest-digging_animation/.git/refs/remotes/TANK/patch-4
--- minetest-db_backends/.git/refs/remotes/TANK/patch-4 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/patch-4 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+37d6c3a2f19854caf6dfeb352cb9f6c50bb52757
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/randomstuff minetest-digging_animation/.git/refs/remotes/TANK/randomstuff
--- minetest-db_backends/.git/refs/remotes/TANK/randomstuff 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/randomstuff 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+46bceebe2f53be05afb1fe42cf8087ee02337c53
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/stable minetest-digging_animation/.git/refs/remotes/TANK/stable
--- minetest-db_backends/.git/refs/remotes/TANK/stable 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/stable 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+bc0e5c0063d2af107f81853c5ff555c57d1a9e3a
diff -ruN minetest-db_backends/.git/refs/remotes/TANK/stable-0.2.20110922 minetest-digging_animation/.git/refs/remotes/TANK/stable-0.2.20110922
--- minetest-db_backends/.git/refs/remotes/TANK/stable-0.2.20110922 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/TANK/stable-0.2.20110922 2012-11-04 10:31:29.000000000 +0100
@@ -0,0 +1 @@
+960009d619c161a6f60a21edd880d751626e5b91
diff -ruN minetest-db_backends/.git/refs/remotes/upstream/client_requests_blocks_2 minetest-digging_animation/.git/refs/remotes/upstream/client_requests_blocks_2
--- minetest-db_backends/.git/refs/remotes/upstream/client_requests_blocks_2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/upstream/client_requests_blocks_2 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+3d4a1389efd74db7a6cd39561712282dc7d7b542
diff -ruN minetest-db_backends/.git/refs/remotes/upstream/master minetest-digging_animation/.git/refs/remotes/upstream/master
--- minetest-db_backends/.git/refs/remotes/upstream/master 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/upstream/master 2012-11-04 10:27:31.000000000 +0100
@@ -0,0 +1 @@
+23837e43525e332ea140b58e0f5d1e2b89f1149f
diff -ruN minetest-db_backends/.git/refs/remotes/upstream/meta_set_nodedef minetest-digging_animation/.git/refs/remotes/upstream/meta_set_nodedef
--- minetest-db_backends/.git/refs/remotes/upstream/meta_set_nodedef 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/upstream/meta_set_nodedef 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+51577c8b789d0f24282600b895974885ff422595
diff -ruN minetest-db_backends/.git/refs/remotes/upstream/stable-0.2 minetest-digging_animation/.git/refs/remotes/upstream/stable-0.2
--- minetest-db_backends/.git/refs/remotes/upstream/stable-0.2 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/upstream/stable-0.2 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+960009d619c161a6f60a21edd880d751626e5b91
diff -ruN minetest-db_backends/.git/refs/remotes/upstream/stable-0.3 minetest-digging_animation/.git/refs/remotes/upstream/stable-0.3
--- minetest-db_backends/.git/refs/remotes/upstream/stable-0.3 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/upstream/stable-0.3 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+073964a12fb180f7bb0277337399a39ea84ef06e
diff -ruN minetest-db_backends/.git/refs/remotes/upstream/stable-0.4 minetest-digging_animation/.git/refs/remotes/upstream/stable-0.4
--- minetest-db_backends/.git/refs/remotes/upstream/stable-0.4 1970-01-01 01:00:00.000000000 +0100
+++ minetest-digging_animation/.git/refs/remotes/upstream/stable-0.4 2012-11-02 13:14:11.000000000 +0100
@@ -0,0 +1 @@
+9696ed31a41b5e3ca85bad4a29c190a0d25c7752
diff -ruN minetest-db_backends/minetest.conf.example minetest-digging_animation/minetest.conf.example
--- minetest-db_backends/minetest.conf.example 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/minetest.conf.example 2012-10-28 18:49:53.000000000 +0100
@@ -169,17 +169,6 @@
# If true, actions are recorded for rollback
#enable_rollback_recording = false
-# MySQL stuff
-#mysql_server = localhost
-# MySQL server to connect
-#mysql_user = minetest
-# User to connect as. Must have Select, Insert, Update, Delete privs if
-# tables are already created, or additionally Create priv if not.
-#mysql_password = secret
-# User's password
-#mysql_database = minetest
-# Database in which tables are created. Table name is <world_name>_blocks.
-
# Profiler data print interval. #0 = disable.
#profiler_print_interval = 0
#enable_mapgen_debug_info = false
diff -ruN minetest-db_backends/src/base64.h minetest-digging_animation/src/base64.h
--- minetest-db_backends/src/base64.h 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/base64.h 2012-11-02 13:29:52.000000000 +0100
@@ -1,10 +1,5 @@
-#ifndef BASE64_HEADER
-#define BASE64_HEADER
-
#include <string>
bool base64_is_valid(std::string const& s);
std::string base64_encode(unsigned char const* , unsigned int len);
std::string base64_decode(std::string const& s);
-
-#endif // BASE64_HEADER
\ Kein Zeilenumbruch am Dateiende.
diff -ruN minetest-db_backends/src/camera.cpp minetest-digging_animation/src/camera.cpp
--- minetest-db_backends/src/camera.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/camera.cpp 2012-11-04 15:03:41.078740911 +0100
@@ -189,7 +189,7 @@
if (m_digging_button != -1)
{
- f32 offset = dtime * 3.5;
+ f32 offset = dtime * 4.5;
float m_digging_anim_was = m_digging_anim;
m_digging_anim += offset;
if (m_digging_anim >= 1)
@@ -336,13 +336,13 @@
if (m_digging_button != -1)
{
f32 digfrac = m_digging_anim;
- wield_position.X -= 30 * sin(pow(digfrac, 0.8f) * M_PI);
- wield_position.Y += 15 * sin(digfrac * 2 * M_PI);
- wield_position.Z += 5 * digfrac;
-
+ wield_position.X -= 50 * sin(pow(digfrac, 0.8f) * M_PI);
+ wield_position.Y += 24 * sin(digfrac * 1.8 * M_PI);
+ wield_position.Z += 25 * 0.5;
+
// Euler angles are PURE EVIL, so why not use quaternions?
core::quaternion quat_begin(wield_rotation * core::DEGTORAD);
- core::quaternion quat_end(v3f(90, -10, -130) * core::DEGTORAD);
+ core::quaternion quat_end(v3f(80, 30, 100) * core::DEGTORAD);
core::quaternion quat_slerp;
quat_slerp.slerp(quat_begin, quat_end, sin(digfrac * M_PI));
quat_slerp.toEuler(wield_rotation);
diff -ruN minetest-db_backends/src/client.cpp minetest-digging_animation/src/client.cpp
--- minetest-db_backends/src/client.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/client.cpp 2012-10-28 18:49:53.000000000 +0100
@@ -513,7 +513,7 @@
snprintf((char*)&data[23], PASSWORD_SIZE, "%s", m_password.c_str());
// This should be incremented in each version
- writeU16(&data[51], MT_PROTOCOL_VERSION);
+ writeU16(&data[51], PROTOCOL_VERSION);
// Send as unreliable
Send(0, data, false);
diff -ruN minetest-db_backends/src/clientmap.cpp minetest-digging_animation/src/clientmap.cpp
--- minetest-db_backends/src/clientmap.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/clientmap.cpp 2012-11-02 13:29:52.000000000 +0100
@@ -544,11 +544,6 @@
for(u32 i=0; i<c; i++)
{
scene::IMeshBuffer *buf = mesh->getMeshBuffer(i);
-
- buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, g_settings->getBool("trilinear_filter"));
- buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, g_settings->getBool("bilinear_filter"));
- buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, g_settings->getBool("anisotropic_filter"));
-
const video::SMaterial& material = buf->getMaterial();
video::IMaterialRenderer* rnd =
driver->getMaterialRenderer(material.MaterialType);
diff -ruN minetest-db_backends/src/clientserver.h minetest-digging_animation/src/clientserver.h
--- minetest-db_backends/src/clientserver.h 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/clientserver.h 2012-10-28 18:49:53.000000000 +0100
@@ -23,11 +23,11 @@
#include "util/serialize.h"
/*
- changes by MT_PROTOCOL_VERSION:
+ changes by PROTOCOL_VERSION:
- MT_PROTOCOL_VERSION 3:
+ PROTOCOL_VERSION 3:
Base for writing changes here
- MT_PROTOCOL_VERSION 4:
+ PROTOCOL_VERSION 4:
Add TOCLIENT_MEDIA
Add TOCLIENT_TOOLDEF
Add TOCLIENT_NODEDEF
@@ -35,41 +35,41 @@
Add TOSERVER_INTERACT
Obsolete TOSERVER_CLICK_ACTIVEOBJECT
Obsolete TOSERVER_GROUND_ACTION
- MT_PROTOCOL_VERSION 5:
+ PROTOCOL_VERSION 5:
Make players to be handled mostly as ActiveObjects
- MT_PROTOCOL_VERSION 6:
+ PROTOCOL_VERSION 6:
Only non-cached textures are sent
- MT_PROTOCOL_VERSION 7:
+ PROTOCOL_VERSION 7:
Add TOCLIENT_ITEMDEF
Obsolete TOCLIENT_TOOLDEF
Obsolete TOCLIENT_CRAFTITEMDEF
Compress the contents of TOCLIENT_ITEMDEF and TOCLIENT_NODEDEF
- MT_PROTOCOL_VERSION 8:
+ PROTOCOL_VERSION 8:
Digging based on item groups
Many things
- MT_PROTOCOL_VERSION 9:
+ PROTOCOL_VERSION 9:
ContentFeatures and NodeDefManager use a different serialization
format; better for future version cross-compatibility
Many things
- MT_PROTOCOL_VERSION 10:
+ PROTOCOL_VERSION 10:
TOCLIENT_PRIVILEGES
Version raised to force 'fly' and 'fast' privileges into effect.
Node metadata change (came in later; somewhat incompatible)
- MT_PROTOCOL_VERSION 11:
+ PROTOCOL_VERSION 11:
TileDef in ContentFeatures
Nodebox drawtype
(some dev snapshot)
TOCLIENT_INVENTORY_FORMSPEC
(0.4.0, 0.4.1)
- MT_PROTOCOL_VERSION 12:
+ PROTOCOL_VERSION 12:
TOSERVER_INVENTORY_FIELDS
16-bit node ids
TOCLIENT_DETACHED_INVENTORY
- MT_PROTOCOL_VERSION 13:
+ PROTOCOL_VERSION 13:
InventoryList field "Width" (deserialization fails with old versions)
*/
-#define MT_PROTOCOL_VERSION 13
+#define PROTOCOL_VERSION 13
#define PROTOCOL_ID 0x4f457403
diff -ruN minetest-db_backends/src/CMakeLists.txt minetest-digging_animation/src/CMakeLists.txt
--- minetest-db_backends/src/CMakeLists.txt 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/CMakeLists.txt 2012-10-28 18:49:53.000000000 +0100
@@ -141,10 +141,6 @@
find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
-find_package(MySQL REQUIRED)
-
-SET(LEVELDB_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/leveldb/include)
-SET(LEVELDB_LIBRARY leveldb)
# Do not use system-wide installation of Lua, because it'll likely be a
# different version and/or has different build options.
@@ -201,10 +197,6 @@
mapblock.cpp
mapsector.cpp
map.cpp
- database.cpp
- database-mysql.cpp
- database-dummy.cpp
- database-leveldb.cpp
player.cpp
test.cpp
sha1.cpp
@@ -288,8 +280,6 @@
${SOUND_INCLUDE_DIRS}
${JTHREAD_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
- ${MYSQL_INCLUDE_DIR}
- ${LEVELDB_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
)
@@ -310,8 +300,6 @@
${SOUND_LIBRARIES}
${JTHREAD_LIBRARY}
${SQLITE3_LIBRARY}
- ${MYSQL_LIBRARIES}
- ${LEVELDB_LIBRARY}
${LUA_LIBRARY}
${PLATFORM_LIBS}
${CLIENT_PLATFORM_LIBS}
@@ -325,8 +313,6 @@
${ZLIB_LIBRARIES}
${JTHREAD_LIBRARY}
${SQLITE3_LIBRARY}
- ${MYSQL_LIBRARIES}
- ${LEVELDB_LIBRARY}
${LUA_LIBRARY}
${PLATFORM_LIBS}
)
@@ -500,6 +486,4 @@
add_subdirectory(lua)
endif (LUA_FOUND)
-add_subdirectory(leveldb)
-
#end
diff -ruN minetest-db_backends/src/config.h minetest-digging_animation/src/config.h
--- minetest-db_backends/src/config.h 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/config.h 2012-10-28 18:49:53.000000000 +0100
@@ -13,7 +13,6 @@
#define USE_SOUND 0
#define STATIC_SHAREDIR ""
#define BUILD_INFO "non-cmake"
-#define MYSQL_BACKEND 0
#ifdef USE_CMAKE_CONFIG_H
#include "cmake_config.h"
@@ -31,8 +30,6 @@
#define STATIC_SHAREDIR CMAKE_STATIC_SHAREDIR
#undef BUILD_INFO
#define BUILD_INFO CMAKE_BUILD_INFO
- #undef MYSQL_BACKEND
- #define MYSQL_BACKEND CMAKE_MYSQL_BACKEND
#endif
#endif
diff -ruN minetest-db_backends/src/content_mapblock.cpp minetest-digging_animation/src/content_mapblock.cpp
--- minetest-db_backends/src/content_mapblock.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/content_mapblock.cpp 2012-11-02 17:20:41.000000000 +0100
@@ -492,15 +492,15 @@
// -Z towards +Z, thus the direction is +Z.
// Rotate texture to make animation go in flow direction
// Positive if liquid moves towards +Z
- int dz = (corner_levels[side_corners[2][0]] +
- corner_levels[side_corners[2][1]] <
- corner_levels[side_corners[3][0]] +
- corner_levels[side_corners[3][1]]);
+ int dz = (corner_levels[side_corners[3][0]] +
+ corner_levels[side_corners[3][1]]) -
+ (corner_levels[side_corners[2][0]] +
+ corner_levels[side_corners[2][1]]);
// Positive if liquid moves towards +X
- int dx = (corner_levels[side_corners[0][0]] +
- corner_levels[side_corners[0][1]] <
- corner_levels[side_corners[1][0]] +
- corner_levels[side_corners[1][1]]);
+ int dx = (corner_levels[side_corners[1][0]] +
+ corner_levels[side_corners[1][1]]) -
+ (corner_levels[side_corners[0][0]] +
+ corner_levels[side_corners[0][1]]);
// -X
if(-dx >= abs(dz))
{
diff -ruN minetest-db_backends/src/database.cpp minetest-digging_animation/src/database.cpp
--- minetest-db_backends/src/database.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/database.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,353 +0,0 @@
-/*
- SQLite format specification:
- - Initially only replaces sectors/ and sectors2/
-
- If map.sqlite does not exist in the save dir
- or the block was not found in the database
- the map will try to load from sectors folder.
- In either case, map.sqlite will be created
- and all future saves will save there.
-
- Structure of map.sqlite:
- Tables:
- blocks
- (PK) INT pos
- BLOB data
-*/
-
-
-#include "map.h"
-#include "mapsector.h"
-#include "mapblock.h"
-#include "main.h"
-#include "filesys.h"
-#include "voxel.h"
-#include "porting.h"
-#include "mapgen.h"
-#include "nodemetadata.h"
-#include "settings.h"
-#include "log.h"
-#include "profiler.h"
-#include "nodedef.h"
-#include "gamedef.h"
-#include "util/directiontables.h"
-#include "rollback_interface.h"
-
-
-#include "database.h"
-
-static s32 unsignedToSigned(s32 i, s32 max_positive)
-{
- if(i < max_positive)
- return i;
- else
- return i - 2*max_positive;
-}
-
-// modulo of a negative number does not work consistently in C
-static sqlite3_int64 pythonmodulo(sqlite3_int64 i, sqlite3_int64 mod)
-{
- if(i >= 0)
- return i % mod;
- return mod - ((-i) % mod);
-}
-
-long long Database::getBlockAsInteger(const v3s16 pos) {
- return (unsigned long long)pos.Z*16777216 +
- (unsigned long long)pos.Y*4096 +
- (unsigned long long)pos.X;
-}
-
-v3s16 Database::getIntegerAsBlock(long long i) {
- s32 x = unsignedToSigned(pythonmodulo(i, 4096), 2048);
- i = (i - x) / 4096;
- s32 y = unsignedToSigned(pythonmodulo(i, 4096), 2048);
- i = (i - y) / 4096;
- s32 z = unsignedToSigned(pythonmodulo(i, 4096), 2048);
- return v3s16(x,y,z);
-}
-
-
-Database_SQLite3::Database_SQLite3(ServerMap *map, std::string savedir)
-{
- m_database = NULL;
- m_database_read = NULL;
- m_database_write = NULL;
- m_database_list = NULL;
- m_savedir = savedir;
- srvmap = map;
-}
-
-int Database_SQLite3::Initialized(void)
-{
- return m_database ? 1 : 0;
-}
-
-void Database_SQLite3::beginSave() {
- verifyDatabase();
- if(sqlite3_exec(m_database, "BEGIN;", NULL, NULL, NULL) != SQLITE_OK)
- infostream<<"WARNING: beginSave() failed, saving might be slow.";
-}
-
-void Database_SQLite3::endSave() {
- verifyDatabase();
- if(sqlite3_exec(m_database, "COMMIT;", NULL, NULL, NULL) != SQLITE_OK)
- infostream<<"WARNING: endSave() failed, map might not have saved.";
-}
-
-void Database_SQLite3::createDirs(std::string path)
-{
- if(fs::CreateAllDirs(path) == false)
- {
- infostream<<DTIME<<"Database_SQLite3: Failed to create directory "
- <<"\""<<path<<"\""<<std::endl;
- throw BaseException("Database_SQLite3 failed to create directory");
- }
-}
-
-void Database_SQLite3::verifyDatabase() {
- if(m_database)
- return;
-
- {
- std::string dbp = m_savedir + DIR_DELIM + "map.sqlite";
- bool needs_create = false;
- int d;
-
- /*
- Open the database connection
- */
-
- createDirs(m_savedir); // ?
-
- if(!fs::PathExists(dbp))
- needs_create = true;
-
- d = sqlite3_open_v2(dbp.c_str(), &m_database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
- if(d != SQLITE_OK) {
- infostream<<"WARNING: SQLite3 database failed to open: "<<sqlite3_errmsg(m_database)<<std::endl;
- throw FileNotGoodException("Cannot open database file");
- }
-
- if(needs_create)
- createDatabase();
-
- d = sqlite3_prepare(m_database, "SELECT `data` FROM `blocks` WHERE `pos`=? LIMIT 1", -1, &m_database_read, NULL);
- if(d != SQLITE_OK) {
- infostream<<"WARNING: SQLite3 database read statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
- throw FileNotGoodException("Cannot prepare read statement");
- }
-
- d = sqlite3_prepare(m_database, "REPLACE INTO `blocks` VALUES(?, ?)", -1, &m_database_write, NULL);
- if(d != SQLITE_OK) {
- infostream<<"WARNING: SQLite3 database write statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
- throw FileNotGoodException("Cannot prepare write statement");
- }
-
- d = sqlite3_prepare(m_database, "SELECT `pos` FROM `blocks`", -1, &m_database_list, NULL);
- if(d != SQLITE_OK) {
- infostream<<"WARNING: SQLite3 database list statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
- throw FileNotGoodException("Cannot prepare read statement");
- }
-
- infostream<<"ServerMap: SQLite3 database opened"<<std::endl;
- }
-}
-
-void Database_SQLite3::saveBlock(MapBlock *block)
-{
- DSTACK(__FUNCTION_NAME);
- /*
- Dummy blocks are not written
- */
- if(block->isDummy())
- {
- /*v3s16 p = block->getPos();
- infostream<<"Database_SQLite3::saveBlock(): WARNING: Not writing dummy block "
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
- return;
- }
-
- // Format used for writing
- u8 version = SER_FMT_VER_HIGHEST;
- // Get destination
- v3s16 p3d = block->getPos();
-
-
-#if 0
- v2s16 p2d(p3d.X, p3d.Z);
- std::string sectordir = getSectorDir(p2d);
-
- createDirs(sectordir);
-
- std::string fullpath = sectordir+DIR_DELIM+getBlockFilename(p3d);
- std::ofstream o(fullpath.c_str(), std::ios_base::binary);
- if(o.good() == false)
- throw FileNotGoodException("Cannot open block data");
-#endif
- /*
- [0] u8 serialization version
- [1] data
- */
-
- verifyDatabase();
-
- std::ostringstream o(std::ios_base::binary);
-
- o.write((char*)&version, 1);
-
- // Write basic data
- block->serialize(o, version, true);
-
- // Write block to database
-
- std::string tmp = o.str();
- const char *bytes = tmp.c_str();
-
- if(sqlite3_bind_int64(m_database_write, 1, getBlockAsInteger(p3d)) != SQLITE_OK)
- infostream<<"WARNING: Block position failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
- if(sqlite3_bind_blob(m_database_write, 2, (void *)bytes, o.tellp(), NULL) != SQLITE_OK) // TODO this mught not be the right length
- infostream<<"WARNING: Block data failed to bind: "<<sqlite3_errmsg(m_database)<<std::endl;
- int written = sqlite3_step(m_database_write);
- if(written != SQLITE_DONE)
- infostream<<"WARNING: Block failed to save ("<<p3d.X<<", "<<p3d.Y<<", "<<p3d.Z<<") "
- <<sqlite3_errmsg(m_database)<<std::endl;
- // Make ready for later reuse
- sqlite3_reset(m_database_write);
-
- // We just wrote it to the disk so clear modified flag
- block->resetModified();
-}
-
-MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
-{
- v2s16 p2d(blockpos.X, blockpos.Z);
- verifyDatabase();
-
- if(sqlite3_bind_int64(m_database_read, 1, getBlockAsInteger(blockpos)) != SQLITE_OK)
- infostream<<"WARNING: Could not bind block position for load: "
- <<sqlite3_errmsg(m_database)<<std::endl;
- if(sqlite3_step(m_database_read) == SQLITE_ROW) {
- /*
- Make sure sector is loaded
- */
- MapSector *sector = srvmap->createSector(p2d);
-
- /*
- Load block
- */
- const char * data = (const char *)sqlite3_column_blob(m_database_read, 0);
- size_t len = sqlite3_column_bytes(m_database_read, 0);
-
- std::string datastr(data, len);
-
-// srvmap->loadBlock(&datastr, blockpos, sector, false);
-
- try {
- std::istringstream is(datastr, std::ios_base::binary);
-
- u8 version = SER_FMT_VER_INVALID;
- is.read((char*)&version, 1);
-
- if(is.fail())
- throw SerializationError("ServerMap::loadBlock(): Failed"
- " to read MapBlock version");
-
- MapBlock *block = NULL;
- bool created_new = false;
- block = sector->getBlockNoCreateNoEx(blockpos.Y);
- if(block == NULL)
- {
- block = sector->createBlankBlockNoInsert(blockpos.Y);
- created_new = true;
- }
-
- // Read basic data
- block->deSerialize(is, version, true);
-
- // If it's a new block, insert it to the map
- if(created_new)
- sector->insertBlock(block);
-
- /*
- Save blocks loaded in old format in new format
- */
-
- //if(version < SER_FMT_VER_HIGHEST || save_after_load)
- // Only save if asked to; no need to update version
- //if(save_after_load)
- // saveBlock(block);
-
- // We just loaded it from, so it's up-to-date.
- block->resetModified();
-
- }
- catch(SerializationError &e)
- {
- errorstream<<"Invalid block data in database"
- <<" ("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<")"
- <<" (SerializationError): "<<e.what()<<std::endl;
-
- // TODO: Block should be marked as invalid in memory so that it is
- // not touched but the game can run
-
- if(g_settings->getBool("ignore_world_load_errors")){
- errorstream<<"Ignoring block load error. Duck and cover! "
- <<"(ignore_world_load_errors)"<<std::endl;
- } else {
- throw SerializationError("Invalid block data in database");
- //assert(0);
- }
- }
-
-
- sqlite3_step(m_database_read);
- // We should never get more than 1 row, so ok to reset
- sqlite3_reset(m_database_read);
-
- return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here
- }
- sqlite3_reset(m_database_read);
- return(NULL);
-}
-
-void Database_SQLite3::createDatabase()
-{
- int e;
- assert(m_database);
- e = sqlite3_exec(m_database,
- "CREATE TABLE IF NOT EXISTS `blocks` ("
- "`pos` INT NOT NULL PRIMARY KEY,"
- "`data` BLOB"
- ");"
- , NULL, NULL, NULL);
- if(e == SQLITE_ABORT)
- throw FileNotGoodException("Could not create sqlite3 database structure");
- else
- infostream<<"ServerMap: SQLite3 database structure was created";
-
-}
-
-void Database_SQLite3::listAllLoadableBlocks(core::list<v3s16> &dst)
-{
- verifyDatabase();
-
- while(sqlite3_step(m_database_list) == SQLITE_ROW)
- {
- sqlite3_int64 block_i = sqlite3_column_int64(m_database_list, 0);
- v3s16 p = getIntegerAsBlock(block_i);
- //dstream<<"block_i="<<block_i<<" p="<<PP(p)<<std::endl;
- dst.push_back(p);
- }
-}
-
-Database_SQLite3::~Database_SQLite3()
-{
- if(m_database_read)
- sqlite3_finalize(m_database_read);
- if(m_database_write)
- sqlite3_finalize(m_database_write);
- if(m_database)
- sqlite3_close(m_database);
-}
-
diff -ruN minetest-db_backends/src/database-dummy.cpp minetest-digging_animation/src/database-dummy.cpp
--- minetest-db_backends/src/database-dummy.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/database-dummy.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,156 +0,0 @@
-/*
-Dummy "database" class
-*/
-
-
-#include "map.h"
-#include "mapsector.h"
-#include "mapblock.h"
-#include "main.h"
-#include "filesys.h"
-#include "voxel.h"
-#include "porting.h"
-#include "mapgen.h"
-#include "nodemetadata.h"
-#include "settings.h"
-#include "log.h"
-#include "profiler.h"
-#include "nodedef.h"
-#include "gamedef.h"
-#include "util/directiontables.h"
-#include "rollback_interface.h"
-
-
-#include "database.h"
-
-Database_Dummy::Database_Dummy(ServerMap *map)
-{
- srvmap = map;
-}
-
-int Database_Dummy::Initialized(void)
-{
- return 1;
-}
-
-void Database_Dummy::beginSave() {}
-void Database_Dummy::endSave() {}
-
-void Database_Dummy::saveBlock(MapBlock *block)
-{
- DSTACK(__FUNCTION_NAME);
- /*
- Dummy blocks are not written
- */
- if(block->isDummy())
- {
- return;
- }
-
- // Format used for writing
- u8 version = SER_FMT_VER_HIGHEST;
- // Get destination
- v3s16 p3d = block->getPos();
-
- /*
- [0] u8 serialization version
- [1] data
- */
-
- std::ostringstream o(std::ios_base::binary);
- o.write((char*)&version, 1);
- // Write basic data
- block->serialize(o, version, true);
- // Write block to database
- std::string tmp = o.str();
-
- m_database[getBlockAsInteger(p3d)] = tmp;
- // We just wrote it to the disk so clear modified flag
- block->resetModified();
-}
-
-MapBlock* Database_Dummy::loadBlock(v3s16 blockpos)
-{
- v2s16 p2d(blockpos.X, blockpos.Z);
-
- if(m_database.count(getBlockAsInteger(blockpos))) {
- /*
- Make sure sector is loaded
- */
- MapSector *sector = srvmap->createSector(p2d);
- /*
- Load block
- */
- std::string datastr = m_database[getBlockAsInteger(blockpos)];
-// srvmap->loadBlock(&datastr, blockpos, sector, false);
-
- try {
- std::istringstream is(datastr, std::ios_base::binary);
- u8 version = SER_FMT_VER_INVALID;
- is.read((char*)&version, 1);
-
- if(is.fail())
- throw SerializationError("ServerMap::loadBlock(): Failed"
- " to read MapBlock version");
-
- MapBlock *block = NULL;
- bool created_new = false;
- block = sector->getBlockNoCreateNoEx(blockpos.Y);
- if(block == NULL)
- {
- block = sector->createBlankBlockNoInsert(blockpos.Y);
- created_new = true;
- }
- // Read basic data
- block->deSerialize(is, version, true);
- // If it's a new block, insert it to the map
- if(created_new)
- sector->insertBlock(block);
- /*
- Save blocks loaded in old format in new format
- */
-
- //if(version < SER_FMT_VER_HIGHEST || save_after_load)
- // Only save if asked to; no need to update version
- //if(save_after_load)
- // saveBlock(block);
- // We just loaded it from, so it's up-to-date.
- block->resetModified();
-
- }
- catch(SerializationError &e)
- {
- errorstream<<"Invalid block data in database"
- <<" ("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<")"
- <<" (SerializationError): "<<e.what()<<std::endl;
- // TODO: Block should be marked as invalid in memory so that it is
- // not touched but the game can run
-
- if(g_settings->getBool("ignore_world_load_errors")){
- errorstream<<"Ignoring block load error. Duck and cover! "
- <<"(ignore_world_load_errors)"<<std::endl;
- } else {
- throw SerializationError("Invalid block data in database");
- //assert(0);
- }
- }
-
- return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here
- }
- return(NULL);
-}
-
-void Database_Dummy::listAllLoadableBlocks(core::list<v3s16> &dst)
-{
- for(std::map<unsigned long long, std::string>::iterator x = m_database.begin(); x != m_database.end(); ++x)
- {
- v3s16 p = getIntegerAsBlock(x->first);
- //dstream<<"block_i="<<block_i<<" p="<<PP(p)<<std::endl;
- dst.push_back(p);
- }
-}
-
-Database_Dummy::~Database_Dummy()
-{
- m_database.clear();
-}
diff -ruN minetest-db_backends/src/database.h minetest-digging_animation/src/database.h
--- minetest-db_backends/src/database.h 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/database.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,128 +0,0 @@
-#ifndef DATABASE_HEADER
-#define DATABASE_HEADER
-
-#include "map.h"
-#include "mapsector.h"
-#include "mapblock.h"
-#include "main.h"
-#include "filesys.h"
-
-extern "C" {
- #include "sqlite3.h"
-}
-
-extern "C" {
- #include "mysql.h"
-}
-
-#include "leveldb/db.h"
-
-class Database;
-class Database_SQLite3;
-class ServerMap;
-
-class Database
-{
-public:
- virtual void beginSave()=0;
- virtual void endSave()=0;
-
- virtual void saveBlock(MapBlock *block)=0;
- virtual MapBlock* loadBlock(v3s16 blockpos)=0;
- long long getBlockAsInteger(const v3s16 pos);
- v3s16 getIntegerAsBlock(long long i);
- virtual void listAllLoadableBlocks(core::list<v3s16> &dst)=0;
- virtual int Initialized(void)=0;
- virtual ~Database() {};
-};
-
-class Database_SQLite3 : public Database
-{
-public:
- Database_SQLite3(ServerMap *map, std::string savedir);
- virtual void beginSave();
- virtual void endSave();
-
- virtual void saveBlock(MapBlock *block);
- virtual MapBlock* loadBlock(v3s16 blockpos);
- virtual void listAllLoadableBlocks(core::list<v3s16> &dst);
- virtual int Initialized(void);
- ~Database_SQLite3();
-private:
- ServerMap *srvmap;
- std::string m_savedir;
- sqlite3 *m_database;
- sqlite3_stmt *m_database_read;
- sqlite3_stmt *m_database_write;
- sqlite3_stmt *m_database_list;
-
- // Create the database structure
- void createDatabase();
- // Verify we can read/write to the database
- void verifyDatabase();
- void createDirs(std::string path);
-};
-
-class Database_Dummy : public Database
-{
-public:
- Database_Dummy(ServerMap *map);
- virtual void beginSave();
- virtual void endSave();
- virtual void saveBlock(MapBlock *block);
- virtual MapBlock* loadBlock(v3s16 blockpos);
- virtual void listAllLoadableBlocks(core::list<v3s16> &dst);
- virtual int Initialized(void);
- ~Database_Dummy();
-private:
- ServerMap *srvmap;
- std::map<unsigned long long, std::string> m_database;
-};
-
-class Database_LevelDB : public Database
-{
-public:
- Database_LevelDB(ServerMap *map, std::string savedir);
- virtual void beginSave();
- virtual void endSave();
- virtual void saveBlock(MapBlock *block);
- virtual MapBlock* loadBlock(v3s16 blockpos);
- virtual void listAllLoadableBlocks(core::list<v3s16> &dst);
- virtual int Initialized(void);
- ~Database_LevelDB();
-private:
- ServerMap *srvmap;
- leveldb::DB* m_database;
-};
-
-#ifdef MYSQL_BACKEND
-class Database_MySQL : public Database
-{
-public:
- Database_MySQL(ServerMap *map, std::string host, std::string user, std::string pass, std::string dbasename, std::string worldname);
- virtual void beginSave();
- virtual void endSave();
-
- virtual void saveBlock(MapBlock *block);
- virtual MapBlock* loadBlock(v3s16 blockpos);
- virtual void listAllLoadableBlocks(core::list<v3s16> &dst);
- virtual int Initialized(void);
- ~Database_MySQL();
-private:
- ServerMap *srvmap;
- std::string m_worldname;
- std::string db_host, db_user, db_pass, db_base;
- MYSQL *m_database;
- MYSQL_STMT *m_database_read;
- MYSQL_STMT *m_database_write;
- MYSQL_STMT *m_database_list;
-
- // Create the database structure
- void createDatabase();
- // Verify we can read/write to the database
- void verifyDatabase();
- void createDirs(std::string path);
-};
-#endif
-
-#endif
diff -ruN minetest-db_backends/src/database-leveldb.cpp minetest-digging_animation/src/database-leveldb.cpp
--- minetest-db_backends/src/database-leveldb.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/database-leveldb.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,161 +0,0 @@
-/*
-LevelDB databases
-*/
-
-
-#include "map.h"
-#include "mapsector.h"
-#include "mapblock.h"
-#include "main.h"
-#include "filesys.h"
-#include "voxel.h"
-#include "porting.h"
-#include "mapgen.h"
-#include "nodemetadata.h"
-#include "settings.h"
-#include "log.h"
-#include "profiler.h"
-#include "nodedef.h"
-#include "gamedef.h"
-#include "util/directiontables.h"
-#include "rollback_interface.h"
-
-#include "leveldb/db.h"
-
-
-#include "database.h"
-
-Database_LevelDB::Database_LevelDB(ServerMap *map, std::string savedir)
-{
- leveldb::Options options;
- options.create_if_missing = true;
- leveldb::Status status = leveldb::DB::Open(options, savedir + DIR_DELIM + "map.db", &m_database);
- assert(status.ok());
- srvmap = map;
-}
-
-int Database_LevelDB::Initialized(void)
-{
- return 1;
-}
-
-void Database_LevelDB::beginSave() {}
-void Database_LevelDB::endSave() {}
-
-void Database_LevelDB::saveBlock(MapBlock *block)
-{
- DSTACK(__FUNCTION_NAME);
- /*
- Dummy blocks are not written
- */
- if(block->isDummy())
- {
- return;
- }
-
- // Format used for writing
- u8 version = SER_FMT_VER_HIGHEST;
- // Get destination
- v3s16 p3d = block->getPos();
-
- /*
- [0] u8 serialization version
- [1] data
- */
-
- std::ostringstream o(std::ios_base::binary);
- o.write((char*)&version, 1);
- // Write basic data
- block->serialize(o, version, true);
- // Write block to database
- std::string tmp = o.str();
-
- m_database->Put(leveldb::WriteOptions(), i64tos(getBlockAsInteger(p3d)), tmp);
-
- // We just wrote it to the disk so clear modified flag
- block->resetModified();
-}
-
-MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
-{
- v2s16 p2d(blockpos.X, blockpos.Z);
-
- std::string datastr;
- leveldb::Status s = m_database->Get(leveldb::ReadOptions(), i64tos(getBlockAsInteger(blockpos)), &datastr);
-
- if(s.ok()) {
- /*
- Make sure sector is loaded
- */
- MapSector *sector = srvmap->createSector(p2d);
-
- try {
- std::istringstream is(datastr, std::ios_base::binary);
- u8 version = SER_FMT_VER_INVALID;
- is.read((char*)&version, 1);
-
- if(is.fail())
- throw SerializationError("ServerMap::loadBlock(): Failed"
- " to read MapBlock version");
-
- MapBlock *block = NULL;
- bool created_new = false;
- block = sector->getBlockNoCreateNoEx(blockpos.Y);
- if(block == NULL)
- {
- block = sector->createBlankBlockNoInsert(blockpos.Y);
- created_new = true;
- }
- // Read basic data
- block->deSerialize(is, version, true);
- // If it's a new block, insert it to the map
- if(created_new)
- sector->insertBlock(block);
- /*
- Save blocks loaded in old format in new format
- */
-
- //if(version < SER_FMT_VER_HIGHEST || save_after_load)
- // Only save if asked to; no need to update version
- //if(save_after_load)
- // saveBlock(block);
- // We just loaded it from, so it's up-to-date.
- block->resetModified();
-
- }
- catch(SerializationError &e)
- {
- errorstream<<"Invalid block data in database"
- <<" ("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<")"
- <<" (SerializationError): "<<e.what()<<std::endl;
- // TODO: Block should be marked as invalid in memory so that it is
- // not touched but the game can run
-
- if(g_settings->getBool("ignore_world_load_errors")){
- errorstream<<"Ignoring block load error. Duck and cover! "
- <<"(ignore_world_load_errors)"<<std::endl;
- } else {
- throw SerializationError("Invalid block data in database");
- //assert(0);
- }
- }
-
- return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here
- }
- return(NULL);
-}
-
-void Database_LevelDB::listAllLoadableBlocks(core::list<v3s16> &dst)
-{
- leveldb::Iterator* it = m_database->NewIterator(leveldb::ReadOptions());
- for (it->SeekToFirst(); it->Valid(); it->Next()) {
- dst.push_back(getIntegerAsBlock(mystoi64(it->key().ToString())));
- }
- assert(it->status().ok()); // Check for any errors found during the scan
- delete it;
-}
-
-Database_LevelDB::~Database_LevelDB()
-{
- delete m_database;
-}
diff -ruN minetest-db_backends/src/database-mysql.cpp minetest-digging_animation/src/database-mysql.cpp
--- minetest-db_backends/src/database-mysql.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/database-mysql.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,413 +0,0 @@
-#ifdef MYSQL_BACKEND
-/*
- MySQL format specification:
-
- world data is stored in table <world_name>_blocks
- if table do not exists it will be created
-
- Structure of world table:
- x int NOT NULL,
- y int NOT NULL,
- z int NOT NULL,
- ver tinyint unsigned NOT NULL,
- underground bit(1) NOT NULL,
- daynight bit(1) NOT NULL,
- lighting bit(1) NOT NULL,
- generated bit(1) NOT NULL,
- bulk mediumblob NOT NULL,
- meta mediumblob NOT NULL,
- static mediumblob NOT NULL,
- timers mediumblob NOT NULL,
- nimap mediumblob NOT NULL,
-
- Currently only x,y,z and bulk columns are used.
-
-*/
-
-
-#include "map.h"
-#include "mapsector.h"
-#include "mapblock.h"
-#include "main.h"
-#include "filesys.h"
-#include "voxel.h"
-#include "porting.h"
-#include "mapgen.h"
-#include "nodemetadata.h"
-#include "settings.h"
-#include "log.h"
-#include "profiler.h"
-#include "nodedef.h"
-#include "gamedef.h"
-#include "util/directiontables.h"
-#include "rollback_interface.h"
-
-#include "database.h"
-
-#define READ_QUERY "SELECT bulk FROM `%s_blocks` WHERE x=? AND y=? AND z=? LIMIT 1"
-#define WRITE_QUERY "REPLACE INTO `%s_blocks` (x,y,z,bulk) VALUES(?, ?, ?, ?)"
-#define LIST_QUERY "SELECT x,y,z FROM `%s_blocks`"
-
-Database_MySQL::Database_MySQL(ServerMap *map, std::string host, std::string user, std::string pass, std::string dbasename, std::string worldname)
-{
- m_database = NULL;
- m_database_read = NULL;
- m_database_write = NULL;
- m_database_list = NULL;
- db_host = host;
- db_user = user;
- db_pass = pass;
- db_base = dbasename;
- m_worldname = worldname.substr(worldname.rfind('/')+1);
- srvmap = map;
-}
-
-int Database_MySQL::Initialized(void)
-{
- return m_database ? 1 : 0 ;
-}
-
-void Database_MySQL::beginSave() {
- verifyDatabase();
- if(mysql_query(m_database, "BEGIN;"))
- infostream<<"WARNING: beginSave() failed, saving might be slow.";
-}
-
-void Database_MySQL::endSave() {
- verifyDatabase();
- if(mysql_query(m_database, "COMMIT;"))
- infostream<<"WARNING: endSave() failed, map might not have saved.";
-}
-
-void Database_MySQL::verifyDatabase() {
- if(m_database)
- return;
-
- {
-
- /*
- Open the database connection
- */
-
- m_database = mysql_init(NULL);
- if (!mysql_real_connect(m_database,db_host.data(),db_user.data(),db_pass.data(),db_base.data(),0,NULL,0)) {
- infostream<<"WARNING: MySQL database failed to open: "<<std::endl;
- throw FileNotGoodException("Cannot open database");
- }
-
- if (mysql_select_db(m_database,"minetest")) {
- infostream<<"WARNING: MySQL database failed to open: "<<std::endl;
- throw FileNotGoodException(mysql_error(m_database));
- }
-
- char q[1024];
- sprintf(q,"select count(*) from `%s_blocks`",m_worldname.c_str());
- int e = mysql_query(m_database,q);
- if (e) {
- createDatabase();
- e = mysql_query(m_database,q);
- if (e) {
- infostream<<"WARNING: MySQL database failed to initialize!!: "<<std::endl;
- throw FileNotGoodException(mysql_error(m_database));
- }
- }
- mysql_free_result(mysql_store_result(m_database));
- if (!(m_database_read = mysql_stmt_init(m_database))) {
- infostream<<"WARNING: MySQL database read statment failed to init: "<<std::endl;
- throw FileNotGoodException("Cannot prepare1 read statement");
- }
-
- sprintf(q,READ_QUERY,m_worldname.c_str());
- if (mysql_stmt_prepare(m_database_read, q, strlen(q))) {
- printf("q: %s, %s\n",q,mysql_error(m_database));
- infostream<<"WARNING: MySQL database read statment failed to prepare: "<<std::endl;
- throw FileNotGoodException("Cannot prepare2 read statement");
- }
-
- if (!(m_database_write = mysql_stmt_init(m_database))) {
- infostream<<"WARNING: MySQL database write statment failed to init: "<<std::endl;
- throw FileNotGoodException("Cannot prepare1 write statement");
- }
- sprintf(q,WRITE_QUERY,m_worldname.c_str());
- if (mysql_stmt_prepare(m_database_write, q, strlen(q))) {
- printf("q: %s, %s\n",q,mysql_error(m_database));
- infostream<<"WARNING: MySQL database write statment failed to prepare: "<<std::endl;
- throw FileNotGoodException("Cannot prepare2 write statement");
- }
-
- if (!(m_database_list = mysql_stmt_init(m_database))) {
- infostream<<"WARNING: MySQL database list statment failed to init: "<<std::endl;
- throw FileNotGoodException("Cannot prepare1 list statement");
- }
- sprintf(q,LIST_QUERY,m_worldname.c_str());
- if (mysql_stmt_prepare(m_database_list, q, strlen(q))) {
- printf("q: %s, %s\n",q,mysql_error(m_database));
- infostream<<"WARNING: MySQL database list statment failed to prepare: "<<std::endl;
- throw FileNotGoodException("Cannot prepare2 list statement");
- }
-
- infostream<<"Server: MySQL database opened"<<std::endl;
- }
-}
-
-void Database_MySQL::saveBlock(MapBlock *block)
-{
- DSTACK(__FUNCTION_NAME);
- /*
- Dummy blocks are not written
- */
- MYSQL_BIND bind[4];
- if(block->isDummy())
- {
- /*v3s16 p = block->getPos();
- infostream<<"Database_MySQL::saveBlock(): WARNING: Not writing dummy block "
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
- return;
- }
-
- if(!block->getModified())
- return;
- // Format used for writing
- u8 version = SER_FMT_VER_HIGHEST;
- // Get destination
- v3s16 p3d = block->getPos();
-
- /*
- [0] u8 serialization version
- [1] data
- */
-
- verifyDatabase();
-
- std::ostringstream o(std::ios_base::binary);
-
- o.write((char*)&version, 1);
-
- // Write basic data
- block->serialize(o, version, true);
-
- // Write block to database
-
- std::string tmp = o.str();
- const char *bytes = tmp.c_str();
- unsigned long bytes_cnt = o.tellp(); // TODO this mught not be the right length
-
- memset(bind, 0, sizeof(bind));
- bind[0].buffer_type= MYSQL_TYPE_SHORT;
- bind[0].buffer= (char *)&p3d.X;
- bind[0].is_null= 0;
- bind[0].length= 0;
-
- bind[1].buffer_type= MYSQL_TYPE_SHORT;
- bind[1].buffer= (char *)&p3d.Y;
- bind[1].is_null= 0;
- bind[1].length= 0;
-
- bind[2].buffer_type= MYSQL_TYPE_SHORT;
- bind[2].buffer= (char *)&p3d.Z;
- bind[2].is_null= 0;
- bind[2].length= 0;
-
- bind[3].buffer_type= MYSQL_TYPE_BLOB;
- bind[3].buffer= (char *)bytes;
- bind[3].buffer_length= bytes_cnt;
- bind[3].is_null= 0;
- bind[3].length= &bytes_cnt;
-
- if (mysql_stmt_bind_param(m_database_write, bind))
- infostream<<"WARNING: Block failed to bind:"<<mysql_stmt_error(m_database_write)<<std::endl;
-
- if (mysql_stmt_execute(m_database_write))
- infostream<<"WARNING: Block failed to save ("<<p3d.X<<", "<<p3d.Y<<", "<<p3d.Z<<") "
- <<mysql_stmt_error(m_database_write)<<std::endl;
- // We just wrote it to the disk so clear modified flag
- mysql_stmt_reset(m_database_write);
- block->resetModified();
-}
-
-MapBlock* Database_MySQL::loadBlock(v3s16 blockpos)
-{
- v2s16 p2d(blockpos.X, blockpos.Z);
- verifyDatabase();
-
- MYSQL_BIND bind[3];
- MYSQL_BIND bindr[1];
- unsigned long real_length;
- char buf[65535];
-
- memset(bind, 0, sizeof(bind));
- bind[0].buffer_type= MYSQL_TYPE_SHORT;
- bind[0].buffer= (char *)&blockpos.X;
- bind[0].is_null= 0;
- bind[0].length= 0;
- bind[1].buffer_type= MYSQL_TYPE_SHORT;
- bind[1].buffer= (char *)&blockpos.Y;
- bind[1].is_null= 0;
- bind[1].length= 0;
- bind[2].buffer_type= MYSQL_TYPE_SHORT;
- bind[2].buffer= (char *)&blockpos.Z;
- bind[2].is_null= 0;
- bind[2].length= 0;
-
- if (mysql_stmt_bind_param(m_database_read, bind))
- infostream<<"WARNING: Could not bind block position for load: "
- <<mysql_stmt_error(m_database_read)<<std::endl;
-
- if (mysql_stmt_execute(m_database_read))
- infostream<<"WARNING: Block failed to load "
- <<mysql_stmt_error(m_database_read)<<std::endl;
-
-
- memset(bindr, 0, sizeof(bindr));
-
- bindr[0].buffer_type= MYSQL_TYPE_BLOB;
- bindr[0].buffer= (char *)buf;
- bindr[0].buffer_length= 65535;
- bindr[0].length= &real_length;
-
- if (mysql_stmt_bind_result(m_database_read, bindr))
- infostream<<"WARNING: Could not bind result block position for load: "
- <<mysql_stmt_error(m_database_read)<<std::endl;
-
- if (!mysql_stmt_fetch(m_database_read)) {
- /*
- Make sure sector is loaded
- */
- MapSector *sector = srvmap->createSector(p2d);
-
- /*
- Load block
- */
- const char * data = buf;
- size_t len = real_length;
-
- std::string datastr(data, len);
-
-// srvmap->loadBlock(&datastr, blockpos, sector, false);
- try {
- std::istringstream is(datastr, std::ios_base::binary);
-
- u8 version = SER_FMT_VER_INVALID;
- is.read((char*)&version, 1);
-
- if(is.fail())
- throw SerializationError("ServerMap::loadBlock(): Failed"
- " to read MapBlock version");
-
- MapBlock *block = NULL;
- bool created_new = false;
- block = sector->getBlockNoCreateNoEx(blockpos.Y);
- if(block == NULL)
- {
- block = sector->createBlankBlockNoInsert(blockpos.Y);
- created_new = true;
- }
-
- // Read basic data
- block->deSerialize(is, version, true);
-
- // If it's a new block, insert it to the map
- if(created_new)
- sector->insertBlock(block);
-
- /*
- Save blocks loaded in old format in new format
- */
-
- //if(version < SER_FMT_VER_HIGHEST || save_after_load)
- // Only save if asked to; no need to update version
- //if(save_after_load)
- // saveBlock(block);
-
- // We just loaded it from, so it's up-to-date.
- block->resetModified();
-
- }
- catch(SerializationError &e)
- {
- errorstream<<"Invalid block data in database"
- <<" ("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<")"
- <<" (SerializationError): "<<e.what()<<std::endl;
-
- // TODO: Block should be marked as invalid in memory so that it is
- // not touched but the game can run
-
- if(g_settings->getBool("ignore_world_load_errors")){
- errorstream<<"Ignoring block load error. Duck and cover! "
- <<"(ignore_world_load_errors)"<<std::endl;
- } else {
- throw SerializationError("Invalid block data in database");
- //assert(0);
- }
- }
- mysql_stmt_reset(m_database_read);
- return srvmap->getBlockNoCreateNoEx(blockpos);
- }
- mysql_stmt_reset(m_database_read);
- return(NULL);
-}
-
-void Database_MySQL::createDatabase()
-{
- int e;
- char q[512];
- assert(m_database);
- sprintf (q,"CREATE TABLE IF NOT EXISTS `%s_blocks` ( \
- x int NOT NULL, \
- y int NOT NULL, \
- z int NOT NULL, \
- ver tinyint unsigned NOT NULL, \
- underground bit(1) NOT NULL, \
- daynight bit(1) NOT NULL, \
- lighting bit(1) NOT NULL, \
- generated bit(1) NOT NULL, \
- bulk mediumblob NOT NULL, \
- meta mediumblob NOT NULL, \
- static mediumblob NOT NULL, \
- timers mediumblob NOT NULL, \
- nimap mediumblob NOT NULL, \
- PRIMARY KEY (x,y,z) \
- );", m_worldname.c_str());
- e = mysql_query(m_database, q);
- if(e) {
- printf("%d: %s / %s\n",e,mysql_error(m_database),q);
- throw FileNotGoodException("Could not create MySQL database structure");
-
- } else
- infostream<<"ServerMap: MySQL database structure was created";
-
-}
-
-void Database_MySQL::listAllLoadableBlocks(core::list<v3s16> &dst)
-{
- verifyDatabase();
- printf("LIST CALLED\n");
- if (mysql_stmt_execute(m_database_list))
- infostream<<"WARNING: Block list failed "
- <<mysql_stmt_error(m_database_list)<<std::endl;
-
- long long block_i;
- MYSQL_BIND bind[1];
- memset(bind, 0, sizeof(bind));
-
- bind[0].buffer_type= MYSQL_TYPE_LONGLONG;
- bind[0].buffer= (char *)&block_i;
-
- if (mysql_stmt_bind_result(m_database_list, bind))
- infostream<<"WARNING: Could not bind result block position for load: "
- <<mysql_stmt_error(m_database_list)<<std::endl;
-
- while(!mysql_stmt_fetch(m_database_read))
- {
- v3s16 p = getIntegerAsBlock(block_i);
- //dstream<<"block_i="<<block_i<<" p="<<PP(p)<<std::endl;
- dst.push_back(p);
- }
-}
-
-Database_MySQL::~Database_MySQL()
-{
- if(m_database)
- mysql_close(m_database);
-}
-#endif
diff -ruN minetest-db_backends/src/defaultsettings.cpp minetest-digging_animation/src/defaultsettings.cpp
--- minetest-db_backends/src/defaultsettings.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/defaultsettings.cpp 2012-11-02 13:29:52.000000000 +0100
@@ -142,10 +142,5 @@
settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
settings->setDefault("dedicated_server_step", "0.05");
settings->setDefault("ignore_world_load_errors", "false");
- settings->setDefault("mip_map", "false");
- settings->setDefault("anisotropic_filter", "false");
- settings->setDefault("bilinear_filter", "false");
- settings->setDefault("trilinear_filter", "false");
-
}
diff -ruN minetest-db_backends/src/game.cpp minetest-digging_animation/src/game.cpp
--- minetest-db_backends/src/game.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/game.cpp 2012-11-02 16:15:15.000000000 +0100
@@ -2628,7 +2628,7 @@
initial_color.getInterpolated_quadratic(
initial_color,
final_color,
- (statustext_time / (float)statustext_time_max)*(statustext_time / (float)statustext_time_max));
+ pow(statustext_time / (float)statustext_time_max, 2.0f));
guitext_status->setOverrideColor(fade_color);
guitext_status->enableOverrideColor(true);
}
diff -ruN minetest-db_backends/src/guiFormSpecMenu.cpp minetest-digging_animation/src/guiFormSpecMenu.cpp
--- minetest-db_backends/src/guiFormSpecMenu.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/guiFormSpecMenu.cpp 2012-11-02 13:29:52.000000000 +0100
@@ -458,7 +458,6 @@
video::ITexture *texture = m_gamedef->tsrc()->getTextureRaw(fimage);
gui::IGUIButton *e = Environment->addButton(rect, this, spec.fid, spec.flabel.c_str());
- e->setUseAlphaChannel(true);
e->setImage(texture);
e->setPressedImage(texture);
e->setScaleImage(true);
diff -ruN minetest-db_backends/src/guiMainMenu.cpp minetest-digging_animation/src/guiMainMenu.cpp
--- minetest-db_backends/src/guiMainMenu.cpp 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/guiMainMenu.cpp 2012-11-02 13:29:52.000000000 +0100
@@ -98,10 +98,6 @@
GUI_ID_SMOOTH_LIGHTING_CB,
GUI_ID_3D_CLOUDS_CB,
GUI_ID_OPAQUE_WATER_CB,
- GUI_ID_MIPMAP_CB,
- GUI_ID_ANISOTROPIC_CB,
- GUI_ID_BILINEAR_CB,
- GUI_ID_TRILINEAR_CB,
GUI_ID_DAMAGE_CB,
GUI_ID_CREATIVE_CB,
GUI_ID_JOIN_GAME_BUTTON,
@@ -584,38 +580,6 @@
Environment->addCheckBox(m_data->opaque_water, rect, this,
GUI_ID_OPAQUE_WATER_CB, wgettext("Opaque water"));
}
-
-
- // Anisotropic/mipmap/bi-/trilinear settings
-
- {
- core::rect<s32> rect(0, 0, option_w+20, 30);
- rect += m_topleft_client + v2s32(option_x+175, option_y);
- Environment->addCheckBox(m_data->mip_map, rect, this,
- GUI_ID_MIPMAP_CB, wgettext("Mip-Mapping"));
- }
-
- {
- core::rect<s32> rect(0, 0, option_w+20, 30);
- rect += m_topleft_client + v2s32(option_x+175, option_y+20);
- Environment->addCheckBox(m_data->anisotropic_filter, rect, this,
- GUI_ID_ANISOTROPIC_CB, wgettext("Anisotropic Filtering"));
- }
-
- {
- core::rect<s32> rect(0, 0, option_w+20, 30);
- rect += m_topleft_client + v2s32(option_x+175, option_y+20*2);
- Environment->addCheckBox(m_data->bilinear_filter, rect, this,
- GUI_ID_BILINEAR_CB, wgettext("Bi-Linear Filtering"));
- }
-
- {
- core::rect<s32> rect(0, 0, option_w+20, 30);
- rect += m_topleft_client + v2s32(option_x+175, option_y+20*3);
- Environment->addCheckBox(m_data->trilinear_filter, rect, this,
- GUI_ID_TRILINEAR_CB, wgettext("Tri-Linear Filtering"));
- }
-
// Key change button
{
core::rect<s32> rect(0, 0, 120, 30);
@@ -797,30 +761,6 @@
}
{
- gui::IGUIElement *e = getElementFromId(GUI_ID_MIPMAP_CB);
- if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
- dst->mip_map = ((gui::IGUICheckBox*)e)->isChecked();
- }
-
- {
- gui::IGUIElement *e = getElementFromId(GUI_ID_ANISOTROPIC_CB);
- if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
- dst->anisotropic_filter = ((gui::IGUICheckBox*)e)->isChecked();
- }
-
- {
- gui::IGUIElement *e = getElementFromId(GUI_ID_BILINEAR_CB);
- if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
- dst->bilinear_filter = ((gui::IGUICheckBox*)e)->isChecked();
- }
-
- {
- gui::IGUIElement *e = getElementFromId(GUI_ID_TRILINEAR_CB);
- if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
- dst->trilinear_filter = ((gui::IGUICheckBox*)e)->isChecked();
- }
-
- {
gui::IGUIElement *e = getElementFromId(GUI_ID_WORLD_LISTBOX);
if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX)
dst->selected_world = ((gui::IGUIListBox*)e)->getSelected();
diff -ruN minetest-db_backends/src/guiMainMenu.h minetest-digging_animation/src/guiMainMenu.h
--- minetest-db_backends/src/guiMainMenu.h 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/guiMainMenu.h 2012-11-02 13:29:52.000000000 +0100
@@ -41,10 +41,6 @@
bool smooth_lighting;
bool clouds_3d;
bool opaque_water;
- bool mip_map;
- bool anisotropic_filter;
- bool bilinear_filter;
- bool trilinear_filter;
// Server options
bool creative_mode;
bool enable_damage;
diff -ruN minetest-db_backends/src/leveldb/AUTHORS minetest-digging_animation/src/leveldb/AUTHORS
--- minetest-db_backends/src/leveldb/AUTHORS 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/leveldb/AUTHORS 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-# Names should be added to this file like so:
-# Name or Organization <email address>
-
-Google Inc.
-
-# Initial version authors:
-Jeffrey Dean <jeff@google.com>
-Sanjay Ghemawat <sanjay@google.com>
diff -ruN minetest-db_backends/src/leveldb/build_detect_platform minetest-digging_animation/src/leveldb/build_detect_platform
--- minetest-db_backends/src/leveldb/build_detect_platform 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/leveldb/build_detect_platform 1970-01-01 01:00:00.000000000 +0100
@@ -1,202 +0,0 @@
-#!/bin/sh
-#
-# Detects OS we're compiling on and outputs a file specified by the first
-# argument, which in turn gets read while processing Makefile.
-#
-# The output will set the following variables:
-# CC C Compiler path
-# CXX C++ Compiler path
-# PLATFORM_LDFLAGS Linker flags
-# PLATFORM_LIBS Libraries flags
-# PLATFORM_SHARED_EXT Extension for shared libraries
-# PLATFORM_SHARED_LDFLAGS Flags for building shared library
-# This flag is embedded just before the name
-# of the shared library without intervening spaces
-# PLATFORM_SHARED_CFLAGS Flags for compiling objects for shared library
-# PLATFORM_CCFLAGS C compiler flags
-# PLATFORM_CXXFLAGS C++ compiler flags. Will contain:
-# PLATFORM_SHARED_VERSIONED Set to 'true' if platform supports versioned
-# shared libraries, empty otherwise.
-#
-# The PLATFORM_CCFLAGS and PLATFORM_CXXFLAGS might include the following:
-#
-# -DLEVELDB_CSTDATOMIC_PRESENT if <cstdatomic> is present
-# -DLEVELDB_PLATFORM_POSIX for Posix-based platforms
-# -DSNAPPY if the Snappy library is present
-#
-
-OUTPUT=$1
-PREFIX=$2
-if test -z "$OUTPUT" || test -z "$PREFIX"; then
- echo "usage: $0 <output-filename> <directory_prefix>" >&2
- exit 1
-fi
-
-# Delete existing output, if it exists
-rm -f $OUTPUT
-touch $OUTPUT
-
-if test -z "$CC"; then
- CC=cc
-fi
-
-if test -z "$CXX"; then
- CXX=g++
-fi
-
-# Detect OS
-if test -z "$TARGET_OS"; then
- TARGET_OS=`uname -s`
-fi
-
-COMMON_FLAGS=
-CROSS_COMPILE=
-PLATFORM_CCFLAGS=
-PLATFORM_CXXFLAGS=
-PLATFORM_LDFLAGS=
-PLATFORM_LIBS=
-PLATFORM_SHARED_EXT="so"
-PLATFORM_SHARED_LDFLAGS="-shared -Wl,-soname -Wl,"
-PLATFORM_SHARED_CFLAGS="-fPIC"
-PLATFORM_SHARED_VERSIONED=true
-
-MEMCMP_FLAG=
-if [ "$CXX" = "g++" ]; then
- # Use libc's memcmp instead of GCC's memcmp. This results in ~40%
- # performance improvement on readrandom under gcc 4.4.3 on Linux/x86.
- MEMCMP_FLAG="-fno-builtin-memcmp"
-fi
-
-case "$TARGET_OS" in
- Darwin)
- PLATFORM=OS_MACOSX
- COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX"
- PLATFORM_SHARED_EXT=dylib
- [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
- PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name $INSTALL_PATH/"
- PORT_FILE=port/port_posix.cc
- ;;
- Linux)
- PLATFORM=OS_LINUX
- COMMON_FLAGS="$MEMCMP_FLAG -pthread -DOS_LINUX"
- PLATFORM_LDFLAGS="-pthread"
- PORT_FILE=port/port_posix.cc
- ;;
- SunOS)
- PLATFORM=OS_SOLARIS
- COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_SOLARIS"
- PLATFORM_LIBS="-lpthread -lrt"
- PORT_FILE=port/port_posix.cc
- ;;
- FreeBSD)
- PLATFORM=OS_FREEBSD
- COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_FREEBSD"
- PLATFORM_LIBS="-lpthread"
- PORT_FILE=port/port_posix.cc
- ;;
- NetBSD)
- PLATFORM=OS_NETBSD
- COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_NETBSD"
- PLATFORM_LIBS="-lpthread -lgcc_s"
- PORT_FILE=port/port_posix.cc
- ;;
- OpenBSD)
- PLATFORM=OS_OPENBSD
- COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_OPENBSD"
- PLATFORM_LDFLAGS="-pthread"
- PORT_FILE=port/port_posix.cc
- ;;
- DragonFly)
- PLATFORM=OS_DRAGONFLYBSD
- COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_DRAGONFLYBSD"
- PLATFORM_LIBS="-lpthread"
- PORT_FILE=port/port_posix.cc
- ;;
- OS_ANDROID_CROSSCOMPILE)
- PLATFORM=OS_ANDROID
- COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_ANDROID -DLEVELDB_PLATFORM_POSIX"
- PLATFORM_LDFLAGS="" # All pthread features are in the Android C library
- PORT_FILE=port/port_posix.cc
- CROSS_COMPILE=true
- ;;
- HP-UX)
- PLATFORM=OS_HPUX
- COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_HPUX"
- PLATFORM_LDFLAGS="-pthread"
- PORT_FILE=port/port_posix.cc
- # man ld: +h internal_name
- PLATFORM_SHARED_LDFLAGS="-shared -Wl,+h -Wl,"
- ;;
- *)
- echo "Unknown platform!" >&2
- exit 1
-esac
-
-# We want to make a list of all cc files within util, db, table, and helpers
-# except for the test and benchmark files. By default, find will output a list
-# of all files matching either rule, so we need to append -print to make the
-# prune take effect.
-DIRS="$PREFIX/db $PREFIX/util $PREFIX/table"
-
-set -f # temporarily disable globbing so that our patterns aren't expanded
-PRUNE_TEST="-name *test*.cc -prune"
-PRUNE_BENCH="-name *_bench.cc -prune"
-PORTABLE_FILES=`find $DIRS $PRUNE_TEST -o $PRUNE_BENCH -o -name '*.cc' -print | sort | sed "s,^$PREFIX/,," | tr "\n" " "`
-
-set +f # re-enable globbing
-
-# The sources consist of the portable files, plus the platform-specific port
-# file.
-echo "SOURCES=$PORTABLE_FILES $PORT_FILE" >> $OUTPUT
-echo "MEMENV_SOURCES=helpers/memenv/memenv.cc" >> $OUTPUT
-
-if [ "$CROSS_COMPILE" = "true" ]; then
- # Cross-compiling; do not try any compilation tests.
- true
-else
- # If -std=c++0x works, use <cstdatomic>. Otherwise use port_posix.h.
- $CXX $CXXFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null <<EOF
- #include <cstdatomic>
- int main() {}
-EOF
- if [ "$?" = 0 ]; then
- COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX -DLEVELDB_CSTDATOMIC_PRESENT"
- PLATFORM_CXXFLAGS="-std=c++0x"
- else
- COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
- fi
-
- # Test whether Snappy library is installed
- # http://code.google.com/p/snappy/
- $CXX $CXXFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF
- #include <snappy.h>
- int main() {}
-EOF
- if [ "$?" = 0 ]; then
- COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
- PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
- fi
-
- # Test whether tcmalloc is available
- $CXX $CXXFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null <<EOF
- int main() {}
-EOF
- if [ "$?" = 0 ]; then
- PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
- fi
-fi
-
-PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
-PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS $COMMON_FLAGS"
-
-echo "CC=$CC" >> $OUTPUT
-echo "CXX=$CXX" >> $OUTPUT
-echo "PLATFORM=$PLATFORM" >> $OUTPUT
-echo "PLATFORM_LDFLAGS=$PLATFORM_LDFLAGS" >> $OUTPUT
-echo "PLATFORM_LIBS=$PLATFORM_LIBS" >> $OUTPUT
-echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS" >> $OUTPUT
-echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS" >> $OUTPUT
-echo "PLATFORM_SHARED_CFLAGS=$PLATFORM_SHARED_CFLAGS" >> $OUTPUT
-echo "PLATFORM_SHARED_EXT=$PLATFORM_SHARED_EXT" >> $OUTPUT
-echo "PLATFORM_SHARED_LDFLAGS=$PLATFORM_SHARED_LDFLAGS" >> $OUTPUT
-echo "PLATFORM_SHARED_VERSIONED=$PLATFORM_SHARED_VERSIONED" >> $OUTPUT
diff -ruN minetest-db_backends/src/leveldb/CMakeLists.txt minetest-digging_animation/src/leveldb/CMakeLists.txt
--- minetest-db_backends/src/leveldb/CMakeLists.txt 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/leveldb/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,187 +0,0 @@
-set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-cmake_minimum_required(VERSION 2.8)
-
-PROJECT(leveldb)
-# version
-set(LIB_MAJOR 0)
-set(LIB_MINOR 0)
-set(LIB_RELEASE 1)
-set(CMAKE_INSTALL_SO_NO_EXE "0")
-
-include(CheckIncludeFile)
-SET (Boost_ADDITIONAL_VERSIONS "1.36" "1.36.0" "1.41" "1.41.0" "1.39" "1.39.0" "1.42.0" "1.42" "1.43.0"
-"1.43." "1.44.0" "1.44.0" "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47")
-find_package(Boost COMPONENTS filesystem system thread date_time REQUIRED)
-if(Boost_FOUND)
- message(STATUS "Package Boost-${Boost_VERSION} found : ${Boost_INCLUDE_DIR}")
-else(Boost_FOUND)
- message(FATAL_ERROR "The package Boost has not been found")
-endif(Boost_FOUND)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_INCLUDE_DIRS})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} include)
-
-
-# STATIC/DYNAMIC LIBRARY INCLUSION
-if(MINGW OR WIN32)
- OPTION(STATIC "build a static binaries. This is mainly intended for the win32-package and the MACOSX-bundle." ON )
-else(MINGW OR WIN32)
- OPTION(STATIC "build a static binaries. This is mainly intended for the win32-package and the MACOSX-bundle." OFF )
-endif()
-
-
-
-# OS detection
-if(WIN32)
- add_definitions(-DLEVELDB_PLATFORM_WINDOWS -DOS_WIN -DWIN32_LEAN_AND_MEAN)
- if(MINGW)
-add_definitions(-DMINGW)
- endif()
- if(MSVC)
- add_definitions(-DCOMPILER_MSVC)
- endif()
- set(PORT_SRCS port/port_win.cc util/env_boost.cc)
- set(CIF_SRCS)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- add_definitions(-DLEVELDB_PLATFORM_POSIX -DOS_FREEBSD)
- set(PORT_SRCS port/port_posix.cc util/env_posix.cc)
- set(CIF_SRCS db/c.cc)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- add_definitions(-DLEVELDB_PLATFORM_POSIX -DOS_LINUX)
- # link pthread
- set(PORT_SRCS port/port_posix.cc util/env_posix.cc)
- set(CIF_SRCS db/c.cc)
-elseif(CYGWIN)
- add_definitions(-DLEVELDB_PLATFORM_POSIX -DOS_LINUX)
- set(PORT_SRCS port/port_posix.cc util/env_posix.cc)
- set(CIF_SRCS db/c.cc)
-elseif(APPLE)
- add_definitions(-DLEVELDB_PLATFORM_POSIX -DOS_MACOSX)
- set(PORT_SRCS port/port_posix.cc util/env_posix.cc)
- set(CIF_SRCS db/c.cc)
-endif()
-
-# FIXME: check cstdatomic here..
-
-set(SRCS
- db/builder.cc
- db/db_impl.cc
- db/db_iter.cc
- db/filename.cc
- db/dbformat.cc
- db/log_reader.cc
- db/log_writer.cc
- db/memtable.cc
- db/repair.cc
- db/table_cache.cc
- db/version_edit.cc
- db/version_set.cc
- db/write_batch.cc
- table/block.cc
- table/block_builder.cc
- table/filter_block.cc
- table/format.cc
- table/iterator.cc
- table/merger.cc
- table/table.cc
- table/table_builder.cc
- table/two_level_iterator.cc
- util/env.cc
- util/arena.cc
- util/bloom.cc
- util/cache.cc
- util/coding.cc
- util/comparator.cc
- util/crc32c.cc
- util/filter_policy.cc
- util/hash.cc
- util/histogram.cc
- util/logging.cc
- util/options.cc
- util/status.cc
- ${PORT_SRCS}
- ${CIF_SRCS}
- )
-
-set(HDRS
- include/leveldb/c.h
- include/leveldb/cache.h
- include/leveldb/comparator.h
- include/leveldb/db.h
- include/leveldb/env.h
- include/leveldb/iterator.h
- include/leveldb/options.h
- include/leveldb/slice.h
- include/leveldb/status.h
- include/leveldb/table.h
- include/leveldb/table_builder.h
- include/leveldb/write_batch.h)
-
-set(TESTHARNESS_SRCS
- util/testutil.cc
- util/testharness.cc)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-if(BUILDSTATIC)
- add_library(leveldb STATIC ${SRCS})
-else(BUILDSTATIC)
- add_library(leveldb SHARED ${SRCS})
-endif()
-
-set(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
-set_target_properties(leveldb PROPERTIES SOVERSION ${LIB_MAJOR} VERSION ${_soversion})
-target_link_libraries(leveldb pthread ${Boost_LIBRARIES})
-SET (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-
-IF(MINGW)
- set_property(TARGET leveldb PROPERTY LINK_SEARCH_END_STATIC ON)
- set_target_properties(leveldb PROPERTIES LINK_FLAGS "-static-libgcc")
-ENDIF()
-
-INSTALL(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/leveldb)
-if(MINGW OR WIN32)
- INSTALL(TARGETS leveldb DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-else(MINGW OR wIN32)
- INSTALL(TARGETS leveldb LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-endif()
-
-if(TESTDB)
- ENABLE_TESTING()
- # TESTS
- add_library(leveldb-testharness STATIC ${TESTHARNESS_SRCS})
-
- macro(leveldb_test ${nam})
- endmacro()
-
- macro(leveldb_tests)
- foreach(t ${ARGN})
- get_filename_component(_tname ${t} NAME_WE)
- add_executable(${_tname} ${t})
- target_link_libraries(${_tname}
- leveldb-testharness
- leveldb
-pthread
- )
- endforeach()
- endmacro()
-
- leveldb_tests(
- db/db_bench.cc
- util/arena_test.cc
- db/c_test.c
- util/cache_test.cc
- util/coding_test.cc
- db/corruption_test.cc
- util/crc32c_test.cc
- db/db_test.cc
- db/dbformat_test.cc
- util/env_test.cc
- db/log_test.cc
- table/table_test.cc
- db/skiplist_test.cc
- db/version_edit_test.cc
- db/version_set_test.cc
- db/write_batch_test.cc)
-endif()
-# TODO: memenv_test
diff -ruN minetest-db_backends/src/leveldb/db/builder.cc minetest-digging_animation/src/leveldb/db/builder.cc
--- minetest-db_backends/src/leveldb/db/builder.cc 2012-10-29 00:33:00.000000000 +0100
+++ minetest-digging_animation/src/leveldb/db/builder.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,88 +0,0 @@
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-
-#include "db/builder.h"
-
-#include "db/filename.h"
-#include "db/dbformat.h"
-#include "db/table_cache.h"
-#include "db/version_edit.h"
-#include "leveldb/db.h"
-#include "leveldb/env.h"
-#include "leveldb/iterator.h"
-
-namespace leveldb {
-
-Status BuildTable(const std::string& dbname,
- Env* env,
- const Options& options,
- TableCache* table_cache,
- Iterator* iter,
- FileMetaData* meta) {
- Status s;