Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 17:09:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
82065 commits 76 branches 59 tags 1.2 GiB
Commit graph

33943 commits

Author SHA1 Message Date
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code 2019-10-23 14:23:29 -07:00
David Rowe
116510225a Typo 2019-10-24 09:10:26 +13:00
David Rowe
9d905dbec4 Merge branch 'master' into DOC-126 2019-10-24 09:05:41 +13:00
David Rowe
777f969919 Typo 2019-10-24 09:00:29 +13:00
amer cerkic
179f5e0873 fixed context switching issue with hmd. included additional output info for other audio crash issues 2019-10-23 12:56:43 -07:00
David Rowe
fffb81b474 Merge branch 'master' into DOC-191 2019-10-24 08:23:27 +13:00
sabrina-shanman
ca164375f1 New skinning for GLTF 2019-10-23 10:41:36 -07:00
Anthony J. Thibault
61b9f08fec Blendshapes for OtherAvatars should update even if no joints have changes. 2019-10-22 22:19:03 -07:00
amer cerkic
0410a45da1 fixed selection issue 2019-10-22 11:11:13 -07:00
amerhifi
a8602195d4 addressing comments 2019-10-22 07:17:57 -07:00
amerhifi
68681fdb2e Merge branch 'master' into amer-dev471-re 2019-10-21 21:04:24 -07:00
Anthony J. Thibault
03f88f696d Renamed LipsTogether to MouthClose and bug fixes. 2019-10-21 19:37:57 -07:00
amerhifi
ec7c8ce13c updated default changes check to account for multiple devicetypes 2019-10-18 16:50:36 -07:00
Anthony J. Thibault
92f1b59cc8 Full legacy API and FST support 2019-10-18 16:30:32 -07:00
amerhifi
421cff1cb2 fixed naming to match standards 2019-10-18 15:30:32 -07:00
amerhifi
c7e1fdaeac adding hmd audio device info to deviceslist 
changing locations

one more

merge

working on the threading issue

changing offices, working on qml

simple qml filtering

fixed spacing problem when item is removed
 2019-10-18 15:29:10 -07:00
Sabrina Shanman
68e39eee2e
Merge pull request #16377 from samcake/instancing 
Instancing: Clean ups, simpler Skin Cluster(s) updates
 2019-10-18 11:46:27 -07:00
Sam Gateau
a95a4b5aa2 Address warnings and comments from review 2019-10-18 11:43:25 -07:00
sabrina-shanman
ad6720240f Introduce hfm::Mesh.clusterWeightsPerVertex 2019-10-18 11:30:48 -07:00
Sabrina Shanman
5d91d22314
Merge pull request #16379 from highfidelity/master 
Merge master into instancing
 2019-10-18 10:24:35 -07:00
Sam Gateau
0321e2c2c3 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-18 10:22:20 -07:00
Sam Gateau
c93ac05994
Merge pull request #16378 from sabrina-shanman/instancing_skinning 
(DEV-559) Move skinning reweighting code out of model prep
 2019-10-18 10:21:26 -07:00
sabrina-shanman
be9931bcab Move skinning reweighting code out of model prep to hfm library; use in FBXSerializer. 2019-10-18 10:08:45 -07:00
Sam Gateau
695b9cdba6 Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform 2019-10-18 03:31:06 -07:00
Sam Gateau
c89e682b77 address warning 2019-10-17 16:24:21 -07:00
Sam Gateau
bd57cc7b14 Fixing bad indexing 2019-10-17 15:56:41 -07:00
luiscuenca
33ea63c708
Fix warnings and update controls 2019-10-17 15:06:12 -07:00
Sam Gateau
55ed7d9a53 Add support for shape generation for obj serializer 2019-10-17 14:53:32 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Sam Gateau
01bb8fa601 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-17 09:55:50 -07:00
Sam Gateau
9159258b50 clean ups 2019-10-16 17:42:36 -07:00
sabrina-shanman
acbdd2b3b5 Fix not building due to removed shape.transform 2019-10-16 17:04:19 -07:00
Brad Hefta-Gaub
6d895942f3
Merge pull request #16350 from ctrlaltdavid/DEV-2391 
DEV-2391: Fix Recording.stopRecording() crash
 2019-10-16 15:33:13 -07:00
