From dafd97b6f495e7a3fdedbe970a0d6434b19edd3f Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Thu, 7 Jun 2018 11:47:29 -0700 Subject: [PATCH 01/44] Duplicate domain check-ins after timeouts --- libraries/networking/src/NodeList.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 4920ea97c7..2d3e5e3143 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -419,6 +419,12 @@ void NodeList::sendDomainServerCheckIn() { flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendDSCheckIn); + int outstandingCheckins = _domainHandler.getCheckInPacketsSinceLastReply(); + int checkinCount = outstandingCheckins > 1 ? std::pow(2, outstandingCheckins - 1) : 1; + for (int i = 1; i < checkinCount; ++i) { + auto packetCopy = domainPacket->createCopy(*domainPacket); + sendPacket(std::move(packetCopy), _domainHandler.getSockAddr()); + } sendPacket(std::move(domainPacket), _domainHandler.getSockAddr()); // let the domain handler know we sent another check in or connect packet From fedc0a9e61bd55d83745930ef5b6c4c1c54e0c5f Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Mon, 25 Jun 2018 16:37:03 -0300 Subject: [PATCH 02/44] Support web3d overlays in android --- android/app/src/main/AndroidManifest.xml | 1 + android/app/src/main/cpp/native.cpp | 29 +++++++- .../hifiinterface/InterfaceActivity.java | 34 ++++++--- .../hifiinterface/WebViewActivity.java | 18 +---- .../resources/qml/+android/Web3DOverlay.qml | 36 +++++++++ interface/src/AndroidHelper.cpp | 16 +++- interface/src/AndroidHelper.h | 5 +- .../scripting/WindowScriptingInterface.cpp | 5 ++ scripts/system/+android/clickOverlays.js | 73 +++++++++++++++++++ 9 files changed, 185 insertions(+), 32 deletions(-) create mode 100644 interface/resources/qml/+android/Web3DOverlay.qml create mode 100644 scripts/system/+android/clickOverlays.js diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e763d471cb..cd2c4e7f4f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -29,6 +29,7 @@