Zach Fox
d31dec7acb
Fix unix build errors
2018-01-09 12:41:56 -08:00
Zach Fox
0bc483f7a6
Merge pull request #12096 from ElderOrb/FB5648
...
5648 play audio notification to confirm purchase upon rezzing
2018-01-09 12:32:28 -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
Atlante45
776a2e8373
Fix concurrent access crash in avatar mixer
2018-01-09 11:24:34 -08:00
Zach Fox
360a7cc4c6
CR feedback
2018-01-09 11:08:18 -08:00
Anthony J. Thibault
e28f13c1db
Merge branch 'master' into bug-fix/better-third-person-camera
2018-01-09 10:34:04 -08:00
Anthony Thibault
1f1ac71b73
Merge pull request #12111 from hyperlogic/bug-fix/oculus-touch-angular-velocity
...
Oculus Touch: More accurate spin on thrown objects
2018-01-09 10:13:34 -08:00
Nissim Hadar
e94982a470
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-09 10:10:27 -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
Thijs Wenker
88d353a642
Merge pull request #12105 from misslivirose/feat/make-zones-lights-not-grabbable
...
Make zones, lights, and particles not grabbable when created in edit.js
2018-01-09 18:26:13 +01: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
Seth Alves
72ac1dd216
walk by default, put old walk speed back
2018-01-09 08:50:20 -08:00
Seth Alves
db307851f0
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-09 08:48:06 -08:00
Seth Alves
87dfe0efc3
Merge pull request #12097 from vladest/tablet_pagination_magnify
...
Tablet pagination magnify
2018-01-09 08:08:02 -08:00
Olivier Prat
db9e5fdae8
Merged from master but rendering seems broken
2018-01-09 11:05:34 +01:00
Cain Kilgore
4534419e53
Merge branch 'master' of https://github.com/highfidelity/hifi into 21667
2018-01-09 09:45:28 +00:00
Cain Kilgore
f78ee7c167
WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel
2018-01-09 09:44:12 +00:00
Cain Kilgore
0e3913baff
Removed Window.menuHeight
2018-01-09 09:07:26 +00:00
Cain Kilgore
773461bd30
Merge branch 'master' of https://github.com/highfidelity/hifi into 21666
2018-01-09 08:33:44 +00:00
Cain Kilgore
46de7ed83b
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
2018-01-09 08:32:59 +00:00
Alexander Ivash
7e87cb38e1
adjusted code to PR comments
2018-01-09 11:10:23 +03:00
Bruce Brown
e9f8dafbc8
Corrected bitwise operators, Removed midiRaw signal.
2018-01-08 20:10:22 -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
Anthony J. Thibault
fbea22e0f0
Renamed imag component to dual, using the correct nomenclature
...
Also removed incomplete test from unit tests.
2018-01-08 18:21:23 -08:00
Nissim Hadar
82d2afff5f
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-08 18:15:54 -08:00
Nissim Hadar
c841ec6c8c
Copy Skybox URL to Ambient URL if background mode is Skybox and Ambient URL is blank.
2018-01-08 18:15:20 -08:00
ZappoMan
1fd9eae2b5
make second click stop animation if still playing, and shrink animation files
2018-01-08 17:57:12 -08:00
Sam Gondelman
02100a405d
Merge pull request #12100 from samcake/blue
...
Restore packing of QRC qml and resources to interface.exe in DEV_BUILD
2018-01-08 17:41:34 -08:00
David Back
13c34b2d33
add AccountServices context
2018-01-08 17:37:48 -08:00
David Rowe
3d9d2a1859
Filed overlay property has been removed
2018-01-09 14:35:02 +13:00
ZappoMan
0d1b34f487
make animation 60fps
2018-01-08 17:32:22 -08:00
David Back
43cd5586f3
nuke AccountScriptingInterface, rename GlobalServicesScriptingInterface to AccountServicesScriptingInterface
2018-01-08 17:25:58 -08:00
SamGondelman
4f5727e6b0
add _needsRenderUpdate flag
2018-01-08 17:10:44 -08:00
Seth Alves
41785e8a88
Merge branch 'run' of github.com:sethalves/hifi into run
2018-01-08 16:53:10 -08:00
Seth Alves
d0ddbc0092
fix warning
2018-01-08 16:52:07 -08:00
Alexander Ivash
0f6b93eaea
FB11123 Make the certificate GOLD (and change title to Proof of Provenance License)
2018-01-09 03:13:31 +03:00
Dante Ruiz
4cf40554c0
don't call setQmlTabletRoot twice
2018-01-08 16:06:31 -08:00
Seth Alves
8ed72dd276
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-08 15:53:21 -08:00
Seth Alves
6626f55652
fix run script
2018-01-08 15:52:50 -08:00
David Rowe
8016ae1bf3
Fix typo
2018-01-09 12:47:12 +13:00
David Rowe
ceb2d38103
Deprecate Overlays.getOverlayObject()
2018-01-09 12:45:12 +13: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
Nissim Hadar
7811ddb904
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-08 15:39:09 -08:00
Nissim Hadar
b2b1807490
Changes per code review.
2018-01-08 15:37:06 -08:00
Anthony J. Thibault
dd0e57026e
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.
2018-01-08 15:28:59 -08:00
Seth Alves
e0bbf9ee41
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-08 15:28:02 -08:00
Seth Alves
ad389e5072
make avatar walk-speed adjustable from js. add a tablet button to control walking vs running
2018-01-08 15:27:41 -08:00
Nissim Hadar
46b494c802
Removed the Stage functionality - it is now implemented as a script.
2018-01-08 14:34:46 -08:00
SamGondelman
7c17603f3e
Merge remote-tracking branch 'upstream/master' into burp5
2018-01-08 14:27:31 -08:00
