Merge 0.4.16 into stable-0.4

1 files changed, 54 insertions, 35 deletions

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index c2186efaf..7b741e04b 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -98,8 +98,8 @@ endif
 LOCAL_C_INCLUDES := \
 		jni/src                                   \
 		jni/src/script                            \
-		jni/src/lua/src                           \
-		jni/src/jsoncpp                           \
+		jni/lib/lua/src                           \
+		jni/lib/jsoncpp                           \
 		jni/src/cguittfont                        \
 		deps/irrlicht/include                     \
 		deps/libiconv/include                     \
@@ -117,6 +117,7 @@ LOCAL_SRC_FILES := \
 		jni/src/cavegen.cpp                       \
 		jni/src/chat.cpp                          \
 		jni/src/client.cpp                        \
+		jni/src/clientenvironment.cpp             \
 		jni/src/clientiface.cpp                   \
 		jni/src/clientmap.cpp                     \
 		jni/src/clientmedia.cpp                   \
@@ -133,6 +134,7 @@ LOCAL_SRC_FILES := \
 		jni/src/convert_json.cpp                  \
 		jni/src/craftdef.cpp                      \
 		jni/src/database-dummy.cpp                \
+		jni/src/database-files.cpp                \
 		jni/src/database-sqlite3.cpp              \
 		jni/src/database.cpp                      \
 		jni/src/debug.cpp                         \
@@ -141,6 +143,7 @@ LOCAL_SRC_FILES := \
 		jni/src/dungeongen.cpp                    \
 		jni/src/emerge.cpp                        \
 		jni/src/environment.cpp                   \
+		jni/src/face_position_cache.cpp           \
 		jni/src/filecache.cpp                     \
 		jni/src/filesys.cpp                       \
 		jni/src/fontengine.cpp                    \
@@ -163,6 +166,7 @@ LOCAL_SRC_FILES := \
 		jni/src/inventory.cpp                     \
 		jni/src/inventorymanager.cpp              \
 		jni/src/itemdef.cpp                       \
+		jni/src/itemstackmetadata.cpp             \
 		jni/src/keycode.cpp                       \
 		jni/src/light.cpp                         \
 		jni/src/localplayer.cpp                   \
@@ -183,6 +187,8 @@ LOCAL_SRC_FILES := \
 		jni/src/mapnode.cpp                       \
 		jni/src/mapsector.cpp                     \
 		jni/src/mesh.cpp                          \
+		jni/src/mesh_generator_thread.cpp         \
+		jni/src/metadata.cpp                      \
 		jni/src/mg_biome.cpp                      \
 		jni/src/mg_decoration.cpp                 \
 		jni/src/mg_ore.cpp                        \
@@ -203,12 +209,14 @@ LOCAL_SRC_FILES := \
 		jni/src/porting.cpp                       \
 		jni/src/profiler.cpp                      \
 		jni/src/quicktune.cpp                     \
+		jni/src/raycast.cpp                       \
 		jni/src/reflowscan.cpp                    \
 		jni/src/remoteplayer.cpp                  \
 		jni/src/rollback.cpp                      \
 		jni/src/rollback_interface.cpp            \
 		jni/src/serialization.cpp                 \
 		jni/src/server.cpp                        \
+		jni/src/serverenvironment.cpp             \
 		jni/src/serverlist.cpp                    \
 		jni/src/serverobject.cpp                  \
 		jni/src/shader.cpp                        \
@@ -218,6 +226,7 @@ LOCAL_SRC_FILES := \
 		jni/src/sound_openal.cpp                  \
 		jni/src/staticobject.cpp                  \
 		jni/src/subgame.cpp                       \
+		jni/src/tileanimation.cpp                 \
 		jni/src/tool.cpp                          \
 		jni/src/treegen.cpp                       \
 		jni/src/version.cpp                       \
@@ -261,6 +270,7 @@ LOCAL_SRC_FILES := \
 		jni/src/settings.cpp                      \
 		jni/src/wieldmesh.cpp                     \
 		jni/src/client/clientlauncher.cpp         \
+		jni/src/client/inputhandler.cpp           \
 		jni/src/client/tile.cpp                   \
 		jni/src/client/joystick_controller.cpp    \
 		jni/src/irrlicht_changes/static_text.cpp
@@ -284,6 +294,7 @@ LOCAL_SRC_FILES += \
 		jni/src/script/common/c_types.cpp         \
 		jni/src/script/cpp_api/s_async.cpp        \
 		jni/src/script/cpp_api/s_base.cpp         \
+		jni/src/script/cpp_api/s_client.cpp       \
 		jni/src/script/cpp_api/s_entity.cpp       \
 		jni/src/script/cpp_api/s_env.cpp          \
 		jni/src/script/cpp_api/s_inventory.cpp    \
@@ -296,12 +307,18 @@ LOCAL_SRC_FILES += \
 		jni/src/script/cpp_api/s_server.cpp       \
 		jni/src/script/lua_api/l_areastore.cpp    \
 		jni/src/script/lua_api/l_base.cpp         \
+		jni/src/script/lua_api/l_camera.cpp       \
+		jni/src/script/lua_api/l_client.cpp       \
 		jni/src/script/lua_api/l_craft.cpp        \
 		jni/src/script/lua_api/l_env.cpp          \
 		jni/src/script/lua_api/l_inventory.cpp    \
 		jni/src/script/lua_api/l_item.cpp         \
