Commit graph

63105 commits

Author SHA1 Message Date
John Conklin II
da2c56dbc9
Merge pull request #12139 from hyperlogic/bug-fix/snapshot-app-settings
RC62: Fix for black screen when clicking Settings from Snap app
2018-01-11 09:48:03 -08:00
John Conklin II
7f1a01fb3a
Merge pull request #12134 from hyperlogic/bug-fix/rc62-prevent-wrists-from-entering-body
RC62: Bug fix to prevent wrists entering the avatar's torso.
2018-01-10 17:15:56 -08:00
Anthony J. Thibault
d5e3b97c93 Fix for black screen when clicking Settings from Snap app 2018-01-10 16:03:53 -08:00
John Conklin II
36a76dad2b
Merge pull request #12125 from druiz17/fix-tablet-model
Add adjustments to tablet model and screen offset
2018-01-10 14:55:08 -08:00
John Conklin II
428c8e6737
Merge pull request #12137 from SamGondelman/RC62
Keep requesting render update until textures load (RC62)
2018-01-10 14:54:15 -08:00
SamGondelman
6072780d24 keep requesting render update until textures load
(cherry picked from commit df574c6bc9)
2018-01-10 13:27:19 -08:00
Anthony J. Thibault
250e4032b0 Bug fix to prevent wrists entering the avatar's torso.
This was inadvertently disabled in PR #11978.

(cherry picked from commit ae997928c1)
2018-01-10 12:04:50 -08:00
Dante Ruiz
125eb9ce44 add new tablet model and adjust screen offset 2018-01-09 14:31:57 -08:00
John Conklin II
b1790cccbe
Merge pull request #12113 from druiz17/fix-double-set-tablet-root
Don't call setQmlTabletRoot twice for Web3dOverlays RC62
2018-01-09 12:25:00 -08:00
John Conklin II
fd6c5e72f0
Merge pull request #12119 from luiscuenca/toolbarFix
Fix toolbar is visible on HMD mode
2018-01-09 09:42:19 -08:00
John Conklin II
8d416133b4
Merge pull request #12112 from hyperlogic/bug-fix/oculus-touch-angular-velocity-rc62
RC62 - Oculus Touch: More accurate spin on thrown objects
2018-01-09 09:22:23 -08:00
luiscuenca
9a81410762 refactor 2018-01-08 20:51:15 -07:00
luiscuenca
319913e6af Fix toolbar appears on HMD mode 2018-01-08 20:37:07 -07:00
Dante Ruiz
4cf40554c0 don't call setQmlTabletRoot twice 2018-01-08 16:06:31 -08:00
Anthony J. Thibault
cfa20b6eb3 Oculus Touch: More accurate spin on thrown objects
The internal computation of angular velocity was incorrect.
Apparently, the ovrPoseStatef.AngularRotation is not in sensor frame but local to the controller rotation.

(cherry picked from commit dd0e57026e)
2018-01-08 15:41:59 -08:00
John Conklin II
fab28e7d44
Merge pull request #12106 from SamGondelman/overlayFix
Fix avatar texture loading
2018-01-08 14:01:15 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch
Touch feeling for near grab
2018-01-08 12:50:30 -08:00
SamGondelman
97c0b33975 fix avatar texture loading 2018-01-08 12:50:05 -08:00
John Conklin II
1acd3e17e0
Merge pull request #12104 from druiz17/fix-laser-mess
fix tablet interaction and far grab functionality
2018-01-08 12:43:36 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646
Window JSDoc
2018-01-08 11:53:34 -08:00
Dante Ruiz
fd83e00df4 fix tablet interaction and far grab functionallity 2018-01-08 11:30:21 -08:00
David Rowe
7a971b2d26 Fix typo 2018-01-09 08:17:15 +13:00
Zach Fox
99510f522d
Merge pull request #12095 from ElderOrb/FB10621
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
2018-01-08 10:05:53 -08:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit
Bug fix for sit script.
2018-01-08 09:59:17 -08:00
luiscuenca
50f89182d7 Add Utils.jsc 2018-01-07 18:29:13 -07:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser
Consistent go to user
2018-01-07 11:07:39 -08:00
luiscuenca
8a7c68829d Optimizations, cleanings and globals 2018-01-07 11:56:30 -07:00
David Rowe
673bc7de38 Update Window JSDoc 2018-01-06 16:05:55 +13:00
Anthony Thibault
1a97d1de0f
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter
Added exponential smoothing filter for vive pucks.
2018-01-05 16:50:55 -08:00
Anthony J. Thibault
243dcb88ee Bug fix for sit script. 2018-01-05 16:20:44 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection
Fix bugs related to inspecting entities with hand controllers
2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1 Fix magic numbers 2018-01-05 16:27:48 -07:00
Andrew Meadows
4745a0e32d
Merge pull request #12093 from AndrewMeadows/simulation-ownership-004
more stable simulation ownership for system of constraints
2018-01-05 14:17:53 -08:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661
Laser auto-on with tablet and Web overlays
2018-01-05 14:08:01 -08:00
Brad Hefta-Gaub
aebd098e6e
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting
WL#21654: Make the Asset Browser Sort Case Insensitive
2018-01-05 13:34:39 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov
Updating android toolchain for QML
2018-01-05 13:34:03 -08:00
Brad Hefta-Gaub
6a3609093d
Merge pull request #12051 from dback2/polyobjimportfixes
Poly obj import fixes
2018-01-05 13:33:29 -08:00
Seth Alves
487dab641f
Merge pull request #12090 from AndrewMeadows/simulation-ownership-003
more stable simulation ownership
2018-01-05 12:27:52 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix
Update model render items on texture load and fix no haze issue
2018-01-05 12:26:56 -08:00
David Back
ac1c398b9d
Merge pull request #11669 from dback2/mergeAccountGlobalServices
merge AccountScriptingInterface into GlobalServicesScriptingInterface
2018-01-05 11:34:53 -08:00
David Rowe
5431b7137b Code review 2018-01-06 08:27:24 +13:00
luiscuenca
d0bc881bb2 Load script manually 2018-01-05 12:20:41 -07:00
David Back
76f278f899
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:56:12 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:54:59 -08:00
Melissa Brown
933720fb10
Merge pull request #12012 from Delanir/Case10633
Cases 10632 and 10633 Particle Explorer UI
2018-01-05 10:46:41 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed
Delete web3d overlay "resolution" property JSDoc
2018-01-05 10:38:07 -08:00
Seth Alves
2071d42d25
Merge pull request #12088 from ElderOrb/FB11008
11008 GoTo app does not focus on address bar when opened
2018-01-05 10:07:36 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
2018-01-05 09:07:54 -08:00
luiscuenca
108748ca96 smooth transitions and slower back to default 2018-01-05 09:55:50 -07:00
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering
Log filtering
2018-01-05 08:40:41 -08:00