luiscuenca
9f0e82e1e6
Improve eye's look at and blinking. Fix look at update 2019-10-16 15:29:28 -07:00
sabrina-shanman
0c3e81f52f Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-16 14:03:01 -07:00
sabrina-shanman
5df4092f67 Merge branch 'instancing_gtlf_wip' into instancing_gltf 2019-10-16 13:40:23 -07:00
Sam Gateau
e9e9d1cdfe Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-16 13:15:40 -07:00
Sam Gateau
af269a4720 Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing 2019-10-16 11:57:15 -07:00
Anthony J. Thibault
389f5a1d33 ARKit Blendshape hookup work 2019-10-16 10:36:39 -07:00
Anthony J. Thibault
6efd74a339 WIP adding blendshapes to input system 2019-10-16 10:36:38 -07:00
Anthony J. Thibault
da0911e01b Delete legacy blendshape code 
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
 2019-10-16 10:36:37 -07:00
Anthony J. Thibault
8411e6b033 Blendshape script API work 
* Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData
  so they are accessable via agent scripts.
* Marked setForceFaceTrackerConnected as depricated.
* Updated jsdoc comments
 2019-10-16 10:36:35 -07:00
Shannon Romano
71ef645781
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed 
Fix sliding when stopping from run.
 2019-10-16 09:03:00 -07:00
Sam Gateau
0a9c389641 last issue 2019-10-16 08:06:35 -07:00
Sam Gateau
fc4a314fd3 Merge branch 'instancing' of https://github.com/highfidelity/hifi into instancing 2019-10-16 04:08:58 -07:00
Sam Gateau
eecaeb1155 FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer 2019-10-16 04:02:05 -07:00
Sam Gateau
f049ab7887 Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model 2019-10-15 18:12:09 -07:00
dooglifeSF
0510215240 Move magic number to constant for SLOW_SPEED_THRESHOLD. 2019-10-15 17:48:06 -07:00
Shannon Romano
bebb21fa9e
Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script 
Bugfix for legacy sit scripts
 2019-10-15 16:19:49 -07:00
Anthony J. Thibault
14e5962675 Bugfix for legacy sit scripts 
Don't return additive clip nodes as valid "roles" for users to override.
 2019-10-15 15:29:24 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction 
First Time User Experience Project
 2019-10-15 14:56:25 -07:00
dooglifeSF
a043f0a17e Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s 2019-10-15 14:51:42 -07:00
David Rowe
185d6990eb Add missing threading checks to Recording API methods 2019-10-16 09:17:29 +13:00
Seth Alves
1f8a7cfea7 fix step translate actions 2019-10-15 09:23:35 -07:00
Sam Gateau
108d331d86 more 2019-10-14 17:45:07 -07:00
sabrina-shanman
acca22e2d6 Remove unused primitive reference in GLTFSerializer 2019-10-14 15:30:03 -07:00
David Rowe
e708cb98bb Fix crash in Recorder.stopRecording() when no recording is being made 2019-10-15 11:29:49 +13:00
sabrina-shanman
2c99ab5e54 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-14 15:05:13 -07:00
Sabrina Shanman
c38462bf6d
Merge pull request #16345 from highfidelity/master 
Merge master into instancing
 2019-10-14 14:54:22 -07:00
sabrina-shanman
82247072de Create new mesh if GLTF primitive has different vertex attributes 2019-10-14 14:51:57 -07:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867 
DEV-1867: Fix toolbarTest.js
 2019-10-14 11:50:59 -07:00
luiscuenca
505813b3c3
Fix blink async and other is talking bug 2019-10-14 10:44:55 -07:00
Sam Gateau
95cabb7597 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-14 10:04:25 -07:00
Shannon Romano
83875089e4
Merge pull request #16328 from Atlante45/fix/account-settings 
DEV-2376: Don't post account settings after pull
 2019-10-14 08:49:22 -07:00
