Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 16:40:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77386 commits 25 branches 28 tags 1.2 GiB
Commit graph

31910 commits

Author SHA1 Message Date
David Back
f0bf87b3c3 fix joint out not being renamed with jointRotationOffset2 2019-03-11 18:53:35 -07:00
Shannon Romano
44fa00606a
Merge pull request #15153 from danteruiz/fix-soft-entity-popping 
Case 21618: menithal's avatar is constantly flashing
 2019-03-11 18:09:44 -07:00
amantley
7c7e632589 debug statements to find the node parsing error 2019-03-11 17:50:20 -07:00
SamGondelman
2b32b77bed handle case when clusterMatrices.size() == 0 2019-03-11 17:32:40 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Wayne Chen
4add8c1777
Merge pull request #15098 from wayne-chen/muteWarningModified 
Case 21564: Warn When Muted
 2019-03-11 16:53:00 -07:00
SamGondelman
b24b7fed3d the root node isn't the first onegit add ../.git add ../. 2019-03-11 15:34:41 -07:00
Shannon Romano
c0240d2431
Merge pull request #14932 from AndrewMeadows/allow-kinematic-mesh 
Case 21227: don't enforce MOTION_TYPE_STATIC on mesh shapes
 2019-03-11 15:33:32 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Shannon Romano
801306364a
Merge pull request #15148 from samcake/rc81-hero 
Case 21639: RC81: Adding Hero support in simulation of avatars
 2019-03-11 14:13:49 -07:00
SamGondelman
97b01bad70 tellPhysics to children when animating model 2019-03-11 12:23:26 -07:00
SamGondelman
b7e1798d1b better handling of unrigged vertices on skinned mesh 2019-03-11 11:28:30 -07:00
danteruiz
4371723145 fix soft entity popping 2019-03-11 11:27:12 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt 2019-03-10 17:14:54 -07:00
Bradley Austin Davis
0e46007d84
Merge pull request #15116 from jherico/fix/oculus_sdk_update 
Case 21595: Oculus SDK Update
 2019-03-08 23:53:06 -08:00
David Rowe
24286273b4 Miscellaneous JSDoc fixes 2019-03-09 19:22:07 +13:00
Sam Gateau
3464fe09c1 Applying the hero changes to master soon to be rc81 2019-03-08 18:13:20 -08:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra 
add getFlowData method to MyAvatar
 2019-03-08 17:45:11 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
18b86d550d adding PushToTalk action 2019-03-08 16:07:48 -08:00
luiscuenca
80150565f6 Fix bug on group settings 2019-03-08 16:30:28 -07:00
David Rowe
24c7c8be19 Update JSDoc per merge from master 2019-03-09 12:03:59 +13:00
Shannon Romano
a8f6e74ca4
Merge pull request #15135 from SamGondelman/text81 
Case 21628: Fix text rendering on AMD/Mac
 2019-03-08 14:59:37 -08:00
Thijs Wenker
ded58b96f0
Merge pull request #15139 from huffman/feat/tga-textures 
Case 21220: Add more complete support for .tga files
 2019-03-08 23:53:21 +01:00
Thijs Wenker
60d46998ec
Merge pull request #15035 from thoys/feat/avatarTools/avatarDoctorMoreWarnings 
Case 21449: [AvatarPackager/AvatarDoctor] Warnings update
 2019-03-08 23:51:58 +01:00
Anthony Thibault
aa3b27d89e
Merge pull request #15143 from amantley/bugShadowNames2 
loading jointRotationOffset2 from FST and deal with the shadow joints
 2019-03-08 14:37:30 -08:00
