From f60ffcc96781c18bf0ddd13fa2895f8ce85ade9b Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sun, 27 Nov 2016 14:32:21 -0500 Subject: [PATCH] upload_native: final check --- jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp | 2 +- private/upload_native.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp b/jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp index 27fde5bfe..8561d1fd2 100644 --- a/jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp +++ b/jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp @@ -100,7 +100,7 @@ void jmePhysicsSpace::createPhysicsSpace(jfloat minX, jfloat minY, jfloat minZ, dynamicsWorld->setWorldUserInfo(this); broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(new btGhostPairCallback()); - dynamicsWorld->setGravity(btVector3(0, -9.81f, 0)); + dynamicsWorld->setGravity(btVector3(0, -9.85f, 0)); struct jmeFilterCallback : public btOverlapFilterCallback { // return true when pairs need collision diff --git a/private/upload_native.sh b/private/upload_native.sh index 9819063a2..d31a5e5f0 100755 --- a/private/upload_native.sh +++ b/private/upload_native.sh @@ -1,7 +1,7 @@ #!/bin/bash set -euo pipefail -# NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)" -# if [ "$NATIVE_CHANGES" != "" ]; then +NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)" +if [ "$NATIVE_CHANGES" != "" ]; then git config --global user.email "travis-ci" git config --global user.name "travis-ci" ./gradlew -PbuildNativeProjects=true :jme3-bullet-native:assemble @@ -13,4 +13,4 @@ set -euo pipefail git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives" git pull -q --rebase git push git@github.com:jMonkeyEngine/jmonkeyengine.git -# fi +fi