Sam Gateau
05ac9aefa8 the clusterMatrices should be working, but n skin index and weights are assigned yet 2019-10-14 02:21:01 -07:00
Sam Gateau
8af507571c Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-12 20:04:20 -07:00
Sam Gateau
8a1f3648f9 fooling around to get the cluster working 2019-10-11 18:06:44 -07:00
David Rowe
d4c5a20c4f Tablet JSDoc fixes 2019-10-12 11:42:49 +13:00
David Rowe
94f9e35704 Toolbars JSDoc 2019-10-12 11:41:53 +13:00
sabrina-shanman
6b46f8e6c4 Remove empty for loop 2019-10-11 14:51:48 -07:00
sabrina-shanman
99a2fedd5f Quick fix for non-matching vertex attributes in GLTF mesh primitives 2019-10-11 14:16:30 -07:00
David Rowe
f944604120 Deprecate Toolbar API's addButton() and removeButton() methods 2019-10-12 10:10:27 +13:00
David Rowe
1715a86dba Fix typo in Assets JSDoc 2019-10-12 07:58:26 +13:00
David Rowe
e4bc3a7d9d Recording JSDoc 2019-10-12 07:58:13 +13:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
Sam Gateau
336f16e634 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-10 19:27:17 -07:00
Clement
3b21dfcd0a CR 2019-10-10 17:49:51 -07:00
Sam Gateau
a995f2c09f in the middle of something 2019-10-10 17:09:54 -07:00
sabrina-shanman
8e69905e0e Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-10 16:16:37 -07:00
Clement
390c7b14c9 Don't post account settings after pull 
Account settings would always get pushed after a pull even if they
hadn't changed
 2019-10-10 15:55:19 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Ken Cooke
8325ee2c8e
Merge pull request #16327 from kencooke/audio-device-sleep-wake 
DEV-1901: No audio in Interface when restoring from sleep
 2019-10-10 15:12:07 -07:00
Ken Cooke
ec67b67966 On waking from sleep/hibernate, restart the audio devices 2019-10-10 14:10:47 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave 
DEV-1811: apply deletion rules to linked entities
 2019-10-10 13:24:43 -07:00
sabrina-shanman
bf65711e04 Fix build warning with cluster.jointIndex in FBXSerializer 2019-10-10 11:14:58 -07:00
sabrina-shanman
f9dd3a9aec Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-10 10:16:01 -07:00
Sam Gateau
c0e4509095 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-10 09:04:38 -07:00
Sam Gateau
3e8d6671f7 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-10 09:04:22 -07:00
Brad Hefta-Gaub
1316f9b046
Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers 
Drivekey anim triggers
 2019-10-09 18:25:10 -07:00
sabrina-shanman
9fd3d44a0d Make GLTF joint.globalTransform more correct 2019-10-09 17:32:28 -07:00
sabrina-shanman
d3ed0bc71b Remove unused joint/transform calculation in GLTFSerializer 2019-10-09 17:32:27 -07:00
sabrina-shanman
726a91cdb9 Fix un-transformed vertex being added to extents instead of transformed one 2019-10-09 17:32:27 -07:00
sabrina-shanman
0b924eea78 Fix GLTF skinning crash, misc fixes and cleanup 2019-10-09 17:32:27 -07:00
Sabrina Shanman
63fa9afa13
Merge pull request #16323 from highfidelity/master 
Merge master into instancing
 2019-10-09 16:59:54 -07:00
Sam Gateau
9905fc076c Materials of baked models fbx are loading correctly, still using the name/id of the mateiral in the part struct 2019-10-09 16:44:06 -07:00
Maia Hansen
6b5f90f641
Merge pull request #16315 from jherico/qt_5.13 
Qt 5.13 changes
 2019-10-09 15:04:07 -07:00
