Commit graph

81274 commits

Author SHA1 Message Date
Shannon Romano
f09aa80977
Merge pull request #16278 from huffman/fix/mac-launcher-audio-entitlement
DEV-2291: Add audio input entitlement to mac launcher
2019-10-04 12:19:20 -07:00
Shannon Romano
0b5299162b
Merge pull request #16283 from luiscuenca/fixInAirWhileSitting
DEV-2217: Fix MyAvatar::isInAir() so takes into account the new seated state
2019-10-04 11:56:02 -07:00
Shannon Romano
15394f7a6b
Merge pull request #16284 from roxanneskelly/dev653
DEV-653 - give warning not to change address for cloud domains
2019-10-04 11:54:30 -07:00
Shannon Romano
12a81c41c2
Merge pull request #16293 from roxanneskelly/dev-2044
DEV-2044 - add notification that temporary domains won't show up in domain list
2019-10-04 11:51:50 -07:00
luiscuenca
3a9c829c95
Add MyAvatar::isSeated API method 2019-10-04 11:07:49 -07:00
dooglifeSF
37afabe866 Merge branch 'master' into sit_variants_and_fidgets 2019-10-04 10:29:15 -07:00
RebeccaStankus
31dcbf532f Missed a Capital letter in a function name 2019-10-04 10:10:54 -07:00
Simon Walton
db14cdbd22 Tweak 'critical' status for some logging 2019-10-04 09:56:35 -07:00
RebeccaStankus
8089653784 CR Feedback changes 2019-10-04 09:43:47 -07:00
Seth Alves
fc0874a182 new version of webrtc library for osx 2019-10-04 09:42:36 -07:00
Brad Davis
88514540d1 Fixing tools build 2019-10-04 09:26:33 -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
Sam Gateau
a5ccd07347 Adding the material fields ui yeah, todo: many errors for undefined fields 2019-10-03 22:43:44 -07:00
Sam Gateau
579a27cfb9 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-10-03 21:27:20 -07:00
Simon Walton
6a4406ad12 Put generic stats in sendStatsPacket() stub 2019-10-03 17:46:52 -07:00
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
Sam Gateau
a5c10abcac Working on improving the material inspector 2019-10-03 17:04:40 -07:00
Simon Walton
d5d1c08da0 Adjust some of the logging 2019-10-03 16:50:24 -07:00
Roxanne Skelly
38afa6b5c2 Move to correct place 2019-10-03 16:47:09 -07:00
Roxanne Skelly
8940d990ec DEV-2044 - add notification that temporary domains won't show up in
domain list
2019-10-03 16:17:08 -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
luiscuenca
f7a5895cf3
Apply same random factors to both eyes blink 2019-10-03 14:42:58 -07:00
Zach Fox
0e7dff05fb Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn 2019-10-03 12:55:02 -07:00
Simon Walton
b458098409 Add case of failure to update ICE with metaverse 2019-10-03 12:38:29 -07:00
RebeccaStankus
1dd6aebede Handle minimized window 2019-10-03 12:16:39 -07:00
Simon Walton
59b41e29f4 Call out DS DS logging critical for Lilypad 2019-10-03 12:15:45 -07:00
Roxanne Skelly
04f13cd17e DEV-653 - give warning not to change address for cloud domains 2019-10-03 12:05:10 -07:00
luiscuenca
e0d0ec5852
Fix isInAir so takes into account the new seated state: 2019-10-03 10:36:23 -07:00
Zach Fox
b23aecf6c5 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-03 10:12:58 -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
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