7043 commits

Author	SHA1	Message	Date
Rebecca Stankus	83a6155592	Added tons of logging to debug interactive window	2019-10-24 12:06:49 -07:00
Anthony J. Thibault	d43d12dfa7	Merge branch 'master' into feature/arkit-blendshapes	2019-10-23 21:45:10 -07:00
Zach Fox	a6bcbe4c66	DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial	2019-10-23 14:32:03 -07:00
Zach Fox	df782edcd9	DEV-2541: Update 'Jump To' top bar expanded text	2019-10-23 11:14:22 -07:00
dooglifeSF	b8a607dcf0	remove unused slow speed sidesteps	2019-10-22 11:53:59 -07:00
David Rowe	378c47d16c	Replace world detail quality float with enum	2019-10-22 19:18:11 +13: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
dooglifeSF	b914bb60fe	Change strafeleft<->straferight transitions to isMoving vars and remove the sidesteps from the blendranges	2019-10-21 14:15:31 -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
luiscuenca	33ea63c708	Fix warnings and update controls	2019-10-17 15:06:12 -07:00
luiscuenca	63c2b41929	Restate legacy first person camera mode	2019-10-17 13:26:42 -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
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
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
Sabrina Shanman	b8df1c180f	Merge pull request #16343 from jherico/fix/DEV-2375 ... DEV-2375: ensure web entities stop playing audio	2019-10-14 13:04:57 -07:00
Zach Fox	341abb8185	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-14 12:36:35 -07:00
Brad Davis	6c35387b8d	also fix DEV-2083	2019-10-14 10:56:23 -07:00
Brad Davis	95b5c8a905	DEV-2375: ensure web entities stop playing audio	2019-10-14 10:46:32 -07:00
Zach Fox	c8b975b2f1	Merge pull request #16342 from zfox23/newInvalidatedLanguage ... DEV-2334: New 'Item Invalidated' language in Inventory	2019-10-14 13:28:33 -04:00
Zach Fox	b45156b44c	Merge pull request #16337 from RebeccaStankus/locationText ... Added blank placeholder text on focus to text field	2019-10-14 12:35:29 -04:00
Zach Fox	7bd550e37b	DEV-2334: New 'Item Invalidated' language in Inventory	2019-10-14 09:30:44 -07:00
Rebecca Stankus	21503137d4	Added blank placeholder text on focus to text field	2019-10-11 14:42:39 -07:00
dooglifeSF	96510429ba	Fix stand talking pops	2019-10-11 10:44:50 -07:00
dooglifeSF	df11977b39	remove all transitions from seated except idle via isNotSeated	2019-10-11 09:54:10 -07:00
Zach Fox	2220234d68	Removed yellow	2019-10-09 14:33:28 -07:00
Zach Fox	bed1192d70	A bunch of fixes, plus added a debug mode Settings switch	2019-10-09 14:18:36 -07:00
Zach Fox	5871e6b83a	Host avatars remotely	2019-10-08 17:39:57 -04:00
Zach Fox	17478af32d	Remove debug code	2019-10-08 17:31:35 -04:00
Zach Fox	42bf2bf30e	All windows 'done' except for final tweaks; debug mode still ON	2019-10-08 13:17:04 -04:00
Zach Fox	a23bee19e8	Controls screen done	2019-10-07 19:52:22 -04:00
Zach Fox	643dd21f86	Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration	2019-10-07 13:22:08 -04: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
RebeccaStankus	2f2b7b0306	Ready for CR Thank you Zach	2019-10-03 17:30:47 -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	33b8942ffd	Changes to Avatar/Profile App complete	2019-10-03 09:41:30 -07:00
dooglifeSF	ebd0b06475	animation revisions after checking them in a standup group	2019-10-02 17:18:36 -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
Zach Fox	50b06a40d7	Improved random avatar selection logic, plus local avatars	2019-10-01 17:22:24 -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
RebeccaStankus	d2e62749c7	Ready for Zach to add default avatar changes	2019-10-01 16:36:06 -07:00
luiscuenca	09f0222285	Restore previous control keys for free camera	2019-10-01 14:18:46 -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
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	7ee5b8e229	Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback ... Emotes revisions per feedback	2019-09-30 15:46:50 -07:00
dooglifeSF	5cfa1cb5ba	Merge branch 'master' of https://github.com/highfidelity/hifi into sit_variants_and_fidgets	2019-09-30 09:38:45 -07:00
RebeccaStankus	68f52584cf	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-09-30 09:19:15 -07:00
David Rowe	cd6d9b57c4	Fix Blocks script displaying a blank page	2019-09-28 11:30:56 +12:00
RebeccaStankus	de4e8b9cc4	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-09-27 09:16:26 -07:00
RebeccaStankus	f4ecd3dcd8	Working on initial/second launch	2019-09-27 09:15:39 -07:00
luiscuenca	ea23a82f33	Make mouse pitch less sensitive	2019-09-26 15:14:47 -07:00
luiscuenca	1b064a0ebe	Fix Q key on first person cam. Let camera control flying Y axis	2019-09-26 14:29:01 -07:00
dooglifeSF	0fa7220750	tilt head down slightly to minimize crazy eyes	2019-09-25 15:27:11 -07:00
dooglifeSF	a8fa3a136c	emote revisions, json tuning	2019-09-25 14:47:07 -07:00
luiscuenca	0aab2ed07f	Disable head look at when pointing	2019-09-25 12:37:24 -07:00
milad	aba6a28d54	updated camera modes	2019-09-25 11:05:32 -07:00
milad	39d96b76a6	fixed help text	2019-09-25 08:41:38 -07:00
luiscuenca	7c4fe39918	Add point directional blending node to animation json	2019-09-24 18:24:27 -07:00
luiscuenca	ad79393e1f	Implement point at directional blend and API	2019-09-24 17:55:38 -07:00
milad	677dbe59cc	fixed qml typo	2019-09-24 16:47:07 -07:00
milad	edb135776a	Added selfie view and updated help	2019-09-24 16:44:34 -07:00
Shannon Romano	73c558bc51	Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle ... Transition between walk/emote should be faster	2019-09-24 15:49:31 -07:00
RebeccaStankus	982bdf5c98	Prereq work for 'Reduce User Friction'	2019-09-23 16:49:16 -07:00
dooglifeSF	7307bea16f	speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle	2019-09-23 16:45:35 -07:00
dante ruiz	b478a22ed2	fix edge case	2019-09-20 15:25:10 -07:00
Shannon Romano	bd488f0196	Merge pull request #16144 from luiscuenca/addLookAtThirdCamera ... DEV-391: Keyboard Input Controls Camera Not Avatar Orientation	2019-09-20 13:03:03 -07:00
Anthony Thibault	fecef584c9	Merge pull request #16226 from danteruiz/fix-snap-html-issue ... BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page	2019-09-20 12:39:01 -07:00
dante ruiz	fe2a4c3600	fix fix-snap-html-issue	2019-09-19 18:20:08 -07:00
Zach Fox	97ef2c030e	Merge pull request #16223 from zfox23/simplifiedGoToIteration ... Whoops! New placeholder text color	2019-09-19 16:40:48 -04:00
Zach Fox	10352f1cb2	New placeholder text color	2019-09-19 13:38:37 -07:00
luiscuenca	279e25ca70	Merge master	2019-09-19 13:21:49 -07:00
Zach Fox	a472e723e2	Merge pull request #16222 from zfox23/simplifiedGoToIteration ... BUGZ-1529: Iteration on JumpTo Field visuals/interaction states	2019-09-19 16:13:21 -04:00
Zach Fox	5077089518	BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap	2019-09-19 11:15:53 -07:00
luiscuenca	6d98537a20	Clean up code and refactor avatar-animation.json	2019-09-19 10:45:20 -07:00
Zach Fox	5e96ce8822	DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR	2019-09-19 09:48:11 -07:00
luiscuenca	fc223e4cb6	Reverse the up/down arrow keys if in selfie mode	2019-09-18 17:15:25 -07:00
luiscuenca	7bc8e6b237	Solved some sitting and sound issues while looking at	2019-09-18 17:00:10 -07:00
Shannon Romano	e7001c3f1b	Merge pull request #16157 from sethalves/vive-pro-groundwork ... DEV-605: Vive pro groundwork	2019-09-18 16:36:12 -07:00
Shannon Romano	0be972062d	Merge pull request #16207 from hyperlogic/bug-fix/sitting-bug-fixes ... Sit bug fixes	2019-09-18 16:20:51 -07:00
Zach Fox	f92c5d0882	DEV-576: Allow users to type HiFi locations into the SimplifiedUI top bar just like GOTO	2019-09-18 14:39:11 -07:00
Zach Fox	59184edc89	DEV-521: Update Emoji window's search field to display emoji's name during hover	2019-09-18 13:37:46 -07:00
luiscuenca	1054e8fcde	Selfie camera and updated camera menus	2019-09-17 17:15:16 -07:00
Anthony J. Thibault	1157d59f67	Sit bug fixes ... * You should not be able to move after being seated, even if you switch seats. * You should not be able to jump out of the chair by holding the space bar. * Fixed small issue with the sitting to standing transition being delayed. (causing the user to look like there were sitting in mid-air) This was due to a missing transition in the animation.json	2019-09-17 13:40:43 -07:00
Zach Fox	60f4189eb3	BUGZ-1485: Fix Copyright date in About dialog	2019-09-17 11:36:12 -07:00
Seth Alves	943348ba51	input action channels for eyes and eyelids and fingers. connect eyelid input actions to blendshapes.	2019-09-17 09:43:20 -07:00
Shannon Romano	dd0b527d63	Merge pull request #16185 from huffman/fix/hifi-log-login ... BUGZ-1441: Update logo on login popup Build failure is on Android not communicated to Docker.	2019-09-16 13:15:58 -07:00
Shannon Romano	79d845d127	Merge pull request #16190 from danteruiz/fix-html ... BUGZ-1398: HMD Tablet Apps blocked by Web access error	2019-09-13 12:35:29 -07:00
danteruiz	8491a37923	fixing WebEntities html	2019-09-13 09:57:51 -07:00
Ryan Huffman	5370e67507	Update logo on login popup	2019-09-12 14:48:21 -07:00
Zach Fox	a5504c3780	Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode ... BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode	2019-09-11 15:05:44 -07:00
luiscuenca	7c7c3cd223	merge master	2019-09-11 14:07:19 -07:00
Shannon Romano	65d0bb1342	Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc ... Kasen Plugin Infrastructure v½ Codename "Modkit Mini"	2019-09-11 13:04:01 -07:00
MiladNazeri	a9da5b8f16	Update interface/resources/qml/hifi/audio/Audio.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-09-11 12:45:18 -07:00
MiladNazeri	d95a803324	Update interface/resources/qml/hifi/audio/Audio.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-09-11 12:44:59 -07:00
milad	3cf56210b2	modified Audio.qml to handle desktop audio level meter visible	2019-09-11 12:30:24 -07:00
Zach Fox	50ba55a988	Protect against engine not returning a valid CPU/GPU object	2019-09-10 13:03:40 -07:00
Zach Fox	e52d65a7bc	BUGZ-1451: Update links in controller reference	2019-09-10 11:31:51 -07:00
Zach Fox	eb286d992e	Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound ... Emoji app duplicates sound on opening from toolbar	2019-09-09 11:27:26 -07:00
RebeccaStankus	33b78bea4f	Changed textField module sounds	2019-09-09 10:36:35 -07:00
luiscuenca	3b8d3f987d	Add animation	2019-09-06 14:31:53 -07:00
luiscuenca	0e4e09acb5	Add blending	2019-09-06 14:30:10 -07:00
luiscuenca	189ddf39e2	Merge branch 'master' into addLookAtThirdCamera	2019-09-06 14:29:51 -07:00
dooglifeSF	422ad52a87	Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges	2019-09-06 13:57:33 -07:00
luiscuenca	78eee5961c	Fix key mapping for new camera	2019-09-05 18:05:46 -07:00
dooglifeSF	b5d2675a05	Merge branch 'master' into Sitting_emote_variants	2019-09-05 16:45:24 -07:00
dooglifeSF	5061aca487	Update sitting_emote_raisehand03_all.fbx	2019-09-05 16:44:13 -07:00
dooglifeSF	9cfa4753d9	sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit	2019-09-05 15:31:07 -07:00
humbletim	271fac4bca	Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge	2019-09-05 09:46:21 -04:00
milad	5fdcf0ecaf	updated setting name and changed default value to true for show tray	2019-09-04 12:59:17 -07:00
milad	669fef763a	removed logs	2019-09-03 18:11:56 -07:00
milad	44e518f5a1	working fix	2019-09-03 18:06:25 -07:00
dooglifeSF	6b3dfd6d56	sitting emote raised hand 03 wip	2019-09-03 16:53:36 -07:00
Jamil Akram	a9d8f105ae	Merge pull request #16112 from dooglifeSF/Anim_memory_reduction ... Anim memory reduced ~10mb by removing static channels	2019-09-03 10:08:02 -07:00
Bradley Austin Davis	8e3b337a6e	Merge pull request #16120 from jherico/fix/bugz-1365 ... BUGZ-1365: prevent server scripts from accessing local files in HTML controls	2019-08-30 13:10:09 -07:00
Brad Davis	31340d278a	Add test for local file access	2019-08-29 13:45:43 -07:00
dooglifeSF	974b18b16b	Export one more that used to be hosted. I moved it to the source repo.	2019-08-28 14:16:57 -07:00
dooglifeSF	577a82f750	Export animations, remove static channels. Remove unused joints. Exclude all scene data from fbx.	2019-08-28 10:10:39 -07:00
dooglife@gmail.com	01b912210a	json tuning to minimize the double-blend reduced animation effect, and to address some Joshua feedback	2019-08-23 15:06:31 -07:00
dooglife@gmail.com	e8492beb4a	Merge branch 'master' into tweak_sit_pose	2019-08-23 14:21:09 -07:00
Shannon Romano	86518d222d	Merge pull request #16089 from RebeccaStankus/MuteIssues ... Push To Talk Bugs 1207/1208	2019-08-23 10:42:16 -07:00
dooglife@gmail.com	fed14ac588	Merge branch 'master' into tweak_sit_pose	2019-08-23 09:34:45 -07:00
dooglife@gmail.com	01e98e194a	animation tuning pass	2019-08-22 16:48:41 -07:00
Andy Howell	f5767168ed	Merge pull request #16035 from MiladNazeri/emojiAppAdd ... Using my superpowers to get this in the build.	2019-08-22 16:10:22 -07:00
RebeccaStankus	6e96b800b6	Engine handles turning PTT off if unmuting	2019-08-22 13:22:45 -07:00
Zach Fox	7c4a0545c4	BUGZ-1327: Fix PTT icon when PTTing and clipping	2019-08-22 12:51:34 -07:00
dooglife@gmail.com	75dd4d8da9	json tuning, adding cheer/disbelief anim block-ins, BUG: these are tposing here so do not merge - this is a test	2019-08-22 11:50:22 -07:00
Zach Fox	330b8ceb91	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-22 10:24:00 -07:00
dooglife@gmail.com	ec06a02fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into tweak_sit_pose	2019-08-21 08:46:59 -07:00
Zach Fox	70b3f44f8c	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 14:04:35 -07:00
RebeccaStankus	cc22386f06	CR feedback changes	2019-08-20 13:29:02 -07:00
Zach Fox	780a081d16	Remove unused TabletAddressDialog internal property, fixing BUGZ-1294	2019-08-20 12:05:00 -07:00
Zach Fox	41d992a307	Merge pull request #16078 from zfox23/helpSupport1 ... DEV-412: Implement Support tab in Help app	2019-08-20 11:57:44 -07:00
dooglifeSF	8d05d9e5d4	fix the worst of the mismatched emote poses for the eval mtg	2019-08-20 11:57:20 -07:00
Zach Fox	bb97b4f866	Fix BUGZ-1303: Make 'View All Controls' go to knowledge base	2019-08-20 11:17:05 -07:00
Anthony Thibault	2b74e2a7fa	Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes ... Avatar sitting bug fixes	2019-08-20 11:09:25 -07:00
Zach Fox	0cc28c58ae	DEV-415: Implement Support tab in Help app	2019-08-20 10:54:58 -07:00
dooglifeSF	8a3b93b913	add 3 sits with different hand placements for eval - also 2 new sit emotes	2019-08-20 10:35:56 -07:00
RebeccaStankus	e48e733343	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 09:01:18 -07:00
Zach Fox	78edfb9af9	Remove 'About' tab from Settings	2019-08-19 17:22:38 -07:00
Zach Fox	b40d5658e3	Moved a timer from JS to QML; progress circle on Emote Indicator	2019-08-19 15:12:48 -07:00
Jamil Akram	a3919af747	Merge pull request #16062 from dooglifeSF/animation_json_tuning ... Tuning pass on anim-graph, using the new blend modes and engine features	2019-08-19 14:02:37 -07:00
Zach Fox	14a04dfb1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 13:52:35 -07:00
Zach Fox	35a2cb7f27	BUGZ-1295: Fix typo in Help > Controls > Turn Right	2019-08-19 13:08:42 -07:00
Zach Fox	42705c2fea	Combine conditional statements	2019-08-19 11:04:54 -07:00
Zach Fox	2b86947d4a	Mipmap images; better padding	2019-08-19 10:32:08 -07:00
Zach Fox	3de9f44bf3	It's working	2019-08-16 16:00:30 -07:00
Zach Fox	4c006c50aa	Controls almost done	2019-08-16 15:53:30 -07:00
Anthony J. Thibault	381f7c6bc4	Avatar sitting bug fixes ... * Added seatedToIdle transition, to make transition quicker to better match the capsule physics. * Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms. * Created "isNotSeated" anim var for exiting the seated state. * MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called. * MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation. Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing. * Disable leg IK in HMD mode while seated.	2019-08-16 10:57:03 -07:00
Zach Fox	a053f9ed9e	Impelement settingChanged; clean up some emoteIndicatorVisible code	2019-08-15 17:00:27 -07:00
Zach Fox	0338b0258c	Add Search to Emoji window and clean up some code	2019-08-15 12:21:29 -07:00
Zach Fox	143c3e966c	Big optimizations to Emoji window	2019-08-15 10:58:13 -07:00
dooglifeSF	2f3f6be693	Tuning pass on anim-graph, using the new blend modes and engine features.	2019-08-14 15:18:19 -07:00
RebeccaStankus	0645796e74	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-14 13:28:08 -07:00
RebeccaStankus	8728640f60	Initial CR changes	2019-08-14 12:03:49 -07:00
Zach Fox	52c4d4fe69	better FAQ	2019-08-14 09:31:08 -07:00
Zach Fox	7297ac9a09	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-14 09:11:04 -07:00
Shannon Romano	1011880698	Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation ... (BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away	2019-08-09 17:28:46 -07:00
Zach Fox	66199297cb	button	2019-08-09 12:24:37 -07:00
Zach Fox	dc2e08ef6b	Initial integration of browser	2019-08-09 12:05:03 -07:00
sabrina-shanman	49f1ecb1bf	Fix new bugs in TabletLODTools.qml	2019-08-09 11:41:11 -07:00
Anthony J. Thibault	733d7455f4	new seated talking anim	2019-08-09 08:52:38 -07:00
Anthony J. Thibault	b4869508a0	updated clap	2019-08-08 14:47:31 -07:00
sabrina-shanman	8347d9d23e	Update LODManager setter in TabletLODTools.qml	2019-08-08 13:59:50 -07:00
Anthony J. Thibault	ef81ccafed	Hooked up seated clap	2019-08-08 13:02:19 -07:00
Anthony J. Thibault	5d405cac3b	Merge branch 'master' into feature/reaction-intro-loop-outro	2019-08-08 09:56:45 -07:00
Anthony J. Thibault	317c2f5219	sitting raise hand	2019-08-08 09:37:03 -07:00
Anthony J. Thibault	e5e012a83e	agree, point and disagree sitting emotes	2019-08-07 14:15:29 -07:00
Zach Fox	72e14a32f9	Implement the Help App skeleton; Implement Help App Controls; Implement Help App About	2019-08-07 17:13:20 -04:00
Anthony J. Thibault	147753309f	Updated clap02 with new version that is not as slow.	2019-08-06 17:57:27 -07:00
Anthony J. Thibault	3f6b488f27	Added intro-loop-outro phases for raiseHand, applaud and point	2019-08-06 17:39:30 -07:00
sabrina-shanman	bc3acfa3c0	Clean up and re-name to reflect what uses octreeSizeScale and what uses ... visibilityDistance	2019-08-06 15:46:10 -07:00
milad	75708170dd	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 13:23:32 -07:00
milad	1a95c126c3	working version but taking a snapshot of added emoji code before removing for handoff	2019-08-06 13:13:38 -07:00
Zach Fox	8b85bbfe67	Merge pull request #16034 from zfox23/masterGPU ... BUGZ-1103: Use 'Master GPU' information in About screen	2019-08-06 12:31:54 -07:00
Zach Fox	2a4c0a3ecd	BUGZ-1103: Use 'Master GPU' information in About screen	2019-08-06 14:13:31 -04:00
milad	77023b281b	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 09:27:49 -07:00
Anthony J. Thibault	704a2d2ac9	Merge branch 'master' into feature/reaction-fixes	2019-08-05 09:43:32 -07:00
Anthony J. Thibault	649ef6c721	Added sitting idle variation and removed rejected emote variations.	2019-08-05 09:42:01 -07:00
milad	d1efbc051a	working UI	2019-08-04 15:11:55 -07:00
Anthony J. Thibault	31762a0c80	Bug fixes in seated reactions	2019-08-02 10:17:59 -07:00
Anthony J. Thibault	c8e4536bba	Hooked up variations of seated while talking and stubs for reactions while seated.	2019-08-02 10:11:38 -07:00
Anthony J. Thibault	f843c01b35	added missing seated idle pose	2019-08-01 13:09:02 -07:00
Anthony J. Thibault	a2e37b7275	talking/reactions while seated, work in progress check in	2019-08-01 13:05:15 -07:00
Seth Alves	d8b940cc96	add control to enable/disable acoustic echo cancellation to simplified UI	2019-07-30 14:09:34 -07:00
Seth Alves	8ec4505b95	add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything.	2019-07-30 14:09:32 -07:00
Anthony J. Thibault	ee4bb233b9	Bug fix for head nod not going back to idle.	2019-07-30 12:56:43 -07:00
MiladNazeri	b81d0ecce3	Merge pull request #16002 from MiladNazeri/addNewTextSizeAPI ... [BUGZ-972] :: changed root to micBar which had the gated property	2019-07-30 09:59:40 -07:00
Anthony J. Thibault	4f5d0d1c0f	Updated a negative reaction animation.	2019-07-29 16:49:16 -07:00
Anthony J. Thibault	6f3bb749e2	Added new applaud, point and raisehand reactions.	2019-07-29 16:17:50 -07:00
Shannon Romano	f29284198c	Merge pull request #15978 from roxanneskelly/bugz829 ... BUGZ-829 DEV-168 - domain backup/content management improvements	2019-07-29 15:28:49 -07:00
Anthony J. Thibault	e205d90df6	Hooked up random positive & negative emote animations.	2019-07-29 15:01:10 -07:00
milad	2ea8b9efa4	changed root to micBar which had the gated property	2019-07-29 14:05:55 -07:00
Anthony J. Thibault	6e6440232c	Updated avatar-animation.json from animedit tool	2019-07-29 10:49:34 -07:00
Anthony Thibault	5375e53ecb	Merge pull request #15974 from luiscuenca/avatarSitAPI ... DEV-269: First Class Sitting API	2019-07-26 13:36:00 -07:00
humbletim	058c81aa1a	Merge branch 'hifi-master' into kpi-v1-modkit-rc	2019-07-26 01:36:52 -04:00
Kalila R	bac59b52aa	Added checkbox for script plugins to security.qml	2019-07-26 01:32:14 -04:00
MiladNazeri	b0723599d8	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:48 -07:00
MiladNazeri	b419be97be	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:24 -07:00
MiladNazeri	cf23b7a303	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:47:17 -07:00
MiladNazeri	20b709b382	Update interface/resources/qml/controlsUit/PermissionPopup.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-07-25 15:46:10 -07:00
milad	5083e449b0	cr round 2	2019-07-25 15:42:25 -07:00
milad	2f4566b63c	merged master and fixed height	2019-07-25 15:42:03 -07:00
milad	4c0d8b6fda	improved layout to match the figment more	2019-07-25 15:42:02 -07:00
milad	993e5db2da	changed rectangle to have anchor.fill	2019-07-25 15:42:02 -07:00
milad	2498bf2fd8	Cr changes r1	2019-07-25 15:42:02 -07:00
milad	9f0fc8bd06	removed logs and prototype code	2019-07-25 15:42:02 -07:00
milad	189809dc2c	Fixed undefined error when displaying from the dictionary	2019-07-25 15:42:02 -07:00
milad	2b4dd327ec	removed log statements	2019-07-25 15:42:01 -07:00
milad	cd5df63f51	working version for all qml web files	2019-07-25 15:41:53 -07:00
milad	fb7a66b110	working version with just flickable	2019-07-25 15:38:23 -07:00
milad	43268c0f65	Working QML window	2019-07-25 15:38:23 -07:00
milad	dec176b921	checking to see if I did something blocking the build	2019-07-25 15:38:22 -07:00
Roxanne Skelly	130e68c9b5	DEV-168 - make interface-installed content sets display info on web ... installed content section	2019-07-25 14:37:41 -07:00
Ryan Huffman	de233e456e	Merge pull request #15976 from huffman/feat/serverless-tutorial ... DEV-266: Add serverless tutorial	2019-07-25 13:39:03 -07:00
Zach Fox	12a9837a4b	Merge pull request #15984 from zfox23/removeSomeEventBridgeCode ... BUGZ-969: Remove some audio-related code that hasn't worked in a while	2019-07-25 12:41:43 -07:00
Zach Fox	6e33f3f23a	BUGZ-969: Remove some audio-related code that hasn't worked in a while	2019-07-25 11:49:28 -07:00
Ryan Huffman	2ec87f4e61	Add serverless tutorial	2019-07-24 16:38:03 -07:00
Zach Fox	e1c198903d	Merge pull request #15973 from zfox23/fixGatedLog ... BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 11:19:02 -07:00
luiscuenca	015d1951fc	Add sitting clip node	2019-07-24 10:44:33 -07:00
Zach Fox	03b5f9f7f8	BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 10:18:03 -07:00
Zach Fox	b918979fab	DEV-301: Adjust size of VR-mode header icon	2019-07-24 10:02:26 -07:00
luiscuenca	e7e864121f	Merge branch 'master' into avatarSitAPI	2019-07-23 14:22:42 -07:00
luiscuenca	9cec979552	Add sit API to MyAvatar	2019-07-23 14:20:54 -07:00
Shannon Romano	266230a53c	Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api ... Initial version of Avatar Reaction API	2019-07-23 13:13:31 -07:00
Anthony J. Thibault	687588cde7	Hooked up first-pass reaction animations.	2019-07-23 09:47:37 -07:00
Andrew Meadows	95187f97c8	use bold monospace font for debug stats	2019-07-22 12:38:24 -07:00
Shannon Romano	4f7b865cfe	Merge pull request #15945 from huffman/fix/create-window-not-reopening ... BUGZ-998: Fix create window being destroyed when closed	2019-07-19 11:07:02 -07:00
Ryan Huffman	03b8de1ee7	Fix create window being destroyed when closed	2019-07-18 08:43:39 -07:00
milad	a3b8ded56a	changed sessionDisplayName logic	2019-07-17 14:17:58 -07:00
Zach Fox	a4f4961dfd	Merge pull request #15941 from zfox23/graphicsSettingsMargin ... Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:26:43 -07:00
Zach Fox	1cd136f178	Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:15:08 -07:00
dooglifeSF	413a089402	add teleport.fbx back to avatar/animations ... compiled and tested in local sandbox but need to test with Jamil in HMD to see that teleport plays correctly for remote viewer	2019-07-15 13:24:21 -07:00
Zach Fox	5828f46c6b	Incorrect ID fixed - thanks Milad	2019-07-12 12:27:55 -07:00
Zach Fox	e0392642f7	Don't enable supersampling from graphics settings	2019-07-12 11:18:34 -07:00
Zach Fox	56a55efbb3	Fix a quick renderer bug	2019-07-11 16:12:40 -07:00
Zach Fox	4c7d0fc6f4	Updated layout	2019-07-11 14:46:05 -07:00
Zach Fox	ce2b7e5baa	Finish all of the logic and most of the layout	2019-07-11 12:05:13 -07:00
Zach Fox	2471a3eb72	Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings	2019-07-11 09:02:42 -07:00
Zach Fox	4caa00d6cc	Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface	2019-07-10 16:42:48 -07:00
Howard Stearns	7eaa29c147	Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui ... new-account wallets in simplified UI	2019-07-10 15:09:59 -07:00
Howard Stearns	4191c37f6e	indentation	2019-07-09 14:48:17 -07:00
Howard Stearns	79a3d45eae	new-account wallets in simplified UI	2019-07-09 14:25:11 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
Zach Fox	5048b8bd89	Implement DEV-218 & DEV-219 and commit a starting point for the Emote app	2019-07-08 16:46:58 -07:00
Jamil Akram	aa82c4e971	Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements ... Idles talks locomotion improvements	2019-07-08 13:30:51 -07:00
Zach Fox	243733028b	Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch ... BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About	2019-07-05 12:59:56 -07:00
Zach Fox	38ad93a7ed	BUGZ-917: Fix log spam in NameCard.qml due to errant line of code	2019-07-05 12:24:05 -07:00
Zach Fox	4223800af7	BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About	2019-07-05 12:17:28 -07:00
Zach Fox	1f54f3c159	BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text	2019-07-03 12:49:23 -07:00
Zach Fox	b8485361ce	Merge pull request #15858 from zfox23/PTTDuckingSlider ... DEV-194: Iterate on PTT Ducking Slider design	2019-07-01 12:00:17 -07:00
Zach Fox	73db19464f	DEV-194: Iterate on PTT Ducking Slider design	2019-07-01 11:28:48 -07:00
Preston Bezos	ef674a5934	removed permission for qml to access webcam and mic	2019-06-28 15:23:50 -07:00
Zach Fox	8af469992e	BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-27 15:55:58 -07:00
dooglifeSF	7856ab611f	rig shoulder rotation order fixed, animations batch converted and polished, json updated with new ranges for side steps, tabs converted to spaces	2019-06-27 11:37:05 -07:00
Zach Fox	6e4b9c1723	Merge pull request #15774 from PrestonB1123/iconChanges ... New Top Bar Icons	2019-06-26 11:01:12 -07:00
Preston Bezos	f0dd28e71a	removed extra line	2019-06-26 09:54:43 -07:00
dooglifeSF	9f8d1dd51d	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-26 09:31:23 -07:00
Preston Bezos	bd3fe8a092	fixed conflict and spacing	2019-06-26 09:12:32 -07:00
Sam Gateau	48f9c33bdd	Merge pull request #15822 from samcake/yellow ... BUGZ-664: Introduce scaling of rendering for forward renderer	2019-06-25 14:27:17 -07:00
Zach Fox	b7a3d82f0f	DEV-170: Increase the speed of the animation when clicking between tabs in Settings	2019-06-25 11:30:25 -07:00
Preston Bezos	1481c7424f	changed ptt muted icon	2019-06-25 11:02:44 -07:00
Preston Bezos	5686f51171	fixed hmd settings buttons spacing	2019-06-25 09:19:30 -07:00
Sam Gateau	b0ebcc745d	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-24 15:36:28 -07:00
Zach Fox	3e2e020731	BUGZ-746: About tab: Better CPU/GPU info reporting; New copied info (including OS version)	2019-06-24 12:48:13 -07:00
Sam Gateau	aa160c4d0f	Improving presentation of stats & debug information	2019-06-21 16:17:28 -07:00
dooglifeSF	3d92875eb5	add spine twist during transitions in/out of alt idle to help when talking is overlayed	2019-06-21 10:39:53 -07:00
dooglifeSF	e25913f136	fix finger collapse in talks and idles - caused by finger joints bending more than 90 degrees in Y	2019-06-20 16:05:18 -07:00
Anthony J. Thibault	3a6d8dc383	Disable handTouch.js to prevent finger twitching ... This PR disables handTouch.js. handTouch.js allows the fingers to animate on the surface of an object. However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them. We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality. Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range. This can cause the fingers to bend incorrectly for a moment. Also, three new items were added to the Developer > Show Animation Stats panel. * Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls. * Flow: displays if flow is active of disabled. * Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled. https://highfidelity.atlassian.net/browse/BUGZ-154	2019-06-20 15:52:36 -07:00
dooglifeSF	12b7cb0262	merge dooglifeSF master into branch Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-20 09:01:59 -07:00
dooglifeSF	3eef23fe98	change base idle more frequently, add more motion to idle02, improve head movements in talks, add head movement to talk_armsdown	2019-06-19 16:19:42 -07:00
RebeccaStankus	30dd667b17	Changed qml import method	2019-06-19 10:40:32 -07:00
RebeccaStankus	feaea12b24	Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles	2019-06-19 10:14:04 -07:00
dooglifeSF	4be42a4b9b	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-19 09:57:04 -07:00
dooglifeSF	255777c82d	bring latest changes to idles, locomotion and animation json into hifi from hifi-animation	2019-06-19 09:49:42 -07:00
Zach Fox	18f703ee43	BUGZ-732: Enable text selection by mouse in Profile/Display Name field	2019-06-18 14:11:14 -07:00
Zach Fox	f6822f17a9	Add computer description	2019-06-18 12:43:45 -07:00
Zach Fox	bd02a5eafd	Better text formatting	2019-06-18 12:29:52 -07:00
Zach Fox	4670c11397	Tighten up the graphics on level 3	2019-06-18 12:26:03 -07:00
Zach Fox	ec4fc672b6	Better design; Interface version	2019-06-18 12:09:37 -07:00
Zach Fox	34def0fd6b	DEV-145: About screen for platform info	2019-06-18 11:09:15 -07:00
dooglifeSF	ae2c381aaa	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-18 09:42:18 -07:00
RebeccaStankus	cd508a5475	Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles	2019-06-18 09:10:41 -07:00
RebeccaStankus	5a49ac9a22	moved files	2019-06-17 16:45:54 -07:00
Zach Fox	32aec78ea2	Merge pull request #15782 from zfox23/SUI/resizeSignal ... BUGZ-699: Make PSFListModel fetch early when making container bigger	2019-06-17 15:27:21 -07:00
Zach Fox	9cb4ad61ee	BUGZ-699: Make PSFListModel fetch early when making container bigger	2019-06-17 15:06:20 -07:00
Preston Bezos	538b15dd57	caught a couple of edge cases for mic states	2019-06-17 13:20:25 -07:00
Preston Bezos	7879dbf687	changed width of ptt muted icon	2019-06-17 13:13:43 -07:00
Zach Fox	1d2ed1985f	DEV-142 & DEV-140: Scrollbars in Your Profile and Settings	2019-06-17 12:35:45 -07:00
Preston Bezos	bd78dd96a0	replaced icons with icons that are on the whole pixel so as not to cause blur	2019-06-17 11:05:47 -07:00
dooglifeSF	1c1807a80c	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-17 10:44:11 -07:00
Preston Bezos	a954ef6068	Merge branch 'master' of github.com:highfidelity/hifi into iconChanges	2019-06-17 10:43:43 -07:00
Preston Bezos	d9f1aa73ba	switched top bar icons and changes input device meter to be in icon instead of in bar	2019-06-17 09:12:32 -07:00
dooglifeSF	51b5f6093a	locomotion and idles bug fixes, json updated with correct values, AnimStats.cpp on screen debug text timeout pushed to 20 seconds	2019-06-17 08:58:15 -07:00
Shannon Romano	e6ea4839e0	Merge pull request #15770 from zfox23/SUI/autoChangeAvatar3 ... BUGZ-658: Actually write some code that doesn't let the user switch avatar models to Woody	2019-06-13 17:55:59 -07:00
Shannon Romano	d6859a42d9	Merge pull request #15762 from annabrewer/quest-login-keybrd ... BUGZ-531: Quest tablet login missing keyboard	2019-06-13 16:44:49 -07:00
Zach Fox	503fc18d70	Make this slightly more robust	2019-06-13 16:08:29 -07:00
Zach Fox	fcda85a3d1	Merge pull request #15759 from zfox23/SUI/autoSwitchAvatar2 ... BUGZ-658: Don't let the user switch avatar models to Woody	2019-06-13 10:55:55 -07:00
Zach Fox	289e948d6b	BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'	2019-06-13 10:27:18 -07:00
Zach Fox	4ccd7bd808	BUGZ-658: Don't let the user switch avatar models to Woody	2019-06-13 10:17:14 -07:00
Anna	4b30065ad1	fixed keyboard on quest login and cleaned up qml files	2019-06-12 15:17:37 -07:00
Preston Bezos	038747e645	Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering	2019-06-12 14:55:37 -07:00
Preston Bezos	34e9acc0b5	better fix for the toolbar remnant	2019-06-12 14:31:43 -07:00
Zach Fox	6fed581452	DEV-128: Update settings screen with latest design	2019-06-12 14:22:02 -07:00
Zach Fox	fade8f9c04	It works!	2019-06-12 12:47:48 -07:00
Zach Fox	51c2cc793a	Tinkering with toolbar visibility signal - not quite working	2019-06-12 10:26:32 -07:00
Shannon Romano	b9e2443451	Merge pull request #15700 from ctrlaltdavid/DOC-63 ... DOC-63: Tablet JSDoc	2019-06-11 16:51:08 -07:00
Zach Fox	a88023469b	Merge pull request #15737 from zfox23/SUI/developerMenu ... DEV-122: Add a developer menu in Settings	2019-06-11 13:32:14 -07:00
Zach Fox	7bdd3084e9	DEV-122: Add a developer menu in Settings	2019-06-11 12:56:14 -07:00
Zach Fox	97c4726e1e	Merge pull request #15736 from zfox23/SUI/autoSelectAvatar ... BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory	2019-06-11 11:50:55 -07:00
Zach Fox	db2ce822b7	BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory	2019-06-11 10:52:45 -07:00
Zach Fox	2d4ba92eeb	Implement BUGZ-633: Change 'Graphics Preset'	2019-06-11 09:58:01 -07:00
Zach Fox	b62ab2ea82	Merge pull request #15731 from zfox23/SUI/forwardKeyEvents ... Implement BUGZ-226: Forward keypresses made while Top Bar is in focus	2019-06-11 07:52:11 -07:00
Zach Fox	9a926abd76	Implement BUGZ-226: Forward keypresses made while Top Bar is in focus	2019-06-10 20:27:03 -07:00
Anthony J. Thibault	7ce5f7ac0b	Adjust run and jog anims to better align head with 1p camera ... Added adjust forward run and jog animations to better align with first person camera. In some instances, such as looking down, you could sometimes see your body lead your camera. https://highfidelity.atlassian.net/browse/BUGZ-240	2019-06-10 16:27:03 -07:00
Shannon Romano	1748d0527f	Merge pull request #15698 from samcake/nut ... BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target	2019-06-10 13:10:56 -07:00
Sam Gateau	32399997b1	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-10 10:52:53 -07:00
Anna	fd872009fe	added workaround for bug in Qt StackView push method	2019-06-10 09:25:12 -07:00
Anna	67775c59f1	Merge branch 'master' of github.com:highfidelity/hifi	2019-06-10 08:55:48 -07:00
Anthony Thibault	d6331d1bf6	Merge pull request #15714 from hyperlogic/bug-fix/settings-on-tablet ... Fix crash using Settings in the Tablet in VR	2019-06-07 18:15:56 -07:00
Anna	0b282b201c	typo fix	2019-06-07 18:01:47 -07:00
Sam Gateau	2d9a7f7c4f	Refined the capping of the LOD Target Rate to be the lower REfreshrate when FOcus-inactive, this prevent the panic attacks of the LOD system on low end hardware	2019-06-07 17:00:37 -07:00
Anthony J. Thibault	00bba828ee	Fix crash using Settings in the Tablet in VR ... This was introduced in Qt5.12.3. There are several issues in their bug tracker about this issue. https://bugreports.qt.io/browse/QTBUG-75516 https://bugreports.qt.io/browse/QTBUG-75335 To workaround this, we call Qt.createComponent() manually, instead of letting StackView do it for us.	2019-06-07 16:41:56 -07:00
Preston Bezos	a0753f6393	removed ctrl+b and ctrl+n as shortcuts	2019-06-07 15:41:44 -07:00
PrestonB1123	f3f0c4de43	Merge pull request #15688 from PrestonB1123/PushToTalk ... DEV-94: Push to Talk	2019-06-06 16:49:08 -07:00
Sam Gateau	4c18ce7ae6	Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state ... (BUGZ-559) Improve transition debugging and transition clean-up	2019-06-06 16:35:04 -07:00
David Rowe	beb70988c3	Tablet and related JSDoc	2019-06-07 08:34:53 +12:00
sabrina-shanman	971d563f49	Add debug icons for transitions	2019-06-06 13:25:06 -07:00
Zach Fox	fa2217c188	DEV-113: Remove headphones icon from status indicator in top bar	2019-06-06 12:20:43 -07:00
Preston Bezos	2592784814	Changed InputDeviceButton to unmute on push and hold while in push to talk mode	2019-06-06 09:19:32 -07:00
Zach Fox	326d1615e0	Change old UI too	2019-06-05 14:07:10 -07:00
Zach Fox	0ba849d65b	BUGZ-530: Rename 'System Sounds' to 'UI FX'	2019-06-05 13:25:28 -07:00
Brad Hefta-Gaub	52d02f61a1	Merge pull request #15657 from zfox23/newPerformanceAPI ... BUGZ-447: Use new performance preset API	2019-05-31 15:31:07 -07:00
Zach Fox	97bd0d5413	Make this work!	2019-05-31 12:50:32 -07:00
Zach Fox	7b04a6d361	Sounds	2019-05-31 12:39:13 -07:00
Zach Fox	8b085c79ad	Can't use window.location in QML	2019-05-31 12:36:28 -07:00
Zach Fox	b9b320d01c	DEV-92: Add a Home button to the Avatar app	2019-05-31 11:43:13 -07:00
Zach Fox	8e5c94abb0	BUGZ-447: New performance preset API	2019-05-31 11:08:51 -07:00
Zach Fox	92b944464a	Fix BUGZ-146: Clicking on the gear icon causes three click sounds	2019-05-28 12:41:58 -07:00
Zach Fox	6cf2145c16	Fix BUGZ-312; BUGZ-311	2019-05-24 12:58:38 -07:00
Zach Fox	51d22c1988	Fix BUGZ-344	2019-05-24 12:12:55 -07:00
Sam Gateau	a5d17883d0	Merge pull request #15602 from SamGondelman/tests ... BUGZ-21, Case 22219: Fix skyboxes/ambient maps on AMD	2019-05-24 11:29:04 -07:00
Shannon Romano	aaf4bef34e	Merge pull request #15625 from zfox23/SUI/BUGZ-336 ... Fix BUGZ-336: Microphone test does not stop unless you press the button to "stop test"	2019-05-23 15:17:37 -07:00
Zach Fox	78fdd2d673	Fix BUGZ-336	2019-05-23 14:25:06 -07:00
Zach Fox	da011fd042	Fix BUGZ-312; fix BUGZ-311	2019-05-23 13:37:25 -07:00
Zach Fox	4bbbaa8c19	Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes	2019-05-23 09:39:38 -07:00
Zach Fox	934ea76966	Merge pull request #15613 from zfox23/SUI/newAudioProperties ... Fix the janky audio output settings UI	2019-05-22 16:45:02 -07:00
Zach Fox	d75fe04038	Fix BUGZ-311	2019-05-22 16:24:40 -07:00
Zach Fox	8df706abcb	Handle the case when the user doesn't have any avatars yet	2019-05-22 15:51:46 -07:00
Zach Fox	3ed47b4f23	Show error states in Avatar app (BUGZ-310)	2019-05-22 15:45:18 -07:00
Zach Fox	46ee148a69	Fix a bug and remove magic numbers	2019-05-22 15:24:33 -07:00
Zach Fox	3a4bf2e8f7	Fix the janky audio output settings UI	2019-05-22 14:27:06 -07:00
Zach Fox	ddb299a387	Merge pull request #15608 from zfox23/SUI/envVol ... Fix environment volume slider (BUGZ-213); optimize sliders	2019-05-22 14:11:57 -07:00
Zach Fox	30c13fd988	Fix environment volume slider (BUGZ-213); optimize sliders	2019-05-22 12:01:38 -07:00
Zach Fox	6f7557b00d	Implement BUGZ-305 and BUGZ-306	2019-05-22 09:56:28 -07:00
SamGondelman	b92e26722c	rebake default skybox	2019-05-21 15:58:46 -07:00
SamGondelman	a672b79cd8	add version to default skybox	2019-05-21 15:35:43 -07:00
Zach Fox	5749392e83	New bg color; Final status indicator design; Fixed HMD icon	2019-05-21 14:10:27 -07:00
Zach Fox	15bdb66943	Integrate Status into top bar; improve Audio settings; improve spacing between settings	2019-05-17 17:25:48 -07:00
Zach Fox	e40e34856b	Remove some extra menus from top bar; Only show VR button if headset connected	2019-05-17 13:28:59 -07:00
Zach Fox	70a4d6e8d5	Implement Performance settings and VR mode top bar switch	2019-05-16 16:15:05 -07:00
Zach Fox	90a5b25600	A bunch of changes here	2019-05-16 14:18:04 -07:00
Zach Fox	a9bc7c8806	Images, not glyphs	2019-05-15 17:14:02 -07:00
Zach Fox	966965af5b	Merge pull request #15538 from zfox23/simplifiedUI ... Simplified UI v1	2019-05-14 17:45:30 -07:00
Howard Stearns	a9635a2c9a	Merge pull request #15551 from roxanneskelly/queueDepthDebug ... Queue depth debugging code	2019-05-14 17:32:53 -07:00
Howard Stearns	ee97e2faa1	Merge pull request #15559 from SimonWalton-HiFi/avatar-theft-challenge ... Allow for delayed challenges if salt is empty	2019-05-14 16:53:12 -07:00
Zach Fox	971e07c646	update spacing between settings	2019-05-14 16:44:25 -07:00
Zach Fox	bbd3d0fab5	Remove settings subtitles	2019-05-14 16:39:48 -07:00
Roxanne Skelly	a7595496f6	CR fixes	2019-05-14 16:39:39 -07:00
Zach Fox	e3bec7ef2a	CR Round 1 - thanks Milad	2019-05-14 16:29:03 -07:00
Roxanne Skelly	fad7fa4c07	Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug	2019-05-14 16:25:10 -07:00
Simon Walton	e768beb9b1	Allow for delayed challenges if salt is empty	2019-05-14 15:53:35 -07:00
Brad Hefta-Gaub	7440ef3cf3	Merge pull request #15506 from SaracenOne/unify_primitives ... Case 19510: Unify cube and sphere edit menu entries into one.	2019-05-14 15:31:06 -07:00
Zach Fox	f9b51df296	Reduce size of output muted overlay; restore scroll to 0 on settings tab switch	2019-05-14 15:05:26 -07:00
Zach Fox	f43c376a6a	Tweak top bar	2019-05-14 12:41:56 -07:00
Zach Fox	8724cf4edf	UIT TextField	2019-05-14 12:27:33 -07:00
Zach Fox	2080aa6676	Some fun motion for experimentation	2019-05-14 11:56:07 -07:00
Zach Fox	cf46f3c9d4	CheckBox UIT and CheckBox added to Avatar app	2019-05-14 11:50:07 -07:00
Zach Fox	89006cd9c5	Hide controls in top left; don't remove certain menus; fixup slider UIT	2019-05-13 17:26:19 -07:00
Zach Fox	7bb2d6871b	Simlpified Slider (not totally working; position is off)	2019-05-13 15:58:04 -07:00
Roxanne Skelly	72fe3a66f5	Debugging code to monitor the queue depth for a few critical threads	2019-05-13 15:56:55 -07:00
Zach Fox	f799f96fba	simplifiedUI UIT switch	2019-05-13 13:04:12 -07:00
Zach Fox	feb5021372	UIT RadioButton	2019-05-13 11:07:39 -07:00
Zach Fox	112e13383b	Dock it!	2019-05-10 12:03:29 -07:00
Zach Fox	314c04ab96	Simplified UI v1	2019-05-10 10:49:25 -07:00
Wayne Chen	845ad38106	Merge pull request #15503 from wayne-chen/useThresholdMutedWarning ... Case 22447: The "MUTED" indicator (which warns when talking while muted) constantly flickers	2019-05-06 13:55:59 -07:00
Saracen	43ddf7ca23	Unify cube and sphere edit menu entries into one.	2019-05-02 22:40:11 +01:00
Wayne Chen	d31ed9ac22	adding timer for muted warning	2019-05-02 12:23:58 -07:00
Simon Walton	60389017a4	Merge from master, including avatar protocol change ... Tony had added HandController version-type.	2019-04-26 18:51:41 -07:00
Simon Walton	1fe8f4332f	Fixes to banner; swap out avatar on client; reviewer comments; other WIP	2019-04-26 18:45:48 -07:00
Sam Gateau	c647bbcb16	Merge pull request #15400 from danteruiz/throttle-refresh-rate ... Case 22253: Refresh Rate Controller	2019-04-26 12:04:39 -07:00
danteruiz	b60e35040e	another round of CR	2019-04-26 10:08:06 -07:00
Anthony Thibault	93b03a588f	Merge pull request #15445 from amantley/AnimRandomSwitchSquash ... AnimRandomSwitch class for random idle implementation	2019-04-26 10:06:37 -07:00
Angus Antley	395a4cc9c4	added final animations and json to the resource	2019-04-25 19:14:31 -07:00
Shannon Romano	d0108301a0	Merge pull request #15410 from wayne-chen/fixMuteWarningSwitchText ... Case 22297: Fix Mute Warning Switch Text	2019-04-25 17:11:45 -07:00
danteruiz	9e1671a1bf	making requested changes	2019-04-25 16:02:12 -07:00
Angus Antley	27ed468946	made changes requested	2019-04-25 14:42:41 -07:00
Simon Walton	f3efee56c0	Merge remote-tracking branch 'upstream/master' into avatar-verification	2019-04-25 13:40:27 -07:00
Sam Gondelman	ef64de7c04	Merge branch 'master' into openurl	2019-04-25 13:21:27 -07:00
Thijs Wenker	cdcdae2fda	Merge pull request #15393 from ctrlaltdavid/M22188 ... Update Record app per Marketplace certification requirements	2019-04-25 20:00:13 +02:00
Angus Antley	baca58360e	updated json and talk_righthand anim	2019-04-25 09:50:12 -07:00
Angus Antley	ea173b8d61	more time for talk ease in and updated json random choice times	2019-04-24 21:29:55 -07:00
Simon Walton	de97af5c02	Minimal working version for avatar's client ... Also merge of Wayne's proof-of-concept	2019-04-24 17:42:51 -07:00
SamGondelman	31b3f0e8f1	possible fix for openUrl exploit	2019-04-24 16:39:31 -07:00
Shannon Romano	404be42bfb	Merge pull request #15409 from wayne-chen/fixShieldIconBehavior ... Case 22290: Fixing Shield Icon Behavior in Desktop Mode	2019-04-24 16:35:02 -07:00
Dante Ruiz	0bdc37859d	Refresh Rate Controller	2019-04-24 16:16:08 -07:00
Angus Antley	eb0506ee12	updated json	2019-04-24 14:58:30 -07:00
Angus Antley	45f4cb2018	added animation files and updated ease in function in rig	2019-04-24 14:56:38 -07:00
amantley	7f3101eefb	working on the ease in function for the talk idle	2019-04-23 18:13:15 -07:00
Wayne Chen	464e5924d6	changing method name to reflect recent change in code	2019-04-23 16:59:12 -07:00
amantley	70d8200bdc	added on done for movement7 to json	2019-04-23 10:40:37 -07:00
Angus Antley	1291ee5ebc	added new animations to the resource	2019-04-23 07:43:31 -07:00
Wayne Chen	3b1751f2c9	adding proper logic for shield icon behavior	2019-04-17 20:19:21 -07:00
Wayne Chen	7d38cd9290	change text to display	2019-04-17 17:25:02 -07:00
amantley	035c8a687d	fixed merge conflict	2019-04-17 10:16:39 -07:00
amantley	ba9b539bd2	removed hand fbx files that will be used in the future for default hand overrides	2019-04-16 14:12:32 -07:00
Saracen	36af2c8e62	Change 'displayName' to 'displayNameField'.	2019-04-16 13:56:02 +01:00
Saracen	282fcf20ec	Add display name field to the log in screen.	2019-04-16 13:34:44 +01:00
David Rowe	249df3dce4	Update Record app per Marketplace certification requirements	2019-04-16 07:53:55 +12:00
John Conklin II	759d59c709	Merge pull request #15336 from r3tk0n/controller-help-update ... Case 22069: Update Controller Help Screen	2019-04-05 17:31:29 -07:00
r3tk0n	d6ff1caee9	Convert tabs to spaces.	2019-04-05 16:32:20 -07:00
r3tk0n	9dda272acd	Update gamepad with new graphic.	2019-04-05 16:22:31 -07:00
r3tk0n	6d03182ed9	Fix scaling issue.	2019-04-05 16:21:42 -07:00
r3tk0n	e3fdbc3b3c	Set bounds of image.	2019-04-05 15:44:34 -07:00
Roxanne Skelly	057ee2b01c	Case 21890 - Marketplace search doesn't refresh when enter is pressed	2019-04-05 15:20:23 -07:00
r3tk0n	e03e78cc8c	Add href element to image.	2019-04-05 15:04:35 -07:00
r3tk0n	84a67641a8	Update images.	2019-04-05 14:39:02 -07:00
Wayne Chen	4f738a5b42	code review feedback/formatting issues	2019-04-04 12:03:48 -07:00
r3tk0n	874fb6b6d7	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 12:42:33 -07:00
r3tk0n	ec37ad7dc6	Address Wayne and Angus' comments on github.	2019-04-03 09:38:14 -07:00
Shannon Romano	1bfa0397f0	Merge pull request #15048 from wayne-chen/newAudioMuteStates ... Case 21899: New Audio Mute States	2019-04-01 15:27:03 -07:00
r3tk0n	4fb7bbabe1	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-01 14:52:21 -07:00
Wayne Chen	a9802570d7	Merge pull request #15305 from wayne-chen/repositionPeopleAppAudioQml ... Case 22003: Reuse Blank Space from Volume Slider	2019-04-01 14:23:27 -07:00
Wayne Chen	abe5748e60	Merge branch 'master' into newAudioMuteStates	2019-04-01 12:24:46 -07:00
Wayne Chen	eba1f271ef	Merge pull request #15253 from wayne-chen/fixPTTMacAudio-master ... Case 21892: Mac Audio Push To Talk fix	2019-04-01 12:19:10 -07:00
Wayne Chen	0a8d195f6f	adding top padding for my name card	2019-04-01 11:32:52 -07:00
Wayne Chen	0d83e622ff	Revert "Attempt to add acceleration curve." (#23) ... This reverts commit 9ea476ea89.	2019-04-01 13:47:49 -04:00
Wayne Chen	c4cccc6ef7	fix opacity for containing mouse only	2019-03-29 17:04:44 -07:00
Shannon Romano	dbecf1f611	Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing ... Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.	2019-03-29 17:04:37 -07:00
Wayne Chen	426ffe5a14	Fixing typo	2019-03-29 15:38:42 -07:00
Wayne Chen	2622408792	warn when muted only affects hmd	2019-03-29 10:45:40 -07:00
Shannon Romano	a83b90cdc6	Merge pull request #15044 from sethalves/lock-wearables ... case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables	2019-03-29 10:41:21 -07:00
Wayne Chen	248f9ba375	adding mute overlay back into HMD and have warn when muted disable in desktop	2019-03-29 10:32:13 -07:00
Angus Antley	55b42946a4	cleaned up ugly brace style in json	2019-03-28 19:07:01 -07:00
Thijs Wenker	7e21a3f372	disable case sensitivity in file browsers (allow .fbx .fBx .FBX instead of only .fbx)	2019-03-29 01:48:57 +01:00
Wayne Chen	3241d2f960	don't allow clicking on push to talk in MicBarApplication	2019-03-28 16:24:37 -07:00
Wayne Chen	f2b0e47c39	changing opacity	2019-03-28 16:19:35 -07:00
Roxanne Skelly	73cf51182e	Merge pull request #15262 from roxanneskelly/Case20832 ... Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.	2019-03-28 12:01:24 -07:00
Wayne Chen	8627a92f29	adding functions to update variables	2019-03-28 11:29:34 -07:00
Wayne Chen	c3e5c49f69	update muted in AudioScriptingInterface	2019-03-28 10:40:39 -07:00
Wayne Chen	9349514ff7	make audio screen inputs/outputs unflickable	2019-03-28 10:35:28 -07:00
Wayne Chen	f3708ba27b	Merge branch 'master' into newAudioMuteStates	2019-03-27 15:49:39 -07:00
Ken Cooke	abb0a166b1	Merge pull request #15260 from kencooke/audio-mixer-volume-control ... Case 21902: System-wide independent volume controls	2019-03-27 13:19:30 -07:00
Angus Antley	d71c6c28de	added the new hand anims to the resource, and added hand reset to initAnimGraph	2019-03-27 12:00:50 -07:00
Seth Alves	e085a00256	cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open	2019-03-27 10:12:58 -07:00
Seth Alves	d25d290394	refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term	2019-03-27 10:12:58 -07:00
Seth Alves	29af3b1612	add a button to Avatar panel to lock or unlock wearables. ... allow grabbing / adjusting others' wearables if they are unlocked.	2019-03-27 10:12:57 -07:00
Angus Antley	02d9331603	This changes the avatar-animation json so that we have override ... animations for the right and left hand, similar to how we have whole body override animations.	2019-03-26 23:27:54 -07:00
Seth Alves	16f842b2ac	missed one	2019-03-26 16:07:18 -07:00
Seth Alves	7d21222232	the test-audio button causes a local audio-loopback rather than a server one	2019-03-26 16:03:56 -07:00
Wayne Chen	c0b71150ea	removing an extra button	2019-03-26 10:58:04 -07:00
Wayne Chen	e44cdb0d7b	Merge branch 'audio-mixer-volume-control' into addNewAudioControls	2019-03-26 10:39:29 -07:00
Wayne Chen	a2d754cebd	fixing audio screen with master	2019-03-26 10:26:29 -07:00
Ken Cooke	7b56bef838	Prototype an updated Audio tab with 3 independent volume controls	2019-03-26 09:41:58 -07:00
Wayne Chen	c54e8f5569	showing ptt text always + hmd mode switch fix	2019-03-25 17:32:03 -07:00
Wayne Chen	6aebd000d6	changing api to match verbiage of overall code	2019-03-25 15:41:03 -07:00
Wayne Chen	49ce30d536	adding changes to design + truly separating muted/ptt	2019-03-25 15:35:05 -07:00
Thijs Wenker	0173c87695	Fix clashing hyperlinks in AvatarPackager project page	2019-03-25 22:48:30 +01:00
Roxanne Skelly	90b9de8623	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832	2019-03-25 14:48:26 -07:00
Roxanne Skelly	1608b24be1	ase 20832 - Inventory app login and cancel buttons don't work on logout	2019-03-25 14:48:17 -07:00
Shannon Romano	16d791703d	Merge pull request #15206 from thoys/feat/avatarTools/avatarDoctorWarningURLs ... Case 21353: Avatar Doctor documentation / Video URLs	2019-03-25 14:36:30 -07:00
Wayne Chen	9a8c5e5a54	Merge branch 'master' into newAudioMuteStates	2019-03-25 13:33:24 -07:00
Shannon Romano	6710cd3e03	Merge pull request #15233 from roxanneskelly/Case20407 ... Case 20407 - Pay-In API doesn't display error when no username specified	2019-03-25 12:41:57 -07:00
Wayne Chen	59a420b160	adding signals + slots to when muted + display mode changes	2019-03-25 12:24:13 -07:00
Wayne Chen	f551d49f4f	adding signal for updating push to talk variables	2019-03-25 11:32:08 -07:00
Wayne Chen	7f5d9cbd40	adding push to talk fix for loadData	2019-03-25 11:32:08 -07:00
Wayne Chen	4658e34b4b	update indent spacing	2019-03-25 11:29:27 -07:00
Wayne Chen	1952ad4be6	Merge branch 'master' into audio-mixer-volume-control	2019-03-25 11:28:14 -07:00
r3tk0n	3ac42e69e3	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-25 11:27:31 -07:00
Wayne Chen	e9253a630b	Merge pull request #15211 from wayne-chen/fixAudioSettingsScreen-master ... Case 21781: show up audio screen using Settings > Audio	2019-03-25 11:25:42 -07:00
Wayne Chen	7b5c379bb9	Merge pull request #15182 from wayne-chen/fixAudioSettingsScreenScrolling ... Case 21717: adding scrolling in audio settings window	2019-03-25 11:25:30 -07:00
Ken Cooke	b5e8176b0f	Merge branch 'master' into audio-mixer-volume-control	2019-03-23 16:15:29 -07:00
Ken Cooke	649bb92e6c	Prototype an updated Audio tab with 3 independent volume controls	2019-03-23 16:00:02 -07:00
Wayne Chen	b98eda4674	removing debug statemeng	2019-03-22 16:42:37 -07:00
Wayne Chen	3ea45de7c7	fixing qml bug in MicBar	2019-03-22 16:37:23 -07:00
Wayne Chen	390ce9bb26	wip for getting AvatarInputsBar to switch accordingly	2019-03-22 15:34:06 -07:00
Wayne Chen	0edbf12fa3	removing extra onLevelChanged	2019-03-22 15:26:57 -07:00
Wayne Chen	1f71a291a5	displaying offset values	2019-03-22 14:54:18 -07:00
Wayne Chen	554a144b0e	adding tool to change avatar inputs properties	2019-03-22 14:54:17 -07:00
Wayne Chen	584fa1f17b	more wip	2019-03-22 14:54:17 -07:00
Wayne Chen	6cf8b06c6d	more wip on adding qml to adjusting ui position	2019-03-22 14:54:16 -07:00
Wayne Chen	d0116abc52	separating out bubble icon qml - adding support for transparency	2019-03-22 14:54:13 -07:00
Wayne Chen	e5133d6f4d	fixing muted text	2019-03-22 14:50:13 -07:00
Wayne Chen	cd7b6e7ed0	moving file as MicBarApplication	2019-03-22 14:50:12 -07:00
Wayne Chen	84fcd50b3b	adding user speaking level rotated vertically and muted symbol	2019-03-22 14:49:11 -07:00
Wayne Chen	48b4fe37b4	don't display gated state	2019-03-22 14:35:01 -07:00