luiscuenca
fc018257e1
Select avatar to look using API. Blink when look at change 2019-10-09 12:20:35 -07:00
dooglifeSF
85b681e70e switch abs() to fabsf() 2019-10-09 11:07:14 -07:00
dooglifeSF
2a1258968a Change macro to const float, use floats in control flow. 2019-10-09 10:10:45 -07:00
dooglifeSF
8a262a3d1a Merge branch 'master' into drivekey_anim_triggers 2019-10-09 07:37:38 -07:00
Sam Gateau
abaf0262a7 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-08 18:55:51 -07:00
Sam Gateau
1f3993c308 getting the transform right for the rigid bodies 2019-10-08 18:13:24 -07:00
dooglifeSF
cfa7df7d1a Refactor the if-logic to remove complexity 2019-10-08 16:14:21 -07:00
Andrew Meadows
960646f117 skip delete entities not in the tree 2019-10-08 16:12:14 -07:00
Brad Davis
06871a707e Fix byteswap 2019-10-08 16:11:48 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals 
Added flag to ensure mouse event signals are not connected twice
 2019-10-08 15:58:24 -07:00
dooglifeSF
2626f85f49 Handle multiple inputs, bias towards inputZ instead of inputX, and add a deadzone that matches xbox controller analog deadzone 2019-10-08 15:44:06 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging 
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
 2019-10-08 15:35:22 -07:00
RebeccaStankus
458d3bfb48 Renamed variable and made it private 2019-10-08 13:47:06 -07:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Shannon Romano
7aa28f29d2
Merge pull request #16224 from ctrlaltdavid/DOC-111 
DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying
 2019-10-08 10:01:21 -07:00
Sam Gateau
76bb720e12 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-08 09:48:10 -07:00
Sam Gateau
6db302990c
Merge pull request #16297 from jherico/frame-capture 
DEV-632: New format for captured GPU frames
 2019-10-08 09:43:44 -07:00
Shannon Romano
e1de615cbe
Merge pull request #16261 from ctrlaltdavid/BUGZ-491 
BUGZ-491: Fix tablet.loadWebScreenOnTop()
 2019-10-08 09:05:33 -07:00
David Rowe
1106d8fdfa Doc review 2019-10-08 21:15:16 +13:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
Sam Gateau
936ac6f120 REmoving more repetitions of the meshParts 2019-10-07 18:03:33 -07:00
Simon Walton
f73a7c0883 Modified AC logging for paging requirements 2019-10-07 17:35:14 -07:00
Sam Gateau
dd53ace114 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-07 17:21:02 -07:00
Shannon Romano
32ebaed7d3
Merge pull request #16303 from ctrlaltdavid/DOC-188 
DOC-188: Steam JSDoc
 2019-10-07 17:05:20 -07:00
sabrina-shanman
09f584818b Add extent calculation utilities, CalculateExtentsTask, make tangent 
calculation more lenient
 2019-10-07 16:38:01 -07:00
sabrina-shanman
da4ffcd91b GLTF WIP 2019-10-07 16:37:37 -07:00
jennaingersoll
8d8449d8d7
Merge pull request #16166 from ctrlaltdavid/DOC-159 
DOC-159: File JSDoc
 2019-10-07 16:37:11 -07:00
Andrew Meadows
052a0c3ebe remove cruft, add comments, change variable name 2019-10-07 16:23:30 -07:00
jennaingersoll
47aa43f56a
Merge pull request #16251 from ctrlaltdavid/DOC-155 
DOC-155: EntityViewer JSDoc
 2019-10-07 15:45:42 -07:00
Sabrina Shanman
2fcb526a5c
Merge pull request #16305 from highfidelity/master 
Merge master into instancing
 2019-10-07 15:44:42 -07:00
