Nissim Hadar
8042b4b3fb
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-09 13:28:14 -08:00
Nissim Hadar
c3f6faed00
Deal correctly with inheritance at top-most level.
2018-01-09 13:27:57 -08:00
Andrew Meadows
8c6edc749a
provide more context for update perf stats
2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2
model meta is only withTypeShape if visual geometry request fails
2018-01-09 12:43:43 -08:00
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
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
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
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
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 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
SamGondelman
4f5727e6b0
add _needsRenderUpdate flag
2018-01-08 17:10:44 -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
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
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
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
Melissa Brown
2fddace71e
Merge pull request #12019 from Delanir/C10594
...
Case 10594 - Fix entity property href not being able to reset (empty) ...
2018-01-08 14:22:28 -08:00
Nissim Hadar
569cf1a30e
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
2018-01-08 14:16:03 -08:00
vladest
891663bae9
Page indicator visible only when pages more than one
2018-01-08 23:07:09 +01:00
John Conklin II
fab28e7d44
Merge pull request #12106 from SamGondelman/overlayFix
...
Fix avatar texture loading
2018-01-08 14:01:15 -08:00
Zach Fox
611f25d542
Improve scrolling thru My Purchases
2018-01-08 13:17:04 -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
Nissim Hadar
452c16e706
Removed backgroundPropertiesChanged
2018-01-08 12:11:36 -08:00
Nissim Hadar
0a21e5de04
Removed _backgroundPropertiesChanged
2018-01-08 12:07:21 -08:00
Zach Fox
dcfceab078
Remove all work done on paginating purchases
2018-01-08 12:03:56 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646
...
Window JSDoc
2018-01-08 11:53:34 -08:00
Nissim Hadar
a33f3446f6
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-08 11:51:13 -08:00
Nissim Hadar
8e03ecedb9
Added user data for lat/lon.
2018-01-08 11:50:49 -08:00
