Commit graph

75296 commits

Author SHA1 Message Date
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
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
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
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
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
NissimHadar
084d55a414 Gabriel Calero's fix. 2019-01-21 13:26:44 -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
Anthony Thibault
5dbd62cc67 code review feedback 2019-01-18 17:52:53 -08:00
Andrew Meadows
9a854291af supress spurious not important AvatarEntity updates 2019-01-18 15:36:38 -08:00
Adam Smith
da7cd6b2f7
Merge pull request #14691 from SamGondelman/multifrustum
Case 20394: Fix multi-frustum view updating
2019-01-18 15:23:58 -08:00
Sam Gondelman
17ac4138b6
typos 2019-01-18 13:43:56 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
Antonina Savinova
a3e82c1869
Merge pull request #14734 from Atlante45/fix/ess-log-spam
Add ESS to the Agent's node interest set
2019-01-18 13:29:23 -08:00
Jeff Clinton
09b16d2d7a
Merge pull request #14735 from SamGondelman/snap
Case 20724: Fix Snap app settings issue
2019-01-18 13:00:18 -08:00
Shannon Romano
11b8ae6d44
Merge pull request #14710 from sethalves/mouse-grab-with-traits
case 15962: case 20481: Mouse grab with traits
2019-01-18 11:56:41 -08:00
SamGondelman
d6f0fbd17b fix snap app issue 2019-01-18 10:48:20 -08:00
Brad Davis
a3e9ad9bc2 Revert target SDK to 26 due to splash screen bug: https://tinyurl.com/yb9ll4cd 2019-01-18 10:30:02 -08:00
Anthony Thibault
e68a8794ce Remove unused variable 2019-01-17 16:18:43 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp
Change Avatar App design for avatar collisions
2019-01-17 16:06:17 -08:00
Brad Davis
f552f8d78a Working on fixing build problems 2019-01-17 15:48:30 -08:00
Shannon Romano
c764f5182f
Merge pull request #14717 from roxanneskelly/Case20277
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
2019-01-17 15:36:31 -08:00
Shannon Romano
0370268f56
Merge pull request #14723 from SimonWalton-HiFi/connection-parented-to-socket
Make Connection class a Qt-child of Socket class
2019-01-17 15:35:29 -08:00
Clement
74b83d9961 Add ESS to the Agent's node interest set 2019-01-17 15:23:40 -08:00
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00