David Rowe
ffb73d5dbf Steam JSDoc 2019-10-08 11:22:19 +13:00
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
Andrew Meadows
8ab70225d9 apply delete rules down linked hierarchy 2019-10-07 14:38:36 -07:00
Andrew Meadows
470a45c012 EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities 2019-10-07 14:38:36 -07:00
Andrew Meadows
5a81ed73fe don't allow null Physics::sessionUUID 2019-10-07 14:38:36 -07:00
Andrew Meadows
aef8ac6bf0 make SpatialParentFinder base class pure virtual 2019-10-07 14:38:36 -07:00
Andrew Meadows
99d0579007 remove updateEntitiesInternal(), make updateEntities() virtual 2019-10-07 14:38:36 -07:00
Andrew Meadows
9557ba80c9 all delete pass through EntitySimulation::prepareEntityForDelete() 2019-10-07 14:38:36 -07:00
Andrew Meadows
03db88009f simplify add/removal to EntitySimulation 2019-10-07 14:38:36 -07:00
Andrew Meadows
c8e875ff72 remove cruft 2019-10-07 14:35:28 -07:00
Andrew Meadows
72ba94f2cd unravel more spaghetti into PhysicalEntitySimulation 2019-10-07 14:35:28 -07:00
Andrew Meadows
86c60204fd move entity Action serialization to PhysicalEntitySimulation 2019-10-07 14:35:28 -07:00
Sam Gateau
42bc91b389 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-07 09:42:14 -07:00
Shannon Romano
5bbe271c7a
Merge pull request #16299 from ctrlaltdavid/DOC-187 
DOC-187: Mat4 JSDoc
 2019-10-07 09:11:32 -07:00
Brad Davis
d69a83a2f2 fix warnings 2019-10-04 18:20:10 -07:00
Sam Gateau
09a8d69555 landing on the new code base 2019-10-04 18:02:45 -07:00
Zach Fox
5e7bb4be91
Merge pull request #16221 from zfox23/handleHrefBetter 
DEV-611: Ensure that entities with the link property set can be clicked in Desktop and VR modes
 2019-10-04 17:36:56 -07:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes 
Fix for Mat4.getForward, getRight and getUp
 2019-10-04 17:00:43 -07:00
David Rowe
70577b8f34 Remove "not working" warnings in anticipation of fix 2019-10-05 12:13:57 +13:00
dooglifeSF
387f0a3f10 add isInput* and isNotInput vars for use in json, and edit json to use them 2019-10-04 15:28:35 -07:00
jennaingersoll
aab66a2675
Merge pull request #16266 from ctrlaltdavid/DOC-107 
DOC-107: Fix description of entity acceleraton property and deprecate
 2019-10-04 15:17:21 -07:00
Shannon Romano
85c79e7931
Merge pull request #16246 from ctrlaltdavid/BUGZ-711 
BUGZ-711: Clarify frustum property values used by Entities.findEntitiesInFrustum()
 2019-10-04 15:05:52 -07:00
Brad Davis
243120b95c Even better frame capture 2019-10-04 14:57:39 -07:00
Anthony J. Thibault
521f64f152 normalize axes returned by Mat4.getForward getUp and getRight 2019-10-04 14:10:28 -07:00
Shannon Romano
24dc4b19ae
Merge pull request #16285 from SimonWalton-HiFi/domain-server-logging-for-paging 
DEV-2292: Alerting requirements for domain-server failure cases
 2019-10-04 14:01:56 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp 
It should match the results from the same methods on the Quat class.
 2019-10-04 13:59:38 -07:00
David Rowe
6e6d438d36 Tidying 2019-10-05 09:34:31 +13:00
David Rowe
a56f82c1ba Mat4 JSDoc 2019-10-05 09:27:31 +13:00
Sam Gateau
c7ca431296 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-04 10:00:41 -07:00
Simon Walton
db14cdbd22 Tweak 'critical' status for some logging 2019-10-04 09:56:35 -07:00
Shannon Romano
5d20baa4d0
Merge pull request #16291 from luiscuenca/fixBlinkAsync 
DEV-2202: Apply same random factors to both eyes blink
 2019-10-04 09:26:19 -07:00
