Anthony Thibault
7777f3edd0
Added OutOfRangeDataStrategy parameter to Controller Settings
...
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.
* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results. This is the default.
2018-10-09 10:51:02 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates
...
update soft entities and fix deadlock from qml.
2018-10-04 13:33:34 -07:00
Dante Ruiz
613a6ab8cd
removing unneeded code
2018-10-04 12:18:18 -07:00
Dante Ruiz
676293c880
trying another fix
2018-10-03 16:19:47 -07:00
Dante Ruiz
5734c24af4
another PR fix
2018-10-03 13:52:40 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586
...
Teleport with play area
2018-10-03 11:02:33 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery
...
Fix MS18608: Use new connections api endpoint
2018-10-03 09:04:58 -07:00
Brad Davis
ffbb144a7c
Fix avatar thumbnails
2018-10-02 16:31:24 -07:00
Dante Ruiz
182c92b951
fix mac issue
2018-10-02 11:24:09 -07:00
David Rowe
f7fd76b316
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2
...
Account-managed wallet flow improvements
2018-10-01 16:43:01 -07:00
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1
...
Fix some Mac rendering issues
2018-10-01 16:35:57 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061
...
use current wearable index, not joint index!
2018-10-01 16:14:33 -07:00
David Rowe
6ccd73ea47
Merge branch 'master' into M18586
2018-10-02 10:17:24 +13:00
Dante Ruiz
ad92b172cb
removing comment
2018-10-01 09:47:07 -07:00
Dante Ruiz
31baa46ee0
merging from master
2018-10-01 09:44:54 -07:00
Zach Fox
59eabbbb5d
Fix MS18608: Use new connections api endpoint
2018-09-28 14:28:50 -07:00
Kerry Ivan Kurian
440e2062f5
Fix application uninstall in marketplace item tester
2018-09-27 22:14:02 -07:00
David Rowe
545c2591e3
Merge branch 'master' into M18586
2018-09-28 16:19:44 +12:00
David Rowe
868a3a9219
Tweak vertical spacing
2018-09-28 15:42:48 +12:00
Bradley Austin Davis
3dea4fd10a
Fix some Mac rendering issues
2018-09-27 19:21:50 -07:00
David Rowe
4813f4d042
Show/hide jumping & flying checkbox depending on movement mode
2018-09-28 13:02:27 +12:00
Howard Stearns
75de305ec3
remove dead code
2018-09-27 16:37:07 -07:00
Howard Stearns
7616639a40
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-27 16:12:21 -07:00
Dante Ruiz
c1c853790b
update soft entities and fix deadlock
2018-09-27 14:53:28 -07:00
David Rowe
5ab22a1f40
Change play area option text for Oculus
2018-09-27 17:07:42 +12:00
Howard Stearns
da5f77afcd
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-26 15:26:52 -07:00
Zach Fox
6a3fa28fad
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
2018-09-26 15:12:04 -07:00
Howard Stearns
e1659ed520
fix old bad merge, and if told referrer while already setup, follow
...
immediately
2018-09-26 14:57:47 -07:00
Kerry Ivan Kurian
276125937c
Eliminate double equals
2018-09-25 15:18:12 -07:00
Kerry Ivan Kurian
4e7b03883f
Use triple equals
2018-09-25 15:13:26 -07:00
Kerry Ivan Kurian
ff83713365
Use persistent object id counter
2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830
Implement delete-from-list functionality in marketplace item tester
2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841
Resolve merge conflicts
2018-09-25 00:57:43 -07:00
Kerry Ivan Kurian
0a43c17ce0
Use entity-specific glyphs in marketplace item tester
2018-09-24 21:15:08 -07:00
Kerry Ivan Kurian
697f556a60
Persist list of marketplace items in test
...
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
2018-09-24 16:30:49 -07:00
Kerry Ivan Kurian
f9c25f2f32
Allow user to select asset type in marketplace item tester
2018-09-20 16:36:06 -07:00
Kerry Ivan Kurian
c1cc031bd0
Remove cruft and refactor
2018-09-20 14:50:27 -07:00
Kerry Ivan Kurian
ae4352f450
Rez entity in marketplace item tester
2018-09-20 13:55:22 -07:00
Kerry Ivan Kurian
afa8e44e66
Refactor
2018-09-20 10:53:32 -07:00
Howard Stearns
391128ef77
Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2
2018-09-19 16:46:09 -07:00
Zach Fox
ed84b49ece
Small bugfixes and using original endpoints
2018-09-19 16:15:59 -07:00
Kerry Ivan Kurian
5445d6f670
Switch to localhost before replacing content
2018-09-19 16:06:43 -07:00
Howard Stearns
d644a63990
consistent/usefull checkout flow when you don't have enough money.
2018-09-19 16:00:40 -07:00
Kerry Ivan Kurian
38fd9523ee
Attempt to load content set
...
This does not result in the user seeing the content set.
2018-09-19 15:57:29 -07:00
Kerry Ivan Kurian
5bc7d944f9
Remove whitespace
2018-09-19 15:17:13 -07:00
Alexander Ivash
e5b7b7f12a
FB18061 - Avatar favorites cannot be moved to a different joint - At Save the wearable jumps to the original joint
2018-09-19 23:07:21 +03:00
Zach Fox
55a0f77697
Notifications for MARKET
2018-09-18 14:45:14 -07:00
Kerry Ivan Kurian
cfa9d185f0
Add full resource paths to list in marketplace item tester
2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian
a592565b7b
Enable marketplace item test for avatar file
2018-09-18 13:25:01 -07:00
