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
luiscuenca
75f0b4ea54
Fix First Person Camera issues
2019-10-02 14:17:57 -07:00
luiscuenca
059bcc10cc
merge master
2019-10-02 13:24:32 -07:00
Sam Gateau
a1e602b54b
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
2019-10-02 13:17:48 -07:00
Ryan Huffman
dfe17dac67
Add audio input entitlement to mac launcher
2019-10-02 13:14:18 -07:00
Sabrina Shanman
a83d2b4561
Merge pull request #16277 from sabrina-shanman/instancing_too-many-deformers
...
Fix skinning deformer data always being added to graphics::Mesh
2019-10-02 13:04:42 -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
Zach Fox
c9d0dc6991
Merge pull request #16276 from zfox23/moveMutedBanner
...
DEV-2275: Move 'input device muted' banner and make it slightly smaller
2019-10-02 11:58:22 -07:00
Zach Fox
6bfca4e587
DEV-2275: Move 'input device muted' banner and make it slightly smaller
2019-10-02 11:48:50 -07:00
luiscuenca
521aa50356
Set time and angle recentering parameters
2019-10-02 11:43:06 -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
Sam Gateau
9fa349a402
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
2019-10-02 10:22:27 -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
dooglifeSF
86e67afe34
Merge branch 'master' into sit_variants_and_fidgets
2019-10-01 16:52:17 -07:00
dooglifeSF
0ab4075c3b
sit idles and idle fidgets with json edits
2019-10-01 16:51:10 -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
Anthony Thibault
9b956a2f9b
Merge pull request #16271 from luiscuenca/resetCamsKeys
...
DEV-2121: Restore previous control keys for look at camera
2019-10-01 16:12:11 -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
luiscuenca
09f0222285
Restore previous control keys for free camera
2019-10-01 14:18:46 -07:00
luiscuenca
18af7c5d84
Add recenter timer and temp API
2019-10-01 13:44:27 -07:00
Sam Gateau
88e4f2c30e
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
2019-10-01 11:49:33 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt
...
DEV-442: Implement directional blending node for point reaction
2019-10-01 11:46:30 -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
Maia Hansen
220123ff3b
Merge pull request #16254 from kencooke/macos-appnap-disabler
...
BUGZ-1117: On Mac OS, disable App Nap to prevent audio glitches
2019-10-01 10:53:03 -07:00
luiscuenca
d4a74f798c
aimToBlendValues to static function
2019-10-01 10:15:16 -07:00
Anthony Thibault
c2690eb39d
Merge pull request #16268 from luiscuenca/limitRotationWhileSeated
...
DEV-2125: Rotation while seated do not trigger re-centering
2019-10-01 09:33:02 -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
luiscuenca
7c55cee1f0
Limit rotation while seated to not trigger recentering
2019-09-30 17:37:14 -07:00
dooglifeSF
c780f8ad08
Merge branch 'master' into sit_variants_and_fidgets
2019-09-30 17:18:48 -07:00
luiscuenca
0fac1e134f
Allow avatar look at when in first person camera
2019-09-30 16:43:02 -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
Ken Cooke
de5da65757
Use NSActivityUserInitiated instead of NSActivityBackground
2019-09-30 15:48:01 -07:00
Anthony Thibault
7ee5b8e229
Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback
...
Emotes revisions per feedback
2019-09-30 15:46:50 -07:00
Clement
0401015441
Connect aboutToQuit
2019-09-30 15:18:47 -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