Brad Davis
cc1be64850 Fixing build issues 2019-10-04 09:20:02 -07:00
Brad Davis
3c6e98f16b New format for captured GPU frames 2019-10-04 08:34:06 -07:00
Simon Walton
d5d1c08da0 Adjust some of the logging 2019-10-03 16:50:24 -07:00
sabrina-shanman
30680e027b Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-03 16:49:31 -07:00
sabrina-shanman
b15771e9fe Fix build warnings and wrong use of indexOf 2019-10-03 16:47:41 -07:00
sabrina-shanman
5f0addf136 Merge branch 'instancing' into instancing_gltf 2019-10-03 16:04:05 -07:00
Roxanne Skelly
607828d630
Merge pull request #16273 from roxanneskelly/dev1836 
DEV-1836 - handle urls in the form 'hifi://<domain>:<port>
 2019-10-03 16:01:46 -07:00
sabrina-shanman
41de373570 Fix not allocating shapeVerticesPerJoint in CollectShapeVerticesTask.cpp 2019-10-03 15:17:26 -07:00
sabrina-shanman
e47078727c Merge branch 'instancing' into instancing_fbx 2019-10-03 14:54:19 -07:00
sabrina-shanman
e8d421fa35 Fix transforms and other issues with FBXSerializer 2019-10-03 14:46:21 -07:00
luiscuenca
f7a5895cf3
Apply same random factors to both eyes blink 2019-10-03 14:42:58 -07:00
sabrina-shanman
4a8cdee38a Update HFM format and deprecate hfm::TransformNode 2019-10-03 14:30:03 -07:00
Simon Walton
59b41e29f4 Call out DS DS logging critical for Lilypad 2019-10-03 12:15:45 -07:00
sabrina-shanman
ba6833df8f Make small improvements to FBXSerializer code changes 2019-10-03 10:52:05 -07:00
Zach Fox
5f1c389d1c DEV-611: Ensure that entities with the property set can be clicked in Desktop and VR modes 2019-10-03 09:45:23 -07:00
Shannon Romano
37f18e2e5e
Merge pull request #16269 from SimonWalton-HiFi/asset-scripting-wait-for-init 
DEV-1898: Make Assets.initializeCache() script i/f blocking
 2019-10-03 09:31:21 -07:00
Roxanne Skelly
fb8a0e3aee handle urls in the form of <domain>:<port>/path 2019-10-02 16:40:27 -07:00
sabrina-shanman
ff5fef9c3a Update FBXSerializer to reference shapes, support instancing (deformers 
WIP)
 2019-10-02 15:50:37 -07:00
sabrina-shanman
bac22c69c1 Move ExtractedMesh out of HFM 2019-10-02 15:47:39 -07:00
Sam Gateau
001718224e fine tune the recent changes to be able to return to rendering of the hfm::Mesh loaded, not the shapes yet 2019-10-02 14:39:00 -07:00
Sam Gateau
a1e602b54b Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-02 13:17:48 -07:00
sabrina-shanman
6eed3e43bc Fix skinning deformer data being added to graphics::Mesh even if the mesh has no skinning 2019-10-02 13:03:19 -07:00
Sam Gateau
9b9f91ab85 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-02 10:22:43 -07:00
Sam Gateau
79fa9461de Merge branch 'instancing' of github.com:samcake/hifi into instancing 2019-10-02 10:22:35 -07:00
Ryan Huffman
6fc03637b5
Merge pull request #16274 from amerhifi/master 
dev- 470: Audio device rename and reduction of audio output spam
 2019-10-02 09:18:22 -07:00
Sam Gateau
dcfc3cddd2 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-01 19:50:33 -07:00
Sabrina Shanman
2468b5affc
Merge pull request #16263 from sabrina-shanman/instancing_collectshapevertices 
(DEV-654) Define ShapeVertices in model preparation step
 2019-10-01 17:15:28 -07:00