Ryan Huffman
62f17acaf7 Fix warnings in TGAReader 2019-03-08 14:01:29 -08:00
luiscuenca
4858f64810 get the colliding joints 2019-03-08 14:36:47 -07:00
Ryan Huffman
1f0a8b18c8 Fix warning about TGAOrientation 2019-03-08 13:01:56 -08:00
luiscuenca
f363d95ca2 clear group settings on init 2019-03-08 13:02:47 -07:00
Ryan Huffman
2af9dc886a Add logging category to TGAReader 2019-03-08 11:56:04 -08:00
amantley
6b18b22433 loading jointRotationOffset2 from FST and deal with the shadow joints 2019-03-08 11:53:12 -08:00
luiscuenca
cb6f573b35 Merge branch 'master' into flowAPIExtra 2019-03-08 12:43:02 -07:00
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13:00
David Rowe
5068075645 Fill in MyAvatar animation JSDoc 2019-03-09 07:42:55 +13:00
Roxanne Skelly
e94d248ac5
Merge pull request #15126 from howard-stearns/domainUnlimited 
unlimited certified copies in a domain
 2019-03-08 10:23:42 -08:00
Ryan Huffman
c55811ced5 Add support for TGA orientation 2019-03-08 09:47:35 -08:00
Ryan Huffman
5fd2b0699a Add more complete support for .tga files 2019-03-08 09:47:35 -08:00
luiscuenca
e8da6b5a0c add getFlowData 2019-03-08 10:36:58 -07:00
Thijs Wenker
d985d1bff0 use Rig instead of Avatar for height calculations 2019-03-08 03:36:56 +01:00
Anthony Thibault
dcd1258439
Merge pull request #15119 from hyperlogic/feature/improve-anim-pose-negative-scale 
Improve AnimPose support for negative scale
 2019-03-07 17:05:46 -08:00
Sam Gondelman
1ed2012a63
Merge pull request #15132 from SamGondelman/text 
Case 21621: Fix crash on startup
 2019-03-07 16:54:29 -08:00
David Rowe
eba89e8a80 Revise Avatar JSDoc as a result of MyAvatar JSDoc work 2019-03-08 13:50:03 +13:00
David Rowe
0b7cddb886 Fill in and tidy MyAvatar JSDoc 2019-03-08 13:49:10 +13:00
SamGondelman
af03fb5f85 try to fix text rendering on amd with transparency 2019-03-07 16:23:12 -08:00
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
SamGondelman
1d6364773d fix crash on startup 2019-03-07 15:26:41 -08:00
Howard Stearns
d309995aef spell domainUnlimited right, and track challenges so that we don't reap 2019-03-07 14:48:57 -08:00
Anthony Thibault
0cf8f3e5c3 Code review feed back remove NEW_VERSION ifdef 2019-03-07 14:11:01 -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
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -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
sabrina-shanman
1576125c42 Integrate HFM Asset Engine (aka model prep step) into Oven 
Add 'deduplicateIndices' parameter to FBXSerializer and make deduplicate a required parameter for extractMesh

Add draco mesh and FBX draco node version

Support generating/saving draco meshes from FBX Model nodes
 2019-03-06 15:54:12 -08:00
sabrina-shanman
82382fe9a1 Use hifi types consistently in model-baker 2019-03-06 15:35:34 -08:00
SamGondelman
168e47aa62 bake particles and polylines 2019-03-06 15:34:12 -08:00
SamGondelman
1a1277e9e7 it's working! 2019-03-06 15:34:12 -08:00
SamGondelman
94de0c12bc working on material baker 2019-03-06 15:34:11 -08:00
SamGondelman
4965adbc2f bake js and collision hull 2019-03-06 15:34:11 -08:00
SamGondelman
7fc9a3fdb6 wip 2019-03-06 15:34:10 -08:00
SamGondelman
162573bc63 enable js baking from non-local file 2019-03-06 15:34:10 -08:00
SamGondelman
270b96aa8d cleaning up oven 2019-03-06 15:34:09 -08:00
sabrina-shanman
86c948f116 Convert hfmModel and materialMapping fields in model-baker Baker to getters 2019-03-06 15:33:31 -08:00
sabrina-shanman
2af17015d3 Convert serializers and FBX.h to use HifiTypes.h 2019-03-06 15:19:01 -08:00
sabrina-shanman
8ff212ac95 Move custom draco mesh attributes from FBX.h to HFM.h 2019-03-06 15:18:58 -08:00
sabrina-shanman
aef696efe6 Add passthrough config to PrepareJointsTask 2019-03-06 15:18:26 -08:00
sabrina-shanman
9c9dc553a2 Fix binding to temporary when trying to safely get empty model-baker task data 2019-03-06 15:18:25 -08:00
sabrina-shanman
4ae0c79130 Harden model-baker Engine against random tasks being disabled 2019-03-06 15:18:22 -08:00
sabrina-shanman
e4d6d5af89 Streamline ModelBaker initialization and URLs 2019-03-06 15:18:19 -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
Anthony Thibault
5fcfa265d2 Remove alternate versions of AnimPose(mat4) constructor 2019-03-06 14:02:58 -08:00
Anthony Thibault
0dbc83049b Make AnimPose from mat4 work better for matrices with negative determinants. 
Took part of this code from glm::decompose() which references
https://opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
 2019-03-06 13:28:14 -08:00
