Sabrina Shanman
2fcb526a5c
Merge pull request #16305 from highfidelity/master
...
Merge master into instancing
2019-10-07 15:44:42 -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
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
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
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
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
Simon Walton
d5d1c08da0
Adjust some of the logging
2019-10-03 16:50:24 -07:00
sabrina-shanman
b15771e9fe
Fix build warnings and wrong use of indexOf
2019-10-03 16:47:41 -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
