amantley
e2c9058f0a
first try at the new elbow code
2019-02-06 18:29:33 -08:00
amantley
22cfcc4ac9
deleted some unity files
2019-02-05 17:25:11 -08:00
amantley
9ad20b8129
adding the animcontext to the commit
2019-02-05 17:22:00 -08:00
amantley
07a4f49c58
adding the armik nodes into the json
2019-02-05 17:21:39 -08:00
amantley
3e553f015c
added the arm ik files to the repo, this is for the shoulder and elbow extensions
2019-02-05 15:54:37 -08:00
amantley
af38a40b85
Merge remote-tracking branch 'origin/animSplineIK' into animSplineIK
2019-02-05 09:43:11 -08:00
amantley
031dd5639b
fixed pole vector over writing with the old json
2019-02-04 14:46:52 -08:00
amantley
78d6e42fc8
made the ik enable/disable work for the old animIK node json
2019-02-04 13:42:19 -08:00
amantley
a04e6d55ff
enabled/disable ik now works for the new animspline json
2019-02-04 13:31:36 -08:00
amantley
34d32eeda8
removed the extra ikoverlay in the avatar-animation.json
2019-02-04 10:17:22 -08:00
Angus Antley
a2ef7edf10
cleaned up some warnings
2019-01-31 20:43:13 -08:00
Angus Antley
dd99f93d1a
fixed missplaced static const
2019-01-31 19:52:17 -08:00
amantley
25c5a2f41a
fixed mac/linux build error
2019-01-31 17:23:56 -08:00
amantley
61b019d176
added new constructor for cubichermitespline that takes quat and vec3. this means we don't need computeSplineFromTipAndBase to be declared in multiple files
2019-01-31 14:13:51 -08:00
amantley
ffd374e7d4
whitespace
2019-01-31 10:05:08 -08:00
amantley
f68ee4e7ce
merged with master
2019-01-31 09:56:46 -08:00
amantley
d547d5b854
changed the json reader to take an array not a string for the flex targets
2019-01-30 18:16:02 -08:00
Howard Stearns
75c1bdbf0d
Merge pull request #14812 from SimonWalton-HiFi/avatar-data-packet-overrun
...
80.0/master: Fix small miscalculation in space requirements for serialized avatar-data
2019-01-30 17:00:12 -08:00
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
John Conklin II
10bb637753
Merge pull request #14810 from SamGondelman/skybox
...
Case 20833: Fix procedural skybox depth testing
2019-01-30 14:16:36 -08:00
Simon Walton
08b21109c1
Include the new scale float in min remaining size calculation
2019-01-30 13:55:12 -08:00
SamGondelman
93e32f1bd5
fix skybox depth testing
2019-01-30 12:25:48 -08:00
Ryan Huffman
9c8e21ec6b
Merge pull request #14806 from thoys/fix/create/mismatchingEntityHostTypeChildren
...
MS20893 [CreateApp] Ignore children of mismatching entityHostTypes
2019-01-30 09:55:39 -08:00
Jeff Clinton
3b84580e88
Merge pull request #14794 from SamGondelman/colors
...
Case 20888: Fix color space
2019-01-30 09:09:07 -08:00
Sam Gateau
d418fa282a
Merge pull request #14801 from SamGondelman/transparent
...
Case 20867: Fix translucent textures not getting reset
2019-01-30 08:54:48 -08:00
Jeff Clinton
0def57f2c8
Merge pull request #14805 from danteruiz/fix-qml-rendering
...
Case 20902: Give SendAsset.qml a background color
2019-01-30 08:54:03 -08:00
Angus Antley
e36877a861
added the interp for the possibility of extra flex coeffs
2019-01-29 22:02:32 -08:00
Thijs Wenker
132d293c3c
skip child entities of mismatching entityHostType when copy/delete/duplication of entities
2019-01-30 03:15:32 +01: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
Dante Ruiz
ccf02d8b65
fix SendAssets.qml
2019-01-29 17:16:27 -08:00
Jamil Akram
cc38a96bff
Merge pull request #14415 from Atlante45/feat/rc-branch-script
...
RC branch script
2019-01-29 16:32:49 -08:00
Shannon Romano
4c4a2036c7
Merge pull request #14791 from SimonWalton-HiFi/pal_username_update
...
Don't update PAL namecard with empty strings
2019-01-29 15:41:31 -08:00
SamGondelman
56096708d3
one more try
2019-01-29 15:26:49 -08:00
SamGondelman
e41f5617e9
fix color space
2019-01-29 14:52:57 -08:00
Antonina Savinova
5d49a3f6df
Merge pull request #14732 from kencooke/audio-distattn-improvements
...
Bug fixes and improvements to audio distance attenuation
2019-01-29 14:02:29 -08:00
Shannon Romano
ce0334d10b
Merge pull request #14793 from jherico/fix/container_build_gradle_failures
...
79.0/master: Fix errors and intermittent failures in Android gradle builds in containers
2019-01-29 13:32:30 -08:00
Shannon Romano
2dbc4ff2a0
Merge pull request #14798 from jherico/fix/jenkins_toolchain_error
...
79.0/master: Fix erroneous 'CMAKE_TOOLCHAIN_FILE has changed' errors on Jenkins
2019-01-29 13:32:08 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
...
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
Jeff Clinton
08a3e65f66
Merge pull request #14789 from danteruiz/recenter-hmd-log-window
...
Case 20771: Make sure that the script log is in the correct location when switching to and from HMD
2019-01-29 13:03:43 -08:00
SamGondelman
5be6a31b6c
possible fix for transparency
2019-01-29 12:20:46 -08:00
Simon Walton
e45634d4ea
Merge remote-tracking branch 'upstream/master' into pal_username_update
2019-01-29 11:55:39 -08:00
Brad Davis
8411640ab0
Fix erroneous 'CMAKE_TOOLCHAIN_FILE has changed' errors on Jenkins
2019-01-29 11:53:13 -08:00
Ken Cooke
b0f8afa772
CR: don't expose "position" when not set
2019-01-29 11:21:17 -08:00
Ken Cooke
fa08e42da6
Restore legacy attenuation behavior for system sounds and scripts that do not set position.
...
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature
...
MS20874: Only initialize plugin if started through Oculus Store
2019-01-29 10:57:03 -08:00
Jeff Clinton
654712cfad
Merge pull request #14757 from gcalero/display_name_and_avatar
...
Choose avatar and set display name
2019-01-29 10:45:11 -08:00