Brad Davis
b515a0cceb Support KHR_no_error in the VR wrapper API 2019-03-06 13:15:12 -08:00
Brad Davis
05ba515c73 Support KHR_no_error in the VR context 2019-03-06 13:13:45 -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
Wayne Chen
4187104b17 culling mute state 2019-03-04 14:12:09 -08:00
Seth Alves
9614216006 don't disable server echo when audio qml page is closed 2019-03-04 13:47:55 -08:00
Seth Alves
d5e8cba1ee make server-audio-loopback button work in HMDs 2019-03-04 13:47:55 -08:00
Seth Alves
3ecd86caee add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 13:47:55 -08:00
Wayne Chen
7860db68eb culling hearing oneself and testing sound 2019-03-04 13:33:16 -08: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
Seth Alves
0523a0d06d don't disable server echo when audio qml page is closed 2019-03-04 11:08:07 -08:00
Seth Alves
9ff99c7213 make server-audio-loopback button work in HMDs 2019-03-04 11:08:07 -08:00
Seth Alves
38256df0f2 add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 11:08:06 -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
Shannon Romano
5db5fca81e
Merge pull request #15066 from SamGondelman/2d 
Case 19188: Potential 2D overlay + Tablet threading fixes
 2019-03-01 12:56:23 -08:00
amantley
54f14b2772 added the case where my avatar has no parent of hips, but the animation does 2019-03-01 12:41:05 -08:00
amantley
217145f4c5 This pr addresses two issues related to avatars that have parents joints 
above their hip joints. First on the IK side this prevents parent joints
from being included in the accumulators in AnimInverseKinematics. Second
in AnimClip the boneLengthScale now takes into account translation and
scale on these extra parent joints.
 2019-03-01 11:42:03 -08:00
Roxanne Skelly
16eb3444c1 Code Review Fixes 2019-03-01 11:31:01 -08:00
Clement
135c7b667e Reduce size of _nodeMutex critical sections 2019-03-01 11:23:46 -08:00
raveenajain
dfb17c922b fix model not loading in bounding box 2019-03-01 11:21:29 -08:00
Anthony Thibault
82b2050229 code review feedback 2019-03-01 11:13:56 -08:00
amer cerkic
ad69611b7c removing redef of the two functions in avatar.h 2019-03-01 11:08:00 -08:00
SamGondelman
cfb84967d5 these seemed dangerous 2019-03-01 10:54:44 -08:00
amer cerkic
6ebc57994b Merge branch 'master' into quest-demo 2019-03-01 10:23:41 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling 
Case 21424: Tablet does not properly resize when scaling avatar.
 2019-03-01 09:37:47 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities 
Case 21494: Avoid mem leaked entities
 2019-03-01 09:34:20 -08:00
