Merge branch 'master' of https://github.com/urho3d/Urho3D

.travis.yml

@@ -26,14 +26,16 @@ env:
     - secure: AfoHc5tpnYoI2TVGUeE9Xdru+15pd5N4YzO7EWvwmMnrHtNO3retrmKOGpnIyfbP2BeWRTW/z+BI4G0RrfvubjHu2us4wRh6Jq8+UZohBBkM+ldTnyqYHX97q+6ScWBWZGg7dpthd1x/7fmds8dSRzustHUhI7RzPbWEMQH1DGI=
     - DISPLAY=:99.0
   matrix:
-    - WINDOWS=1 ENABLE_64BIT=1 URHO3D_LIB_TYPE=STATIC
-    - WINDOWS=1 ENABLE_64BIT=1 URHO3D_LIB_TYPE=SHARED
-    - LINUX=1   ENABLE_64BIT=1 URHO3D_LIB_TYPE=STATIC SITE_UPDATE=1
-    - LINUX=1   ENABLE_64BIT=1 URHO3D_LIB_TYPE=SHARED
-    - LINUX=1                  URHO3D_LIB_TYPE=STATIC
-    - LINUX=1                  URHO3D_LIB_TYPE=SHARED
-    - ANDROID=1                URHO3D_LIB_TYPE=STATIC
-    - ANDROID=1                URHO3D_LIB_TYPE=SHARED
+    - WINDOWS=1 ARCH=x86_64 ENABLE_64BIT=1 URHO3D_LIB_TYPE=STATIC
+    - WINDOWS=1 ARCH=x86_64 ENABLE_64BIT=1 URHO3D_LIB_TYPE=SHARED
+    - LINUX=1               ENABLE_64BIT=1 URHO3D_LIB_TYPE=STATIC SITE_UPDATE=1
+    - LINUX=1               ENABLE_64BIT=1 URHO3D_LIB_TYPE=SHARED
+    - WINDOWS=1 ARCH=i686                  URHO3D_LIB_TYPE=STATIC
+    - WINDOWS=1 ARCH=i686                  URHO3D_LIB_TYPE=SHARED
+    - LINUX=1                              URHO3D_LIB_TYPE=STATIC
+    - LINUX=1                              URHO3D_LIB_TYPE=SHARED
+    - ANDROID=1                            URHO3D_LIB_TYPE=STATIC
+    - ANDROID=1                            URHO3D_LIB_TYPE=SHARED
 #matrix:
 #  fast_finish: true
 #  allow_failures:
@@ -42,16 +44,15 @@ language: cpp
 compiler: gcc
 before_install:
     - bash -c "[ '$TRAVIS_BRANCH' == 'master' ] && [ '$TRAVIS_PULL_REQUEST' == 'false' ]" && export ON_MASTER_COMMIT=1 && bash -c "[ $SITE_UPDATE ]" && export SITE_UPDATE_ON_MASTER_COMMIT=1 || true
-    - bash -c "[ $ON_MASTER_COMMIT ]" && export COMMIT_MESSAGE=$(git log --format=%B -n 1 $TRAVIS_COMMIT) && echo $COMMIT_MESSAGE |grep -cq '\[ci package\]' && git pull --depth=2000 origin $TRAVIS_BRANCH && git checkout -qf $TRAVIS_COMMIT && export PACKAGE_UPLOAD=1 || true
+    - bash -c "[ $ON_MASTER_COMMIT ]" && export COMMIT_MESSAGE=$(git log --format=%B -n 1 $TRAVIS_COMMIT) && echo $COMMIT_MESSAGE |grep -cq '\[ci package\]' && git fetch --depth=2000 --tags origin $TRAVIS_BRANCH && export PACKAGE_UPLOAD=1 || true
     - bash -c "[ $ANDROID ]" && wget -q http://dl.google.com/android/ndk/android-ndk-r9c-linux-x86_64.tar.bz2 && tar xjf *.bz2 && rm *.bz2 && ln -s android-ndk* android-ndk && export ANDROID_NDK=$(pwd)/android-ndk || true
     - bash -c "( [ $SITE_UPDATE_ON_MASTER_COMMIT ] || [ $PACKAGE_UPLOAD ] )" && sudo add-apt-repository ppa:george-edison55/precise-backports -y || true
     - sudo apt-get update -q -y
 install:
     - sudo apt-get install -q -y --no-install-recommends libasound2-dev
-    - rvm gemset use global && travis_retry gem install rake
     - bash -c "[ x$ENABLE_64BIT == 'x' ]" && sudo apt-get remove -q -y gvfs-daemons && sudo apt-get install -q -y libxrandr-dev:i386 libgl1-mesa-dev:i386 libxext-dev:i386 libxrender-dev:i386 g++-multilib && export CMAKE_PREFIX_PATH=/usr/lib/i386-linux-gnu || true
     - bash -c "( [ $SITE_UPDATE_ON_MASTER_COMMIT ] || [ $PACKAGE_UPLOAD ] )" && sudo apt-get install -q -y --no-install-recommends doxygen graphviz || true
