Shannon Romano
|
45ab5efcef
|
Merge pull request #15121 from danteruiz/fix-stylus-gizmo
Case 21603: Tablet x button is nearly impossible to hit with stylus
|
2019-03-07 16:03:13 -08:00 |
|
Shannon Romano
|
8be93fd16c
|
Merge pull request #14891 from kencooke/glm-pack-normals-speedup
Case 21114: SIMD optimized blendshape packing
|
2019-03-07 15:28:40 -08:00 |
|
John Conklin II
|
9a4b95faa2
|
Merge pull request #15111 from luiscuenca/flowDataOnFst
Load flow bone data from FST file
|
2019-03-07 12:48:36 -08:00 |
|
John Conklin II
|
abb61b7e90
|
Merge pull request #15124 from SamGondelman/shapes
Case 21605: Fix shapes app and debugAvatarMixer
|
2019-03-07 11:07:45 -08:00 |
|
Shannon Romano
|
d11c04a19d
|
Merge pull request #15117 from SamGondelman/wearables
Case 21596: Fix wearable scale on position change
|
2019-03-07 10:29:47 -08:00 |
|
Sam Gondelman
|
dc4e2645da
|
even better!
|
2019-03-07 08:05:32 -08:00 |
|
SamGondelman
|
380df059ff
|
fix shapes app
|
2019-03-06 18:18:39 -08:00 |
|
amantley
|
fcf1e34175
|
Merge pull request #15114 from amantley/ikEnabledFix
Ik enabled fix
|
2019-03-06 20:29:38 -05:00 |
|
danteruiz
|
a0bd2f67ec
|
fix stylus gizmo intersection
|
2019-03-06 17:20:36 -08:00 |
|
Shannon Romano
|
d068630728
|
Merge pull request #15108 from sabrina-shanman/crash_physics-fst
(case 21585) Fix crash when FST model used as both graphics and physics model
|
2019-03-06 17:06:38 -08:00 |
|
amantley
|
474a97d0fc
|
now update the ikOverlayAlpha every frame
|
2019-03-06 15:15:30 -08:00 |
|
SamGondelman
|
0f3e1b9157
|
fix wearable scale on position change
|
2019-03-06 14:53:21 -08:00 |
|
Roxanne Skelly
|
a54171d60c
|
Merge pull request #15104 from roxanneskelly/79hero-master
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
|
2019-03-06 13:06:45 -08:00 |
|
Shannon Romano
|
bde6ced7c8
|
Merge pull request #15049 from thoys/fix/fst/materialRelativePaths
Case 21474: relative paths in FST material parsing
|
2019-03-06 12:38:13 -08:00 |
|
amantley
|
e72cc8b16e
|
put the ik optimized part of the conditional inside a android build define statement
|
2019-03-06 12:09:53 -08:00 |
|
amantley
|
48f512a553
|
Merge remote-tracking branch 'upstream/master' into ikEnabledFix
|
2019-03-06 10:07:28 -08:00 |
|
luiscuenca
|
dfb434ea09
|
Fix warning and refactoring
|
2019-03-06 09:25:49 -07:00 |
|
luiscuenca
|
beeeb74f17
|
Fix creation date
|
2019-03-05 18:56:02 -07:00 |
|
luiscuenca
|
76609197e2
|
Read flow data from the fst file
|
2019-03-05 18:50:53 -07:00 |
|
amantley
|
442da66583
|
debugging tiny hulk problems
|
2019-03-05 17:44:36 -08:00 |
|
sabrina-shanman
|
7ad8b3a610
|
Fix FST models being copied improperly in the ModelCache
|
2019-03-05 16:59:36 -08:00 |
|
Anthony Thibault
|
7585391642
|
Merge pull request #15031 from luiscuenca/upVectorFBXFix
Read and apply the upVector parameter when importing FBX files
|
2019-03-05 16:27:42 -08:00 |
|
Shannon Romano
|
4f3d593d90
|
Merge pull request #15072 from SamGondelman/clear
Case 11775: Don't clear my avatar entities on domain switch
|
2019-03-05 15:42:51 -08:00 |
|
Roxanne Skelly
|
fae6393663
|
Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42'
|
2019-03-05 15:11:25 -08:00 |
|
Roxanne Skelly
|
cca36e4a89
|
Merge commit '135c7b667eb126bcc4ebab948fa7450327209ae8'
|
2019-03-05 15:09:56 -08:00 |
|
Roxanne Skelly
|
d0ecc6d792
|
Merge commit '16eb3444c11c6513ff0d8a1d73a50c9856bf432b'
|
2019-03-05 15:09:20 -08:00 |
|
Roxanne Skelly
|
38981a5f25
|
Merge commit 'a804d3532e6b04fb86e5e520147bd34c331b3f36'
|
2019-03-05 15:08:39 -08:00 |
|
Roxanne Skelly
|
3ef02085ff
|
Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'
|
2019-03-05 15:07:49 -08:00 |
|
Sam Gondelman
|
94cc5b83ac
|
Merge pull request #15088 from SamGondelman/create
Case 21541: Fix mouse on create in HMD
|
2019-03-05 13:07:49 -08:00 |
|
John Conklin II
|
4729c8737e
|
Merge pull request #15095 from amerhifi/master
case 21563: adding modelScale initialization so that it does not fail the validSc…
|
2019-03-05 11:46:32 -08:00 |
|
Sam Gondelman
|
fd5e2b4672
|
Merge pull request #15082 from SamGondelman/modelCrash
Case 21528: Possible fix for model crash
|
2019-03-05 11:27:46 -08:00 |
|
amer cerkic
|
fab343a1d4
|
correcting spacing
|
2019-03-05 10:52:54 -08:00 |
|
amer cerkic
|
36e9c604e9
|
fixed based on comment
|
2019-03-05 10:45:15 -08:00 |
|
amer cerkic
|
29a308dcaa
|
adding modelScale initialization so that it does not fail the validScale check assert
|
2019-03-05 10:07:33 -08:00 |
|
SamGondelman
|
f2c248c0a2
|
disable href and entity script events when in edit mode
|
2019-03-04 17:10:20 -08:00 |
|
SamGondelman
|
fd88ec0d16
|
need to copy meshStates on main thread
|
2019-03-04 15:25:02 -08:00 |
|
SamGondelman
|
12f5a735d9
|
simplifying mouse events and fix mouse on create
|
2019-03-04 14:50:09 -08:00 |
|
luiscuenca
|
b2d08e9d42
|
apply axis rotation to translation and meshes
|
2019-03-04 15:33:21 -07:00 |
|
Shannon Romano
|
29d5574d93
|
Merge pull request #15036 from SimonWalton-HiFi/connect-class-in-nodelist-thread
Connection class should run in NodeList thread
|
2019-03-04 12:30:24 -08:00 |
|
amantley
|
e955c02e07
|
Merge pull request #15046 from amantley/bugRootHips
Bug Fix for the Hips not translating correctly when Hips and Root have the same location
|
2019-03-04 14:05:33 -05:00 |
|
Shannon Romano
|
06d89dc81a
|
Merge pull request #15077 from SamGondelman/resourceCrash
Case 21344: Fix resource crash on invalid resource
|
2019-03-04 10:47:57 -08:00 |
|
SamGondelman
|
708632ee82
|
possible fix for model crash
|
2019-03-04 10:00:26 -08:00 |
|
Simon Walton
|
83c9381575
|
Convert avatarPriority to trivalued (inherit, crowd, hero)
Also tweaks from original reviewer comments.
|
2019-03-01 17:25:46 -08:00 |
|
John Conklin II
|
d96038fd70
|
Merge pull request #14966 from raveenajain/gltf_model_parts
Case: 21139 gltf model parts
|
2019-03-01 16:26:17 -08:00 |
|
SamGondelman
|
884a64bfa6
|
fix resource crash
|
2019-03-01 15:50:50 -08:00 |
|
amantley
|
c046b8ffd3
|
made is so the boneLengthScale is only computed once per animation clip
|
2019-03-01 15:12:37 -08:00 |
|
Sam Gateau
|
cc9a3e2541
|
Merge pull request #15052 from amerhifi/quest-demo
case 21485: removing quest-demo specific changes
|
2019-03-01 15:03:44 -08:00 |
|
SamGondelman
|
3e6061e435
|
try to not clear my avatar entities on domain switch
|
2019-03-01 13:45:00 -08:00 |
|
amantley
|
a11c4bf4e3
|
resolved conflict with master in AnimClip.cpp
|
2019-03-01 13:35:08 -08:00 |
|
Anthony Thibault
|
369c718ba8
|
Merge pull request #15068 from hyperlogic/bug-fix/avatar-missing-animated-joints-bug
Fix for case when animated joints are missing from the target avatar
|
2019-03-01 13:03:29 -08:00 |
|