Anthony Thibault
9a2bd87278 Fix for case when animated joints are missing from the target avatar skeleton 
By copying the animation rotations over to the target avatar in absolute frame, rather then relative,
we can properly "combine" animated rotations that aren't in the target avatar skeleton.
 2019-02-28 18:02:07 -08:00
Clement
a804d3532e Set default limit for other nodes to size_t max 2019-02-28 15:30:57 -08:00
Dante Ruiz
d33400f6ad fix GCC compiler warning 2019-02-28 15:25:15 -08:00
Clement
9ea41f7122 CR 2019-02-28 15:22:07 -08:00
Atlante45
9fe7a3350c Fix windows compile error 2019-02-28 15:06:26 -08:00
Thijs Wenker
ff8cb27256 include fst URL in the GeometryExtra hash 2019-02-28 23:45:08 +01:00
Andrew Meadows
8a7853a701 remove crufty comment 2019-02-28 14:38:13 -08:00
Roxanne Skelly
c721d68ec3 Remove unneeded cruft 2019-02-28 14:35:29 -08:00
Thijs Wenker
6aede024f4 use fst mapping path as reference instead of model path 2019-02-28 23:22:55 +01:00
Andrew Meadows
33d6e2ce3b avoid mem-leaked entities when clearing tree 2019-02-28 14:21:35 -08:00
Andrew Meadows
ed9ebf84c9 remove unuseful log entry 2019-02-28 14:21:14 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -08:00
Roxanne Skelly
c7b04865ce Remove debugging code, some thread safety changes 2019-02-28 13:58:33 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
Roxanne Skelly
1e1437aab7 Merge branch 'v0.79.HERO-rc' of https://github.com/highfidelity/hifi into 79-hero-avmixer-stress 2019-02-28 12:13:17 -08:00
raveenajain
c1516df58d transforms using joints 2019-02-28 11:35:29 -08:00
amer cerkic
faedc61c37 removing quest-demo specific changes 2019-02-28 10:54:30 -08:00
Thijs Wenker
de3c5e0ffe relative URLs in FST material parsing 2019-02-28 17:51:58 +01:00
Clement
8032063512 Move to LimitedNodeList 2019-02-27 19:14:36 -08:00
Clement
717c12fe16 Add new connection rate limitting 
Limit rate of connection for new Agents
 2019-02-27 18:22:49 -08:00
Simon Walton
db8bd661ce Max domain check-ins was 5, not 4, dammit 2019-02-27 16:50:07 -08:00
Anthony Thibault
72f198fe00
Merge pull request #14904 from hyperlogic/feature/preserve-default-scale 
Case 20943: Animations should preserve avatar joint scale
 2019-02-27 16:49:27 -08:00
Simon Walton
17c0e40347 Add ability to filter on zone-type with JSON filter 2019-02-27 16:42:36 -08:00
Roxanne Skelly
03326cd471 Build fix 2019-02-27 15:58:49 -08:00
Simon Walton
59b9831c1d Revert max check-ins to 4 2019-02-27 15:56:01 -08:00
Anthony Thibault
b5f5900633 Replace animation scale with scale from avatar default pose 
This allows avatars to have scale on their joints without being clobbered by animations.
Renamed variables for easier maintenance.
Also small optimization when no ikNode is present.
 2019-02-27 14:40:08 -08:00
Roxanne Skelly
e2e1edc8b0 Add test logging, stats, and force domain pings to timer thread 
Test code for load testing only.
 2019-02-27 14:13:33 -08:00
David Rowe
d73ff2e855 Revise current MyAvatar API JSDoc 2019-02-28 10:40:10 +13:00
Shannon Romano
c9edf86558
Merge pull request #15040 from SamGondelman/web 
Case 21453: Fix web interaction and debug print filling logs
 2019-02-27 11:19:20 -08:00
