Merge branch 'feature/community-1.8' into develop

Conflicts:
	util/pito.lua
	xcode/ios/moai-ios.xcodeproj/project.pbxproj
	xcode/ios/moai-ios.xcodeproj/xcshareddata/xcschemes/moai-ios.xcscheme
	xcode/libmoai/libmoai.xcodeproj/project.pbxproj
	xcode/libmoai/libmoai.xcodeproj/xcshareddata/xcschemes/libmoai-ios-all.xcscheme
	xcode/libmoai/libmoai.xcodeproj/xcshareddata/xcschemes/libmoai-osx-all.xcscheme
	xcode/osx-static/moai-osx-static.xcodeproj/xcshareddata/xcschemes/moai-osx-static.xcscheme
	xcode/osx/moai-osx.xcodeproj/xcshareddata/xcschemes/moai-osx.xcscheme

.gitignore

@@ -1,48 +1,52 @@
-
-bin/
-obj/
-libs/
-lib/
-util/libmoai
-
-Thumbs.db
-.DS_Store
-/vs2010/ipch
-/vs2010/bin
-/vs2008/bin
-
-/ide/bin
-/ide/obj
-
-/src/config
-
-/build/
-xcuserdata/
-DerivedData/
-*.pbxuser
-*.perspectivev3
-
-# Artifacts when building with CMake
-flascc/build
-/src/moai/moai
-tmp
-
-# Produced by test runner
-test/xml-results
-.idea
-cmake/projects/
-
-# Build and release products
-cmake/build/
-release/
-
-bin/api-reference-parser/vendor
-docs/api-reference
-/moai-sdk/
-/bin/env-local.bat
-/util/moai
-/**/java/build/
-/**/java/*.iml
-env.sh
-sample-browser/
-util/build-sample-browser/temprom/
+/bin/
+/build/
+/lib/
+
+libs/
+obj/
+util/libmoai
+
+Thumbs.db
+.DS_Store
+/vs2010/ipch
+/vs2010/bin
+/vs2008/bin
+
+/ide/bin
+/ide/obj
+
+/src/config
+
+/build/
+xcuserdata/
+DerivedData/
+*.pbxuser
+*.perspectivev3
+
+# Artifacts when building with CMake
+flascc/build
+/src/moai/moai
+tmp
+
+# Produced by test runner
+test/xml-results
+.idea
+cmake/projects/
+
+# Build and release products
+cmake/build/
+release/
+
+bin/api-reference-parser/vendor
+docs/api-reference
+/moai-sdk/
+/bin/env-local.bat
+/bin/win32/
+/bin/x64/
+/util/moai
+/**/java/build/
+/**/java/*.iml
+env.sh
+sample-browser/
+util/build-sample-browser/temprom/
+moai-osx-static.xcscmblueprint

.gitmodules

@@ -1,3 +1,12 @@
 [submodule "3rdparty/civetweb"]
 	path = 3rdparty/civetweb
 	url = https://github.com/civetweb/civetweb.git
+[submodule "3rdparty/kissfft"]
+	path = 3rdparty/kissfft
+	url = https://github.com/itdaniher/kissfft.git
+[submodule "3rdparty/mbedtls"]
+	path = 3rdparty/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
+[submodule "3rdparty/curl"]
+	path = 3rdparty/curl
+	url = https://github.com/curl/curl

3rdparty-android/deltadna-v3.3.6/manifest_permissions.xml

@@ -0,0 +1,5 @@
+<!-- DeltaDNA -->
+<uses-permission android:name="android.permission.INTERNET"/>
+<uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE"/>
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

3rdparty/LICENSE

@@ -7,6 +7,7 @@ glew 1.5.6
 ISO8601DateFormatter.m, .h
 jansson 2.1
 jpeg-8c
+kissfft
 libogg 1.2.2
 libvorbis 1.3.2
 libpng 1.4.0
@@ -400,6 +401,37 @@ We are required to state that
     CompuServe Incorporated.  GIF(sm) is a Service Mark property of
     CompuServe Incorporated."
 
+----------------------------------------------------------------
+kissfft
+----------------------------------------------------------------
+Copyright (c) 2003-2010 Mark Borgerding
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+* Neither the author nor the names of any contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ----------------------------------------------------------------
 libogg 1.2.2
 ----------------------------------------------------------------

3rdparty/c-ares-1.7.5/ares_init.c

@@ -962,11 +962,16 @@ DhcpNameServer
   status = ARES_EOF;
 
 #elif defined(ANDROID)
-  char value[PROP_VALUE_MAX]="";
-  __system_property_get("net.dns1", value);
-  status = config_nameserver(&servers, &nservers, value);
-  if (status == ARES_SUCCESS)
+  #if defined(__arm64__) || defined(__LP64__)
+
     status = ARES_EOF;
+  #else
+    char value[PROP_VALUE_MAX]="";
+    __system_property_get("net.dns1", value);
+    status = config_nameserver(&servers, &nservers, value);
+    if (status == ARES_SUCCESS)
+      status = ARES_EOF;
+  #endif
 #else
   {
     char *p;

3rdparty/c-ares-1.7.5/include-android/ares_build.h

@@ -95,10 +95,10 @@
 #ifdef CARES_PULL_SYS_SOCKET_H
 #  include <sys/socket.h>
 #endif
-
 /* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
+#define CARES_SIZEOF_LONG sizeof(long)
 
+
 /* Integral data type used for ares_socklen_t. */
 #define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t