luiscuenca
49659f0039
Fix error on exit and jointsToFilter param removed
2019-01-28 11:55:53 -07:00
luiscuenca
f54f9e5bfd
Merge branch 'master' into multiSphereAvatar04
2019-01-25 13:54:01 -07:00
luiscuenca
df4be641eb
More fixes
2019-01-25 13:42:18 -07: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
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
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
Simon Walton
74748b15fd
Add a filter functor to the plugin manager and use it in AudioMixer
2019-01-23 17:28:18 -08:00
luiscuenca
7a0f3ea7ef
Fix error
2019-01-23 18:04:13 -07:00
luiscuenca
a947c894c2
Suggested changes
2019-01-23 17:23:36 -07: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
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
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
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
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
SamGondelman
49947d9f6d
better default values
2019-01-21 16:51:08 -08:00
NissimHadar
4edd072b3b
Removed whitespace
2019-01-21 16:49:54 -08:00
raveenajain
2393db5e12
collision logic
2019-01-21 16:24:32 -08:00
NissimHadar
084d55a414
Gabriel Calero's fix.
2019-01-21 13:26:44 -08:00
raveenajain
3f2aa56187
feedback changes
2019-01-21 13:24:07 -08:00
NissimHadar
a693e0b6f9
Gabriel Calero's fix.
2019-01-21 13:08:37 -08:00
NissimHadar
fb09856c11
Gabriel Calero's fix.
2019-01-21 12:56:13 -08:00
SamGondelman
5b1ea24d20
glsl initializer lists are 4.2
2019-01-21 12:35:48 -08:00
Simon Walton
c3a8c71f60
Add TabletMenu to list of pages that trigger the QmlCommerce bridge
2019-01-21 12:27:14 -08:00
Shannon Romano
c9e53e067d
Merge pull request #14652 from jherico/feature/quest_move_interface
...
Migrate android build location to accommodate Quest builds
2019-01-21 11:09:51 -08:00
raveenajain
379f98b26d
just using change
2019-01-18 18:20:28 -08:00
Anthony Thibault
5dbd62cc67
code review feedback
2019-01-18 17:52:53 -08:00
raveenajain
d2e37d0c90
my and other avater changes, if setting toggled can pass through other avatar
2019-01-18 16:50:44 -08:00