luiscuenca
ff7995ae18 Right fix 2019-02-26 18:29:55 -07:00
Simon Walton
08d6a2ce7f Avatar Hero debugging & logging 2019-02-26 16:40:16 -08:00
SamGondelman
4d591e0624 fix web interaction and debug print filling logs 2019-02-26 16:30:31 -08:00
John Conklin II
2449693d8b
Merge pull request #15006 from Atlante45/fix/shared-connection-master 
Case 21407: Delete old nodes with identical socket
 2019-02-26 16:24:03 -08:00
amer cerkic
19d584f0af added Sams suggestions to the logic 2019-02-26 15:28:28 -08:00
Simon Walton
4c071be2bf Merge remote-tracking branch 'upstream/v0.79.HERO-rc' into hero-avatar-zone-79 2019-02-26 15:21:00 -08:00
amer cerkic
f5852139f7 fixing comment since the original check was correct 2019-02-26 15:05:58 -08:00
amer cerkic
5a7c8c3126 removed debugg helpers 2019-02-26 14:53:44 -08:00
amer cerkic
4c6bea48b2 fixed a case where _widths = 0 and widths-1 is not valid. 2019-02-26 14:48:34 -08:00
Simon Walton
7039ee471d Move newly-created Connection to NodeList thread 2019-02-26 13:49:55 -08:00
luiscuenca
f47ec09927 use UP_AXIS_Y 2019-02-26 14:01:30 -07:00
David Rowe
aa53ab7492 Distinguish between Mat4 type and Mat4 API in JSDoc 2019-02-27 09:54:11 +13:00
David Rowe
e79594ef53 Fill in and tidy Avatar JSDoc 2019-02-27 09:53:11 +13:00
Sam Gondelman
f1541c3df4
Merge pull request #15023 from SamGondelman/web 
Case 21171: Web entity thread safety and fixes
 2019-02-26 11:37:46 -08:00
Simon Walton
0b080471ff Filter on scriptValue to reduce EntityItem load; bump ping timeouts for testing 2019-02-26 10:57:35 -08:00
luiscuenca
db1c78246f Read and apply the FBX upVector parameter 2019-02-26 11:32:43 -07:00
Shannon Romano
92168f60c6
Merge pull request #14993 from SamGondelman/untexture 
Case 21071: Handle models with no materials
 2019-02-26 10:07:37 -08:00
SamGondelman
94a82b8304 Merge remote-tracking branch 'upstream/master' into web 2019-02-25 17:23:58 -08:00
Shannon Romano
badd0b8bd3
Merge pull request #14968 from davidkelly/dk/20726 
Guard against accidentally calling wrong api/v1/places endpoint
 2019-02-25 17:16:33 -08:00
SamGondelman
6e4ec15c9d there we go 2019-02-25 17:14:51 -08:00
Shannon Romano
bf3b4e6a57
Merge pull request #15015 from SamGondelman/flying 
Case 21418: Allow flying in HMD if you would otherwise fall forever
 2019-02-25 16:48:57 -08:00
SamGondelman
f482ae3b63 Merge remote-tracking branch 'upstream/master' into untexture 2019-02-25 16:26:14 -08:00
Simon Walton
d6f755955d Add _avatarPriorityChanged to EntityItemProperties::markAllChanged() 2019-02-25 16:24:12 -08:00
Simon Walton
e5091e7f59 Fixes for EntityItem contains test, add MixerAvatar class and use in sort 2019-02-25 15:44:52 -08:00
SamGondelman
f235d04601 trying to fix web crashes 2019-02-25 15:40:17 -08:00
amantley
12dbaa0ea0 changed the condition so that you can turn off ik in hmd mode if you want to for debug purposes 2019-02-25 14:56:17 -08:00
amantley
363c0cc26f moved the update of last ik to outside the if changed statement 2019-02-25 13:03:28 -08:00
amantley
cff0fd470a re-enabled ik off by default on Desktop 2019-02-25 12:23:03 -08:00
SamGondelman
e102ad073e allow flying in HMD if you would otherwise fall forever 2019-02-25 11:49:38 -08:00
Roxanne Skelly
2dffd14fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-25 10:20:52 -08:00