Merge branch 'master' of github.com:urho3d/Urho3D into p2p-multiplayer

CMakeLists.txt

@@ -140,9 +140,6 @@ elseif (CPACK_SYSTEM_NAME STREQUAL Linux)
             endif ()
         endif ()
     endif ()
-    # Note to package maintainer: comment out below line to revert the prefix from '/usr/local' (default for CMAKE_INSTALL_PREFIX) to '/usr' (default for CPACK_PACKAGING_INSTALL_PREFIX)
-    # Revisit this later, some users insist it should be '/usr' (see https://github.com/urho3d/Urho3D/issues/2166), even though clearly we are not trying to build "system package" here
-    set (CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 endif ()
 if (URHO3D_64BIT)
     set (CPACK_SYSTEM_NAME ${CPACK_SYSTEM_NAME}-64bit)

Docs/GettingStarted.dox

@@ -798,7 +798,7 @@ The third-party libraries used by Urho3D and their purposes are:
 - Civetweb: HTTP requests, use could be expanded to also provide an embedded web server
 - FreeType: font rendering
 - GLEW: OpenGL extensions handling
-- kNet: UDP networking
+- SLikeNet: UDP networking
 - libcpuid: CPU properties detection
 - Lua, LuaJIT, tolua+: Lua scripting implementation and bindings
 - LZ4: data compression for package files

README.md

@@ -190,7 +190,7 @@ Urho3D uses the following third-party libraries:
 - Civetweb 1.7 (https://github.com/civetweb/civetweb)
 - FreeType 2.8 (https://www.freetype.org)
 - GLEW 1.13.0 (http://glew.sourceforge.net)
-- kNet (https://github.com/juj/kNet)
+- SLikeNet (https://github.com/SLikeSoft/SLikeNet)
 - libcpuid 0.4.0+ (https://github.com/anrieff/libcpuid)
 - Lua 5.1 (https://www.lua.org)
 - LuaJIT 2.1.0+ (http://www.luajit.org)

Rakefile

@@ -436,6 +436,8 @@ task :ci_site_update do
   end
   # Generate and sync doxygen pages
   system "cd #{build_tree} && make -j$numjobs doc >/dev/null 2>&1 && ruby -i -pe 'gsub(/(<\\/?h)3([^>]*?>)/, %q{\\14\\2}); gsub(/(<\\/?h)2([^>]*?>)/, %q{\\13\\2}); gsub(/(<\\/?h)1([^>]*?>)/, %q{\\12\\2})' Docs/html/_*.html && rsync -a --delete Docs/html/ ~/urho3d.github.io/documentation/#{release}" or abort 'Failed to generate/rsync doxygen pages'
+  # TODO: remove below workaround after upgrading to 1.8.14 or greater
+  system "cp ~/urho3d.github.io/documentation/1.7/dynsections.js ~/urho3d.github.io/documentation/#{release}" or abort 'Failed to workaround Doxygen 1.8.13 bug'
   # Supply GIT credentials to push site documentation changes to urho3d/urho3d.github.io.git
   system "cd ~/urho3d.github.io && git config user.name $GIT_NAME && git config user.email $GIT_EMAIL && git remote set-url --push origin https://[email protected]/urho3d/urho3d.github.io.git && git add -A . && if git commit -qm \"Travis CI: site documentation update at #{Time.now.utc}.\n\nCommit: https://github.com/$TRAVIS_REPO_SLUG/commit/$TRAVIS_COMMIT\n\nMessage: $COMMIT_MESSAGE\"; then git push -q >/dev/null 2>&1 && echo Site updated successfully; fi" or abort 'Failed to update site'
   next if timeup

Source/ThirdParty/SQLite/CMakeLists.txt

@@ -50,7 +50,7 @@ install_header_files (DIRECTORY src/ DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty/
 # Setup additional SQLite CLI standalone target (this target can be transfered and executed on an embedded device, such as Raspberry Pi and Android)
 if (NOT IOS AND NOT TVOS AND NOT WEB)
     # Define target name for SQLite shell
-    set (TARGET_NAME isql)
+    set (TARGET_NAME sqlite3)
 
     # Define source files
     set (SOURCE_FILES src/shell.c src/sqlite3.c src/sqlite3.h)

Source/Urho3D/Network/Connection.h

@@ -113,7 +113,7 @@ class URHO3D_API Connection : public Object
     URHO3D_OBJECT(Connection, Object);
 
 public:
-    /// Construct with context and kNet message connection pointers.
+    /// Construct with context, RakNet connection address and Raknet peer pointer.
     Connection(Context* context, bool isClient, const SLNet::AddressOrGUID& address, SLNet::RakPeerInterface* peer);
     /// Destruct.
     ~Connection() override;

Source/Urho3D/Network/Network.h

@@ -147,7 +147,7 @@ public:
     /// Return simulated packet loss probability.
     float GetSimulatedPacketLoss() const { return simulatedPacketLoss_; }
 
-    /// Return a client or server connection by kNet MessageConnection, or null if none exist.
+    /// Return a client or server connection by RakNet connection address, or null if none exist.
     Connection* GetConnection(const SLNet::AddressOrGUID& connection) const;
     /// Return a client or server connection by kNet MessageConnection, or null if none exist.
     Connection* GetClientConnection(const SLNet::AddressOrGUID& connection) const;