+		jni/src/script/lua_api/l_itemstackmeta.cpp\
+		jni/src/script/lua_api/l_localplayer.cpp  \
 		jni/src/script/lua_api/l_mainmenu.cpp     \
 		jni/src/script/lua_api/l_mapgen.cpp       \
+		jni/src/script/lua_api/l_metadata.cpp     \
+		jni/src/script/lua_api/l_minimap.cpp      \
 		jni/src/script/lua_api/l_nodemeta.cpp     \
 		jni/src/script/lua_api/l_nodetimer.cpp    \
 		jni/src/script/lua_api/l_noise.cpp        \
@@ -310,10 +327,13 @@ LOCAL_SRC_FILES += \
 		jni/src/script/lua_api/l_rollback.cpp     \
 		jni/src/script/lua_api/l_server.cpp       \
 		jni/src/script/lua_api/l_settings.cpp     \
+		jni/src/script/lua_api/l_sound.cpp        \
 		jni/src/script/lua_api/l_http.cpp         \
+		jni/src/script/lua_api/l_storage.cpp      \
 		jni/src/script/lua_api/l_util.cpp         \
 		jni/src/script/lua_api/l_vmanip.cpp       \
-		jni/src/script/scripting_game.cpp         \
+		jni/src/script/scripting_client.cpp       \
+		jni/src/script/scripting_server.cpp       \
 		jni/src/script/scripting_mainmenu.cpp
 
 #freetype2 support
@@ -321,36 +341,36 @@ LOCAL_SRC_FILES += jni/src/cguittfont/xCGUITTFont.cpp
 
 # Lua
 LOCAL_SRC_FILES += \
-		jni/src/lua/src/lapi.c                    \
-		jni/src/lua/src/lauxlib.c                 \
-		jni/src/lua/src/lbaselib.c                \
-		jni/src/lua/src/lcode.c                   \
-		jni/src/lua/src/ldblib.c                  \
-		jni/src/lua/src/ldebug.c                  \
-		jni/src/lua/src/ldo.c                     \
-		jni/src/lua/src/ldump.c                   \
-		jni/src/lua/src/lfunc.c                   \
-		jni/src/lua/src/lgc.c                     \
-		jni/src/lua/src/linit.c                   \
-		jni/src/lua/src/liolib.c                  \
-		jni/src/lua/src/llex.c                    \
-		jni/src/lua/src/lmathlib.c                \
-		jni/src/lua/src/lmem.c                    \
-		jni/src/lua/src/loadlib.c                 \
-		jni/src/lua/src/lobject.c                 \
-		jni/src/lua/src/lopcodes.c                \
-		jni/src/lua/src/loslib.c                  \
-		jni/src/lua/src/lparser.c                 \
-		jni/src/lua/src/lstate.c                  \
-		jni/src/lua/src/lstring.c                 \
-		jni/src/lua/src/lstrlib.c                 \
-		jni/src/lua/src/ltable.c                  \
-		jni/src/lua/src/ltablib.c                 \
-		jni/src/lua/src/ltm.c                     \
-		jni/src/lua/src/lundump.c                 \
-		jni/src/lua/src/lvm.c                     \
-		jni/src/lua/src/lzio.c                    \
-		jni/src/lua/src/print.c
+		jni/lib/lua/src/lapi.c                    \
+		jni/lib/lua/src/lauxlib.c                 \
+		jni/lib/lua/src/lbaselib.c                \
+		jni/lib/lua/src/lcode.c                   \
+		jni/lib/lua/src/ldblib.c                  \
+		jni/lib/lua/src/ldebug.c                  \
+		jni/lib/lua/src/ldo.c                     \
+		jni/lib/lua/src/ldump.c                   \
+		jni/lib/lua/src/lfunc.c                   \
+		jni/lib/lua/src/lgc.c                     \
+		jni/lib/lua/src/linit.c                   \
+		jni/lib/lua/src/liolib.c                  \
+		jni/lib/lua/src/llex.c                    \
+		jni/lib/lua/src/lmathlib.c                \
+		jni/lib/lua/src/lmem.c                    \
+		jni/lib/lua/src/loadlib.c                 \
+		jni/lib/lua/src/lobject.c                 \
+		jni/lib/lua/src/lopcodes.c                \
+		jni/lib/lua/src/loslib.c                  \
+		jni/lib/lua/src/lparser.c                 \
+		jni/lib/lua/src/lstate.c                  \
+		jni/lib/lua/src/lstring.c                 \
+		jni/lib/lua/src/lstrlib.c                 \
+		jni/lib/lua/src/ltable.c                  \
+		jni/lib/lua/src/ltablib.c                 \
+		jni/lib/lua/src/ltm.c                     \
+		jni/lib/lua/src/lundump.c                 \
+		jni/lib/lua/src/lvm.c                     \
+		jni/lib/lua/src/lzio.c                    \
+		jni/lib/lua/src/print.c
 
 # SQLite3
 LOCAL_SRC_FILES += deps/sqlite/sqlite3.c
@@ -363,7 +383,7 @@ LOCAL_SRC_FILES += \
 		jni/src/threading/thread.cpp
 
 # JSONCPP
-LOCAL_SRC_FILES += jni/src/jsoncpp/json/jsoncpp.cpp
+LOCAL_SRC_FILES += jni/lib/jsoncpp/jsoncpp.cpp
 
 LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp
 LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)
@@ -380,4 +400,3 @@ ifdef GPROF
 $(call import-module,android-ndk-profiler)
 endif
 $(call import-module,android/native_app_glue)
-