-    - bash -c "[ $WINDOWS ]" && sudo apt-get install -q -y gcc-mingw-w64 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 binutils-mingw-w64 binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 && export MINGW_PREFIX=/usr/bin/x86_64-w64 MINGW_ROOT=/usr/x86_64-w64-mingw32 || true
+    - bash -c "[ $WINDOWS ]" && sudo apt-get install -q -y gcc-mingw-w64 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 binutils-mingw-w64 binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 && export MINGW_PREFIX=/usr/bin/${ARCH}-w64 MINGW_ROOT=/usr/${ARCH}-w64-mingw32 || true
     - bash -c "[ $LINUX ] && [ $PACKAGE_UPLOAD ]" && sudo apt-get install -q -y rpm || true
     - bash -e /etc/init.d/xvfb start
 script: rake travis_ci

Docs/LuaScriptAPI.dox

@@ -4816,7 +4816,6 @@ Methods:
 - Vector3 operator*(const Vector3& rhs) const
 - Vector3 operator/(float rhs) const
 - Vector3 operator/(const Vector3& rhs) const
-- Vector3 operator/(const Vector3& rhs) const
 - void Normalize()
 - float Length() const
 - float LengthSquared() const

Rakefile

@@ -83,7 +83,7 @@ end
 # Usage: NOT intended to be used manually (if you insist then try: GIT_NAME=... GIT_EMAIL=... GH_TOKEN=... rake travis_ci_rebase)
 desc 'Rebase OSX-CI mirror branch'
 task :travis_ci_rebase do
-  system "git config user.name '#{ENV['GIT_NAME']}' && git config user.email '#{ENV['GIT_EMAIL']}' && git remote set-url --push origin https://#{ENV['GH_TOKEN']}@github.com/urho3d/Urho3D.git && git fetch origin OSX-CI:OSX-CI && git rebase origin/master OSX-CI && git push -qf -u origin OSX-CI >/dev/null 2>&1" or abort 'Failed to rebase OSX-CI mirror branch'
+  system "git config user.name '#{ENV['GIT_NAME']}' && git config user.email '#{ENV['GIT_EMAIL']}' && git remote set-url --push origin https://#{ENV['GH_TOKEN']}@github.com/#{ENV['TRAVIS_REPO_SLUG']}.git && git fetch origin OSX-CI:OSX-CI && git rebase origin/master OSX-CI && git push -qf -u origin OSX-CI >/dev/null 2>&1" or abort 'Failed to rebase OSX-CI mirror branch'
 end
 
 # Usage: NOT intended to be used manually (if you insist then try: rake travis_ci_package_upload)

Source/Engine/LuaScript/pkgs/Math/Vector3.pkg

@@ -16,7 +16,6 @@ class Vector3
     Vector3 operator * (const Vector3& rhs) const;
     Vector3 operator / (float rhs) const;
     Vector3 operator / (const Vector3& rhs) const;
-    Vector3 operator / (const Vector3& rhs) const;
     void Normalize();
     float Length() const;
     float LengthSquared() const;

Source/Engine/Urho2D/CMakeLists.txt

@@ -22,6 +22,3 @@
 
 # Define source files
 define_source_files (PARENT_SCOPE)
-
-# Define dependency libs
-set (ENGINE_INCLUDE_DIRS_ONLY ${ENGINE_INCLUDE_DIRS_ONLY} PARENT_SCOPE)

Source/Engine/Urho2D/ParticleEmitter2D.cpp

@@ -87,7 +87,7 @@ void ParticleEmitter2D::Update(const FrameInfo& frame)
     float timeStep = frame.timeStep_;
     float worldScale = GetNode()->GetWorldScale().x_;
 
-    int particleIndex = 0;
+    unsigned particleIndex = 0;
     while (particleIndex < numParticles_)
     {
         Particle2D& currentParticle = particles_[particleIndex];
@@ -213,7 +213,7 @@ void ParticleEmitter2D::UpdateVertices()
     vertex2.uv_ = Vector2(1.0f, 0.0f);
     vertex3.uv_ = Vector2(1.0f, 1.0f);
 
-    for (int i = 0; i < numParticles_; ++i)
+    for (unsigned i = 0; i < numParticles_; ++i)
     {
         Particle2D& p = particles_[i];
 
@@ -344,4 +344,4 @@ void ParticleEmitter2D::UpdateParticle(Particle2D& particle, float timeStep, flo
     particle.color_.a_ += particle.colorDelta_.a_ * timeStep;
 }
 
-}
+}

Source/Samples/CMakeLists.txt

@@ -62,4 +62,4 @@ if (ENABLE_LUA)
 endif ()
 add_subdirectory (23_Water)
 add_subdirectory (24_Urho2DSprite)
-add_subdirectory (25_Urho2DParticle)
+add_subdirectory (25_Urho2DParticle)