MiladNazeri
|
b73106fa7e
|
Merge pull request #12120 from cain-kilgore/21666
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
|
2018-01-10 12:30:21 -08:00 |
|
MiladNazeri
|
2220b976dc
|
Merge pull request #12130 from cain-kilgore/21665
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
|
2018-01-10 12:06:58 -08:00 |
|
MiladNazeri
|
bf61d8c7b3
|
Merge pull request #12115 from ctrlaltdavid/deprecations
Update JSDoc with some deprecations
|
2018-01-10 12:04:21 -08:00 |
|
Howard Stearns
|
fafc98f51c
|
Merge pull request #12098 from ElderOrb/FB11123
FB11123 Make the certificate GOLD (and change title to Proof of Prove…
|
2018-01-10 10:01:15 -08:00 |
|
Andrew Meadows
|
7060cd9a90
|
Merge pull request #12122 from druiz17/fix-double-set-tablet-root
don't call setQmlTabletRoot twice
|
2018-01-10 09:53:09 -08:00 |
|
Sam Gateau
|
539ee82937
|
Merge pull request #12033 from Zvork/compactvb
More compact representation of meshes on GPU
|
2018-01-10 09:11:33 -08:00 |
|
Sam Gateau
|
d4dc1e352f
|
Merge pull request #12124 from AndrewMeadows/no-misc-stats
more context for update performance stats
|
2018-01-10 09:10:26 -08:00 |
|
Sam Gateau
|
8c80247925
|
Merge pull request #12123 from SamGondelman/meta
Model meta render item is only withTypeShape if visual geometry request fails
|
2018-01-10 09:09:19 -08:00 |
|
Sam Gateau
|
6d6aad4aa8
|
Merge pull request #12060 from SamGondelman/burp5
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
|
2018-01-10 09:08:54 -08:00 |
|
NissimHadar
|
7fbb945892
|
Merge pull request #12055 from NissimHadar/keylightInheritance
Keylight inheritance
|
2018-01-10 08:40:14 -08:00 |
|
Cain Kilgore
|
330b266ca8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 21665
|
2018-01-10 11:33:06 +00:00 |
|
Cain Kilgore
|
38afc5a25b
|
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
|
2018-01-10 11:31:46 +00:00 |
|
Olivier Prat
|
5ae4b99b90
|
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
|
2018-01-10 11:20:00 +01:00 |
|
Zach Fox
|
928e3d2ef7
|
Merge pull request #12108 from zfox23/commerce_pagination
Commerce: Support pagination at History endpoint; improve Purchases scrolling
|
2018-01-09 15:57:34 -08:00 |
|
Nissim Hadar
|
5b1f8e83d4
|
Removed gcc warning.
|
2018-01-09 15:46:15 -08:00 |
|
Nissim Hadar
|
0b1e321ccf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-09 15:25:03 -08:00 |
|
Nissim Hadar
|
b53e411184
|
Corrected pushing of default lights.
|
2018-01-09 15:24:46 -08:00 |
|
Brad Hefta-Gaub
|
a7b56da570
|
Merge pull request #12103 from ZappoMan/emoteApp
first cut at an emote app
|
2018-01-09 15:23:14 -08:00 |
|
Zach Fox
|
edf25c3e4e
|
Remove code duplication...
|
2018-01-09 14:14:54 -08:00 |
|
Melissa Brown
|
7b50480a43
|
Merge pull request #12070 from 1st-BrainStormer/master
WL#21651: Extend MIDI javascript support.
|
2018-01-09 14:06:15 -08:00 |
|
Melissa Brown
|
19802b33eb
|
Merge pull request #12109 from vladest/tablet_page_indicator
Page indicator visible only when pages more than one
|
2018-01-09 14:05:32 -08:00 |
|
ZappoMan
|
4f1dc2f184
|
fix CR comments
|
2018-01-09 13:42:51 -08:00 |
|
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 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
|
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 |
|