Roxanne Skelly
9af7b904ab CR related fixes 2019-10-01 17:04:07 -07:00
amer cerkic
c0a852d68c updated audio wording and removed audio defaul spamming. 2019-10-01 16:55:37 -07:00
Anthony Thibault
f8167e04d0
Merge pull request #16272 from hyperlogic/bug-fix/stuck-in-network-idle-role 
Fix for avatars that are stuck in idle pose for observers
 2019-10-01 16:48:26 -07:00
Roxanne Skelly
0589cb360a Merge branch 'master' of https://github.com/highfidelity/hifi into dev1836 2019-10-01 15:38:02 -07:00
Roxanne Skelly
d0cb489247 DEV-1836 - handle urls in the form 'hifi://<domain>:<port> 2019-10-01 15:34:39 -07:00
Anthony J. Thibault
1068637d39 Fix for avatars that are stuck in idle pose for observers 
The problem can occur because the default constructor for the NetworkAnimState does not initialize the blendTime member.
This can cause the avatar to remain stuck in an idle pose for observers when blendTime happens to be randomly initialzied to a large negative floating point value.
To fix this we explicitly initialize it to FLT_MAX.

Additionally, a debug print has been added to help diagnose this issue if it occurs again.
 2019-10-01 14:28:10 -07:00
sabrina-shanman
5c991ec87d Merge branch 'master' into instancing 2019-10-01 11:33:10 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
Simon Walton
95248c7ccd Add <future> header for Android 2019-09-30 23:43:06 -07:00
Simon Walton
595b473be7 Make AssetScriptingInterface::initializeCache() blocking 2019-09-30 17:55:24 -07:00
Shannon Romano
2896cde447
Merge pull request #16265 from Atlante45/feat/shutdown-annotation 
DEV-2223: Add shutdown annotations for crash reporting
 2019-09-30 16:38:23 -07:00
Shannon Romano
e8f1eecc5b
Merge pull request #16258 from samcake/yellow 
DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches
 2019-09-30 16:36:24 -07:00
David Rowe
be3947f6a7 Fix description of entity acceleraton property and deprecate 2019-10-01 11:16:15 +13:00
Atlante45
a4c857315a Add shutdown annotations for crash reporting 2019-09-30 14:54:17 -07:00
Sam Gateau
1e2cab52b9 FIx an error, bad copy paste leading to a bug 2019-09-30 12:55:04 -07:00
Shannon Romano
95b219475d
Merge pull request #16260 from jherico/warnings 
BUGZ-1596: Cleaning up android build warnings
 2019-09-30 11:58:21 -07:00
Sam Gateau
c8663f7fe6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-30 09:18:23 -07:00
sabrina-shanman
f773bdeca2 Remove unused variable 2019-09-30 09:07:42 -07:00
Sam Gateau
8c9cf7bddd Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-27 19:01:19 -07:00
sabrina-shanman
b4c50b3f48 Remove unused parameter from getReweightedDeformers 2019-09-27 17:46:12 -07:00
sabrina-shanman
cd94dc15f9 Add CollectShapeVerticesTask 2019-09-27 17:14:09 -07:00
David Rowe
3b9884c76f Fix build warning 2019-09-28 11:42:25 +12:00
David Rowe
3d667b4a21 Deprecate tablet.gotoWebScreen()'s loadOtherBase parameter 2019-09-28 11:30:57 +12:00
Brad Davis
f550d6c4fb More warnings 2019-09-27 15:46:52 -07:00
David Rowe
c79581e93f Update JSDoc 2019-09-28 10:19:29 +12:00
David Rowe
bbf6d3f595 Remove unused code 2019-09-28 10:19:00 +12:00
Brad Davis
8724106685 Trying to fix mac build: 2019-09-27 14:55:42 -07:00
David Rowe
2e2d3df26f Fix loadWebScreenOnTop() 2019-09-28 09:38:19 +12:00
David Rowe
e9d138a961 Rename internal function to distinguish signatures and reflect function 2019-09-28 09:29:27 +12:00
Sam Gateau
ecd940e0e6 Addressing warnings 2019-09-27 14:01:00 -07:00
Howard Stearns
f513b65e9d
Merge pull request #16256 from SimonWalton-HiFi/supress-repeated-socket-logging 
BUGZ-1543: Suppress repeated socket logging
 2019-09-27 12:45:17 -07:00
