Commit graph

81228 commits

Author SHA1 Message Date
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
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -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
Shannon Romano
ae259ef9fd
Merge pull request #16267 from luiscuenca/addHeadLookAtToFPCamera
DEV-625: Free Look Camera in first person mode
2019-10-03 09:28:54 -07:00
dooglifeSF
ebd0b06475 animation revisions after checking them in a standup group 2019-10-02 17:18:36 -07:00
RebeccaStankus
94e71e1bdd Still trying get QML gridLayouts to work 2019-10-02 17:14:50 -07:00
Roxanne Skelly
fb8a0e3aee handle urls in the form of <domain>:<port>/path 2019-10-02 16:40:27 -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
Ryan Huffman
dfe17dac67 Add audio input entitlement to mac launcher 2019-10-02 13:14:18 -07:00
RebeccaStankus
b1fd6050c7 Merged Zach's work 2019-10-02 12:55:51 -07:00
RebeccaStankus
47841d9bcd Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-02 12:42:53 -07:00
RebeccaStankus
dc15b55aa5 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-02 12:05:34 -07:00
RebeccaStankus
8684df185e
Merge pull request #1 from zfox23/friction
Improved random avatar selection logic, plus local avatars
2019-10-02 12:04:50 -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
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
Zach Fox
50b06a40d7 Improved random avatar selection logic, plus local avatars 2019-10-01 17:22:24 -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
RebeccaStankus
d2e62749c7 Ready for Zach to add default avatar changes 2019-10-01 16:36:06 -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
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
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
RebeccaStankus
3167dc9a35 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-01 09:59:14 -07:00
RebeccaStankus
0dfb234089 Finished UI, ready for CR 2019-10-01 09:58:44 -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
RebeccaStankus
6658e6377c Adding 1 simplifiedUI constant import 2019-09-30 15:06:31 -07:00
RebeccaStankus
0f1190df8b Trying to make QML UI work second launch 2019-09-30 15:03:58 -07:00