amantley
d174fb1b5c
removed print statements
2019-01-30 16:59:12 -08:00
amantley
5054b54626
removed armIK.cpp and armIK.h, they are for the next changes
2019-01-30 16:20:50 -08:00
amantley
7a1c1252ff
cleanup
2019-01-30 16:09:10 -08:00
amantley
2e1a4545c6
cache the spine2 spline default offset and ratio
2019-01-30 14:47:03 -08:00
Angus Antley
e36877a861
added the interp for the possibility of extra flex coeffs
2019-01-29 22:02:32 -08:00
amantley
fb0ad7768c
removed clear map
2019-01-29 17:31:20 -08:00
amantley
e2a729b68b
got the spline working in myskeleton model, need to clean up
2019-01-29 17:25:25 -08:00
Angus Antley
3994311583
starting the move of the initial head base spline to myskeletonmodel
2019-01-29 08:54:35 -08:00
amantley
1919cc3b1a
disable mid joint when not valid. more work on this tomorrow
2019-01-28 17:49:46 -08:00
amantley
dffd41ecb0
chain ik debug draw works for spline now
2019-01-28 16:58:28 -08:00
amantley
f17cfbcbb1
more cleaning, need to fix debug draw ik chain
2019-01-28 15:25:12 -08:00
amantley
ffd3a24bf2
further cleaning, broke the arms
2019-01-28 13:53:30 -08:00
amantley
f8bfef6dbd
cleaning up the _hipsIndex references, cleaning in general
2019-01-28 11:50:23 -08:00
Angus Antley
2679a3a30d
changed the naming of the middle joint from secondary target to midJoint, also generalized the handling of the neck head rotation after the middle spline is updated
2019-01-27 16:30:13 -08:00
amantley
0b6d0b4baf
renamed json to reflect spline node
2019-01-25 18:17:15 -08:00
amantley
f2a7f37950
got rid of the lag in the spline code by setting the flex coeffs to 1.0
2019-01-25 17:11:07 -08:00
amantley
bcbd9323c0
Merge remote-tracking branch 'upstream/master' into animSplineIK
2019-01-25 14:42:24 -08:00
amantley
446d7b9514
added the flex coeff for the primary and secondary spline targets to the json
2019-01-25 14:41:18 -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
amantley
992820cd67
removed unnecessary hand update function for two bone IK
2019-01-25 11:34:18 -08:00
amantley
71df614989
put all the hand update code in one function that works for two bone IK
...
and legacy animInverseKinematics Ik
2019-01-25 11:28:51 -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
amantley
bc635306ea
added interp from enabled to disabled and vice versa
2019-01-24 22:28:40 -08:00
amantley
2574e82184
cleaned up print statements
2019-01-24 19:47:27 -08:00
amantley
e7941f78d6
adding the shoulder rotation back in
2019-01-24 17:17:39 -08:00
amantley
37f92d2319
added code to read tip and base var info from the json
2019-01-24 17:02:30 -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
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
amantley
cdd03646c2
latest spline code with ik node removed started cleanup
2019-01-23 17:22:13 -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