Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature
...
MS20311: Oculus login feature
2019-01-25 16:16:32 -08:00
Clément Brisset
17b8f65d0a
Merge pull request #14773 from Atlante45/fix/corrupted-backups-status
...
Add failed backup as corrupted during creation
2019-01-25 14:46:24 -08:00
Jeff Clinton
d92d256cfc
Merge pull request #14656 from SamGondelman/matFallthrough
...
Case 20241: Material entity fallthrough
2019-01-25 14:01:27 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10
...
Case 20585: Add missing Web Overlay functionality to Web Entities
2019-01-25 14:00:52 -08:00
Wayne Chen
1c6521486e
fixing compile errors
2019-01-25 13:56:56 -08:00
Wayne Chen
6f49914167
Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature
2019-01-25 12:19:20 -08:00
Wayne Chen
635c7533b9
more code review feedback
2019-01-25 12:15:38 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature
2019-01-25 11:44:14 -08:00
Wayne Chen
0928b1bff1
code review feedback
2019-01-25 11:36:58 -08:00
Shannon Romano
90c7423dfb
Merge pull request #14772 from wayne-chen/loginScreenPreserveRatio
...
MS20825: Login Screen Aspect/Crop with resizing
2019-01-25 11:16:10 -08:00
Shannon Romano
28edb472fc
Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale
...
20565 Avatar::_collideWithOtherAvatars does not scale
2019-01-25 11:06:36 -08:00
Jamil Akram
7e6af92700
Merge pull request #14771 from hyperlogic/bug-fix/avatar-translation-bug
...
Bug fixes for avatarData protocol
2019-01-25 10:52:15 -08:00
Jeff Clinton
efb278b258
Merge pull request #14707 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch
...
fix for continuous color picker update loop
2019-01-25 10:38:14 -08:00
Shannon Romano
fd04996853
Merge pull request #14755 from hyperlogic/bug-fix/joint-mesh-name-collisions
...
Bug fix for avatars that have mesh/joint name duplicates
2019-01-25 09:59:44 -08:00
Shannon Romano
552729abe7
Merge pull request #14759 from Atlante45/feat/gltf
...
Enable "Add To World" Asset Browser button for glTF
2019-01-25 09:56:40 -08:00
Shannon Romano
6baa9d9d8c
Merge pull request #14763 from SimonWalton-HiFi/pluginmanager-filtering
...
Allow filtering on plugin metadata to avoid inappropriate plugins
2019-01-25 09:51:12 -08:00
NissimHadar
70053d3bba
Merge pull request #14664 from NissimHadar/20526-updateReadme
...
Case 20526 - update readme
2019-01-25 09:15:42 -08:00
Shannon Romano
66d5b16a5d
Merge pull request #14744 from dback2/shapeTypeFix
...
Shape type and compound shape property fixes
2019-01-24 16:18:34 -08:00
Clement
95714b7eb3
Add failed backup as corrupted during creation
2019-01-24 16:11:38 -08:00
Wayne Chen
4880c7081e
adding blurred images
2019-01-24 16:00:24 -08:00
Wayne Chen
5c55761e4d
adding fill mode for aspect/crop
2019-01-24 15:57:04 -08:00
Wayne Chen
9da7465698
readding render session, adding newlines for oculus failure
2019-01-24 15:33:50 -08:00
SamGondelman
24b62ca87c
Merge remote-tracking branch 'upstream/master' into NOverlays10
2019-01-24 15:00:37 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9
...
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
2019-01-24 14:36:27 -08:00
Anthony Thibault
77fb20801f
Bug fixes for avatarData protocol
...
Two issues were recently discovered after they were introduced by PR #14733
1) The Avatar Mixer would sometimes have incorrect translation scale when splitting BulkAvatarData across multiple MTUs
2) Old avatar recordings would no longer work properly.
This PR should fix both of these issues.
2019-01-24 14:24:11 -08:00
Simon Walton
cc6caa61a7
Change common warning to debug
2019-01-23 21:02:52 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
Simon Walton
74748b15fd
Add a filter functor to the plugin manager and use it in AudioMixer
2019-01-23 17:28:18 -08:00
Sam Gateau
3ec9290dca
Merge pull request #14619 from SamGondelman/matTarget
...
Case 20240: Better material entity targeting
2019-01-23 15:47:22 -08:00
Jeff Clinton
49fa2dc75d
Merge pull request #14715 from ctrlaltdavid/M20052
...
Case 20052: Fix tablet sometimes not working after domain change
2019-01-23 15:29:20 -08:00
Wayne Chen
512805d48f
removing leftover variable
2019-01-23 14:45:41 -08:00
Adam Smith
04f33956e7
Merge pull request #14728 from SamGondelman/crash
...
Case 20411: Fix crash on subsequent entitlements checks
2019-01-23 14:42:00 -08:00
Wayne Chen
4cf90050b5
reverting old code
2019-01-23 14:39:58 -08:00
Wayne Chen
049282e2b3
fixing text alignment issues, adding some oculus user log
2019-01-23 14:38:06 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision
...
Avatar Protocol: Fix for precision issues with translation
2019-01-23 14:07:58 -08:00
Jeff Clinton
b9f9766b01
Merge pull request #14747 from SimonWalton-HiFi/wallet-in-hmd
...
Fix security-image display in HMD
2019-01-23 13:18:45 -08:00
Jeff Clinton
5fa033473e
Merge pull request #14760 from SimonWalton-HiFi/qmlcommerce-singleton
...
Treat QmlCommerce as a singleton class
2019-01-23 13:07:17 -08:00
Wayne Chen
e6426cb680
fixing bug with cancel button
2019-01-23 10:26:51 -08:00
David Back
89032698eb
newline
2019-01-22 18:24:09 -08:00
David Back
ea5705907b
fix shape type and compound shape URL properties/tooltips
2019-01-22 18:22:13 -08:00
Simon Walton
77293150b7
Const declarations to enforce singleton capability
2019-01-22 18:05:47 -08:00
Simon Walton
3a5d550fa5
Treat QmlCommerce as a singleton class
2019-01-22 17:13:36 -08:00
Clement
61be5a3cc4
Enable "Add To World" Asset Browser button for glTF
2019-01-22 17:01:06 -08:00
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats
...
cases 20709 and 20715: wear and see mexico hats
2019-01-22 12:58:56 -08:00
John Conklin II
4050e4d998
Merge pull request #14740 from AndrewMeadows/fix-case-20731
...
Case 20731: send updates when grabbing AvatarEntities
2019-01-22 12:33:25 -08:00
Sam Gateau
8a1bec420e
Merge pull request #14748 from SamGondelman/procedural
...
Case 20774: Possible fix for procedurals on mac
2019-01-22 11:45:30 -08:00
Wayne Chen
1ae2ddd926
dont setup another oculus session
2019-01-22 11:08:15 -08:00
raveenajain
d3e0998a7f
update with master
...
Merge branch 'master' of https://github.com/highfidelity/hifi into collideWithOtherAvatars_scale
2019-01-22 10:55:26 -08:00
Anthony Thibault
5146f3dfae
Bug fix for avatars that have mesh/joint name duplicates
...
This change has two parts. First we do a better job of identifying joints vs meshes in the FBXSerializer.
Second we use this information to better handle duplicate names in AnimSkeleton.
When a duplicate is detected, allow joints to override meshes.
This will ensure that when joints are looked up by name we will not return a mesh object with the same name by mistake.
2019-01-22 10:47:01 -08:00
Shannon Romano
6cb8cf0202
Merge pull request #14750 from NissimHadar/fixAndroidBuild
...
Gabriel Calero's fix (79.0/master)
2019-01-21 17:40:58 -08:00