Sam Gateau
57f8095506 Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script 2019-09-27 12:00:45 -07:00
Sam Gateau
25bcc31b72 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-27 09:24:25 -07:00
Brad Davis
403499bf32 Cleaning up android build warnings 2019-09-27 09:19:52 -07:00
Brad Davis
9518aa9ed0 . 2019-09-27 08:33:55 -07:00
Sam Gateau
4d94cbe0d8 Pass 3rd of the hope to clean it up... 2019-09-27 00:29:10 -07:00
sabrina-shanman
2077da6f37 Create ReweightDeformersTask 2019-09-26 17:06:41 -07:00
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -07:00
Simon Walton
93a1cbdcf9 Use direct initialization instead of copy initialization for atomics 2019-09-26 16:45:29 -07:00
Andrew Meadows
f3aa534327
Merge pull request #16239 from AndrewMeadows/cleanup-mortal-entities 
BUGZ-1510: don't forget to cleanup expired mortal entities
 2019-09-26 16:20:27 -07:00
Simon Walton
f17a1c17f3 Only print Qt event-queue size on change of error code 2019-09-26 15:46:11 -07:00
David Rowe
57649811d7 Update JSDoc of TabletProxy internal functions 2019-09-27 09:17:48 +12:00
Simon Walton
85c9f4d95f Use the FCDEBUG mechanism to throttle udt::Socket log-spam 2019-09-26 12:10:59 -07:00
Sam Gateau
675dbc3f7f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-26 12:06:09 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Simon Walton
bbf43050b1
Merge pull request #16244 from SimonWalton-HiFi/connection-class-ignored-unused 
BUGZ-1503: Don't move unused Connection class upon address change
 2019-09-26 11:42:50 -07:00
Sam Gateau
ba11c3e702 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-25 17:54:21 -07:00
Sam Gateau
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
Amer
1e94a82ee6
Merge pull request #16196 from amerhifi/dev469 
DEV-469: Default Audio device
 2019-09-25 16:28:00 -07:00
Brad Davis
56f01cb7bd Merge remote-tracking branch 'upstream/instancing' into instancing 2019-09-25 16:27:22 -07:00
sabrina-shanman
af460d7f5f Add hfm::Shape::transformedExtents. Mark select hfm fields as 
deprecated.
 2019-09-25 16:11:48 -07:00
David Rowe
8b2d9427bb Update description of the entities available to the Entities API 2019-09-26 10:54:12 +12:00
Atlante45
ff3f26eeae Limit the amount of account settings pull retries 2019-09-25 14:55:44 -07:00
amer cerkic
73f14d812f addressing cr comments 2019-09-25 13:22:50 -07:00
Simon Walton
6ccfc37f27 Merge remote-tracking branch 'upstream/master' into connection-class-ignored-unused 2019-09-25 13:06:32 -07:00
Brad Hefta-Gaub
06c7a92c27
Merge pull request #16243 from Atlante45/fix/account-settings 
DEV-648: Add flag for account settings feature
 2019-09-25 11:20:14 -07:00
Brad Hefta-Gaub
068fb0e177
Merge pull request #16240 from ctrlaltdavid/BUGZ-577 
BUGZ-577: Implement Recording.setPlayerVolume()
 2019-09-25 10:31:57 -07:00
Simon Walton
6d7f711990 Remove typo that somehow got into a comment 2019-09-25 09:33:49 -07:00
Brad Davis
911fd27fc5 wip 2019-09-25 09:30:35 -07:00
David Rowe
16c33ebbec Clarify frustum property values used by Entities.findEntitiesInFrustum() 2019-09-25 19:29:20 +12:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
Clement
5067729c52 Add flag for account settings feature 2019-09-24 17:40:34 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
Simon Walton
4f11e46b5e Don't move Connection class to changed address until it's used 2019-09-24 16:39:59 -07:00