6994 commits

Author	SHA1	Message	Date
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
Wayne Chen	db6bf46ee7	adding more opacity, cleanup	2019-03-22 14:33:54 -07:00
Wayne Chen	8e8ceaac47	moving file as MicBarApplication	2019-03-22 14:21:24 -07:00
Wayne Chen	d063882d37	adding user speaking level rotated vertically and muted symbol	2019-03-22 14:18:19 -07:00
Wayne Chen	77b7cc2457	separating out bubble icon qml - adding support for transparency	2019-03-22 14:16:29 -07:00
Wayne Chen	4dca4cbc40	update icons again	2019-03-22 14:16:28 -07:00
Wayne Chen	5b6ce8736d	adding new icons with gated icon	2019-03-22 14:16:28 -07:00
Wayne Chen	811fa8dcb2	allowing bubble icon to toggle	2019-03-22 14:16:28 -07:00
Wayne Chen	087f613d60	fixing muted text	2019-03-22 14:16:28 -07:00
Wayne Chen	26895e6f5d	don't display gated state	2019-03-22 14:16:28 -07:00
Wayne Chen	835153c0df	don't display gated state	2019-03-22 14:16:28 -07:00
Wayne Chen	e129201d2a	adding more opacity, cleanup	2019-03-22 14:16:27 -07:00
Wayne Chen	ddacc0ee60	bubble icon opacity to 0.3	2019-03-22 14:16:27 -07:00
Wayne Chen	3ceb1598f6	adding working bubble icon	2019-03-22 14:16:27 -07:00
Wayne Chen	915d22bb15	adding bubble icon (not working)	2019-03-22 14:16:27 -07:00
Wayne Chen	1ba366c0d7	moving file as MicBarApplication	2019-03-22 14:16:27 -07:00
Wayne Chen	0def39dbaa	adding user speaking level rotated vertically and muted symbol	2019-03-22 14:16:27 -07:00
Roxanne Skelly	efffb8b819	Merge pull request #15239 from roxanneskelly/Case20617 ... Case 20617 - People app filter bar breaks when deleting connections	2019-03-22 11:31:46 -07:00
Shannon Romano	9f19ee61e2	Merge pull request #15236 from howard-stearns/termsofservice ... update terms of service links	2019-03-21 19:35:34 -07:00
Sam Gondelman	04ecdb463f	Merge pull request #15173 from SamGondelman/audio ... Case 21457, Case 16836, Case 15782: Improve AudioInjector threading	2019-03-21 18:03:58 -07:00
r3tk0n	86ffa44771	Swap flying binding to other hand.	2019-03-21 17:05:20 -07:00
r3tk0n	108e8b9994	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-21 15:17:56 -07:00
r3tk0n	006e2d09b3	Add jump binding.	2019-03-21 15:16:50 -07:00
r3tk0n	543d53ecde	Add ability to toggle strafing.	2019-03-21 13:12:15 -07:00
Shannon Romano	b82c808562	Merge pull request #15207 from danteruiz/kick-ui ... Case 21771: Possible Entity Scipt Ban Incident	2019-03-21 13:10:54 -07:00
Roxanne Skelly	87d75ec75c	Case 20617 - People app filter bar breaks when deleting connections	2019-03-21 12:08:42 -07:00
r3tk0n	0bb10544a3	Prevent accidental rotation when teleporting.	2019-03-21 11:43:26 -07:00
Howard Stearns	5888adfd90	update terms of service links	2019-03-20 17:08:42 -07:00
Roxanne Skelly	3775633cc3	Case 20407 - Pay-In API doesn't display error when no username specified	2019-03-20 15:29:13 -07:00
Shannon Romano	e256c34823	Merge pull request #15191 from roxanneskelly/Case21467 ... Case 21728 - tab in marketplace search bar causes an update of search results	2019-03-20 14:22:10 -07:00
Shannon Romano	a6d4f98ee7	Merge pull request #15204 from roxanneskelly/Case21025 ... Case 21025 conditionalizing TabletWebView features	2019-03-20 14:21:37 -07:00
Shannon Romano	4ac25121e0	Merge pull request #15190 from roxanneskelly/Case20393 ... Case20393 - Add item counts to interface categories	2019-03-19 17:53:30 -07:00
Roxanne Skelly	27fa0dc4c6	CR fixes	2019-03-19 17:24:19 -07:00
Roxanne Skelly	ab61f65ea2	CR fix	2019-03-19 17:08:04 -07:00
Roxanne Skelly	94739aa7c7	Case 21769 - updatable items not showing up as updatable ... after clicking 'show updates' button.	2019-03-19 13:44:16 -07:00
Roxanne Skelly	b6e583087e	Stand-alone Tagging: tagged places not coming first in GOTO list	2019-03-18 17:40:01 -07:00
Roxanne Skelly	fe28eaca7c	fix typo	2019-03-18 11:23:48 -07:00
Wayne Chen	db22fa9eec	show up audio screen using Settings > Audio	2019-03-18 09:23:17 -07:00
danteruiz	5f3e31b119	add ui to kick api	2019-03-15 18:15:18 -07:00
Thijs Wenker	714115adef	- Video, and new Docs url in QML	2019-03-16 02:09:01 +01:00
Roxanne Skelly	9182db8bd4	Case 21025 conditionalizing TabletWebView features	2019-03-15 12:56:43 -07:00
Roxanne Skelly	b220b76874	Merge branch 'master' of https://github.com/highfidelity/hifi into Case21467	2019-03-14 13:05:08 -07:00
Roxanne Skelly	f971d17acc	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393	2019-03-14 12:36:42 -07:00
Roxanne Skelly	4470cf9ae5	Marketplace category dropdown UI tweaks	2019-03-14 12:35:54 -07:00
Wayne Chen	10eae54d8c	changing content height and snap mode to allow scroll	2019-03-14 12:08:08 -07:00
Wayne Chen	a3dfd09e26	adding scrolling in audio settings window	2019-03-13 17:03:53 -07:00
Roxanne Skelly	c3ecc29c4b	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393	2019-03-13 16:04:34 -07:00
Roxanne Skelly	559351a6eb	Case 21701 - Items were showing up in marketplace as "updates" when they ... weren't	2019-03-13 15:33:46 -07:00
Roxanne Skelly	42bf812019	Case 21704 - marketplace button formatting fixes	2019-03-13 15:03:29 -07:00
Roxanne Skelly	822e5ceb98	Case 21703 - Disable SUBMIT before balance is retrieved ... to prevent sending a send-money request with too large of a balance	2019-03-13 13:42:55 -07:00
Roxanne Skelly	2dc38df779	Case 20393 - Display item counts in categories dropdown in Marketplace	2019-03-13 10:17:39 -07:00
SamGondelman	609c4ab52e	try to fix audio injector threading issues	2019-03-12 18:41:43 -07:00
Wayne Chen	6b82b8cd7f	fix for steam complete profile bug	2019-03-12 17:55:14 -07:00
Shannon Romano	95bdf29f35	Merge pull request #15151 from roxanneskelly/Case20622 ... Case 20622 - Qml Marketplace - Fix categories dropdown UI issues	2019-03-12 17:42:47 -07:00
Wayne Chen	0279373d11	Merge branch 'master' into ptt	2019-03-11 17:09:37 -07:00
r3tk0n	39342b9771	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-11 16:27:05 -07:00
Wayne Chen	80821e8b7e	changing mic bar indicator when muted in PTT	2019-03-11 16:15:47 -07:00
Wayne Chen	ca5ff3381b	changing position of the mute warning setting	2019-03-11 16:02:18 -07:00
Wayne Chen	36c2358dc0	Merge branch 'master' into muteWarningModified	2019-03-11 14:35:13 -07:00
Roxanne Skelly	c9cb284c19	Case 21467 - only update search when search field content has changed	2019-03-11 14:33:00 -07:00
Wayne Chen	07ddd4e1dd	moving key press detection to JSON	2019-03-11 14:27:47 -07:00
Shannon Romano	801306364a	Merge pull request #15148 from samcake/rc81-hero ... Case 21639: RC81: Adding Hero support in simulation of avatars	2019-03-11 14:13:49 -07:00
r3tk0n	8aedc98a58	Fix QML formatting issue.	2019-03-11 10:54:48 -07:00
r3tk0n	c1ed01115d	Fix logic for HMD vs Desktop.	2019-03-11 09:58:35 -07:00
Wayne Chen	cf3694e8e3	fixing error in master + getting ptt to show up	2019-03-10 19:00:41 -07:00
Wayne Chen	15eb90f634	Merge pull request #16 from wayne-chen/pttSwitchToItem ... fixng ptt checkbox	2019-03-10 17:18:47 -07:00
Wayne Chen	54973375a4	fixng ptt checkbox	2019-03-10 17:18:18 -07:00
Wayne Chen	3dcc53a945	Merge branch 'master' into ptt	2019-03-10 17:14:54 -07:00
Wayne Chen	2eaa1e63d3	switch from column layout to item	2019-03-10 17:07:02 -07:00
Sam Gateau	3464fe09c1	Applying the hero changes to master soon to be rc81	2019-03-08 18:13:20 -08:00
Roxanne Skelly	74320fe7be	Case 20622 - Qml Marketplace - Fix categories dropdown UI issues	2019-03-08 17:24:43 -08:00
Shannon Romano	ca87e217bd	Merge pull request #15097 from wayne-chen/audioSettingsModified ... Case 21562: Audio settings screen	2019-03-08 16:22:52 -08:00
Wayne Chen	88d8163b04	updating compile failure + icons/settings update	2019-03-08 16:07:46 -08:00
Wayne Chen	39db3979b9	changing text display	2019-03-08 16:07:09 -08:00
Wayne Chen	cb0fdd2ef2	laying groundwork for audio app + fixing deadlocks	2019-03-08 16:06:45 -08:00
r3tk0n	88a125aff0	Initial implementation (deadlocks still occurring in Audio.cpp)	2019-03-08 16:05:24 -08:00
Wayne Chen	b7d44403e1	updating compile failure + icons/settings update	2019-03-08 16:02:15 -08:00
Wayne Chen	8a5924077a	changing text display	2019-03-08 16:02:15 -08:00
Wayne Chen	7cb17b2d6e	laying groundwork for audio app + fixing deadlocks	2019-03-08 16:02:14 -08:00
r3tk0n	15d49fd9a9	Initial implementation (deadlocks still occurring in Audio.cpp)	2019-03-08 16:02:14 -08:00
Shannon Romano	c3b8f6ed93	Merge pull request #15145 from roxanneskelly/StandaloneTags ... Case 21642 - verification dialog when user hits return in goto search	2019-03-08 15:29:34 -08:00
Howard Stearns	1d52ed1524	Merge pull request #15146 from howard-stearns/do-not-scroll-under-letterbox ... do not scroll inventory items underneath modal dialog	2019-03-08 15:27:44 -08:00
Howard Stearns	fac162c2bc	Merge pull request #15144 from howard-stearns/about-blockchain ... Change "about" blockchain from Elements to EOS	2019-03-08 15:17:31 -08:00
Shannon Romano	cc154be12d	Merge pull request #15090 from danteruiz/oculus-tracking-controllers ... Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity	2019-03-08 14:56:56 -08:00
Roxanne Skelly	b3f5d76d0f	CR Fix	2019-03-08 14:37:15 -08:00
Howard Stearns	8791252acd	do not scroll inventory items underneath modal dialog	2019-03-08 14:27:56 -08:00
Roxanne Skelly	88a4b5c983	Case 21642 - verification dialog when user hits return in goto search ... text entry+return should throw up verification dialog for first time to non-optimized domain	2019-03-08 14:01:47 -08:00
Howard Stearns	24b08bd25d	Change "about" blockchain from Elements to EOS	2019-03-08 13:59:16 -08:00
Roxanne Skelly	70cc6594c7	CR fixes	2019-03-08 12:43:43 -08:00
Roxanne Skelly	c33d2aafda	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-08 11:41:34 -08:00
Roxanne Skelly	750dbfae21	Stand-alone Tags: Throw up popup for first unoptimized domain ... Throw up a popup in stand-alone builds when user attempts to go to an unoptimized domain.	2019-03-08 10:48:42 -08:00
Shannon Romano	ef44218fe3	Merge pull request #15128 from roxanneskelly/case21315etc ... Case 21315, Case 21326, Case 21370	2019-03-08 08:37:23 -08:00
danteruiz	d1e376de0e	destroy modal dialogs that prevent interface from getting input	2019-03-07 14:29:38 -08:00
Roxanne Skelly	cce43357d0	Case 21315, Case 21326, Case 21370 ... Case 21315 - Clicking on item picture from Inventor Items list does not always display the Marketplace item page. Case 21326 - See All Markets page is missing its footer and the two Explore buttons no longer work Case 21370 - QML Marketplace - For unavailable items (no more editions for sale), marketplace item list 'buy' button is not disabled Also, a few minor font sizing and other graphics tweaks	2019-03-07 13:58:51 -08:00
Howard Stearns	ab8f6273ad	Merge pull request #15113 from howard-stearns/stock-to-master ... Stock to master	2019-03-07 11:02:53 -08:00
Anthony Thibault	96a696203c	Merge pull request #15101 from amantley/bugAvatarHovers ... Fixed: Avatar hovers off ground while running	2019-03-07 10:52:20 -08:00
Roxanne Skelly	b38fc65372	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-07 10:06:05 -08:00
Howard Stearns	c6b2697b44	cleanup	2019-03-06 13:28:55 -08:00
Howard Stearns	8ebab88613	Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master	2019-03-06 13:08:19 -08:00
Shannon Romano	3600b98bd0	Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus ... Case 21340: avatar doctor project page status	2019-03-06 12:36:18 -08:00
Howard Stearns	ddfd437696	ensure error message when marketplace update fails	2019-03-06 11:37:17 -08:00
Howard Stearns	366dd935dd	trading in has nothing to do with whether you own the new item	2019-03-06 11:36:34 -08:00
Howard Stearns	416cde4c1f	fix uses of updated_item_id that got lost	2019-03-06 11:36:08 -08:00
Howard Stearns	f5afc2033f	work through stocking vs update issues, and cleanup	2019-03-06 11:35:36 -08:00
Thijs Wenker	a84a43320c	added spacing between lines	2019-03-06 19:15:01 +01:00
Thijs Wenker	59200103af	Not for sale explanation	2019-03-06 07:06:48 +01:00
danteruiz	1941e53cc3	track oculus controllers while in oculus home	2019-03-05 15:32:18 -08:00
amantley	8e9618d740	added a lower run animation to stop hovering when running	2019-03-05 11:44:53 -08:00
Wayne Chen	2020b757a3	adding mic glyph	2019-03-05 10:58:26 -08:00
Wayne Chen	f1cf11de85	moving gain slider to audio settings	2019-03-05 10:53:55 -08:00
Wayne Chen	a00d6ec9f6	removing debug statement	2019-03-04 19:42:30 -08:00
Wayne Chen	0f2792930a	adding switches and buttons to testing audio	2019-03-04 19:28:12 -08:00
Wayne Chen	a68aaaa7a4	adding timer and ui color changes	2019-03-04 16:06:50 -08:00
Wayne Chen	4187104b17	culling mute state	2019-03-04 14:12:09 -08:00
Seth Alves	9614216006	don't disable server echo when audio qml page is closed	2019-03-04 13:47:55 -08:00
Seth Alves	d5e8cba1ee	make server-audio-loopback button work in HMDs	2019-03-04 13:47:55 -08:00
Seth Alves	6ee236e783	added a button to enable server loopback of audio	2019-03-04 13:47:55 -08:00
Seth Alves	3ecd86caee	add a way to disble muted warning from audio panel. ... fix positioning of warning. hide warning when removing timer.	2019-03-04 13:47:55 -08:00
Wayne Chen	7860db68eb	culling hearing oneself and testing sound	2019-03-04 13:33:16 -08:00
Seth Alves	0523a0d06d	don't disable server echo when audio qml page is closed	2019-03-04 11:08:07 -08:00
Seth Alves	9ff99c7213	make server-audio-loopback button work in HMDs	2019-03-04 11:08:07 -08:00
Seth Alves	6f40079621	added a button to enable server loopback of audio	2019-03-04 11:08:07 -08:00
Seth Alves	38256df0f2	add a way to disble muted warning from audio panel. ... fix positioning of warning. hide warning when removing timer.	2019-03-04 11:08:06 -08:00
r3tk0n	fcdfae5a67	Fix notion of hand dominance.	2019-02-27 08:39:35 -08:00
Wayne Chen	028cce5394	change short username to 14 characters, displaying as normal text	2019-02-26 12:26:50 -08:00
Wayne Chen	650b34c463	adding clock	2019-02-25 18:00:56 -08:00
r3tk0n	5d3a778b0b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation	2019-02-25 13:10:47 -08:00
Roxanne Skelly	292ac88c96	Update with new standalone-optimized icon	2019-02-25 11:36:45 -08:00
Thijs Wenker	79d0a0a0a8	avatar doctor project status	2019-02-25 19:28:38 +01:00
Roxanne Skelly	0636579822	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-22 15:43:42 -08:00
amantley	c9db426ce4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-21 14:36:13 -08:00
Roxanne Skelly	8c058f147e	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-20 14:24:47 -08:00
Roxanne Skelly	dca166f821	Stand-alone Optimized Tagging - Add tagging for GOTO User Stories	2019-02-20 14:23:54 -08:00
John Conklin II	87556059d3	Merge pull request #13901 from Cristo86/android_handshake ... case 20058: Android - Handshake implementation	2019-02-20 13:33:52 -08:00
r3tk0n	0255036e6d	Fix default mappings' deadzones.	2019-02-19 15:23:05 -08:00
r3tk0n	d8b1a47974	Fix oversized Vive deadzone.	2019-02-19 15:05:39 -08:00
Brad Davis	d60dcb99d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-19 12:37:30 -08:00
Roxanne Skelly	d957b38f10	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-19 12:34:10 -08:00
r3tk0n	ebbf48a11b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 12:02:50 -08:00
Howard Stearns	d7d6ff53ca	Merge pull request #14765 from howard-stearns/artist-stocking-inventory ... Case 20657: artist stocking inventory	2019-02-19 10:46:01 -08:00
Angus Antley	70764bc3c4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-15 19:24:30 -08:00
Howard Stearns	e9b323a807	fix HFC symbol location at checkout, and the display of unavailable items	2019-02-15 16:56:31 -08:00
John Conklin II	4520236873	Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor ... Case 21012: Avatar Doctor	2019-02-15 15:43:18 -08:00
Howard Stearns	f16eb1c029	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-02-15 15:15:13 -08:00
Thijs Wenker	e900d3784b	fixes	2019-02-15 23:58:42 +01:00
John Conklin II	09d8221582	Merge pull request #14834 from gcalero/connection_failure_dialog ... Case 20936: Set message dialog text width so wrap mode takes effect	2019-02-15 14:16:02 -08:00
Brad Davis	578bc4fc89	Suppress logspam with missing Controller in QML	2019-02-15 14:15:24 -08:00
Roxanne Skelly	2c4f485079	QmlMarketplace invert arrow direction on sort.	2019-02-15 12:31:01 -08:00
Thijs Wenker	74ce98a075	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor	2019-02-15 20:57:20 +01:00
Thijs Wenker	556a55ff16	Better scale and texture checks	2019-02-15 20:55:27 +01:00
Roxanne Skelly	fb524f8900	Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace	2019-02-15 11:35:06 -08:00
Roxanne Skelly	be98fb1ac7	Standalone Tags - checkpoint	2019-02-15 11:21:40 -08:00
Howard Stearns	490ef3542e	update for marketplace-in-qml, and make specific to username	2019-02-15 10:58:09 -08:00
amantley	0fcaa695ba	Merge remote-tracking branch 'upstream/master' into animArmIK	2019-02-15 10:35:33 -08:00
Brad Davis	0b171ffe13	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-15 10:31:04 -08:00
Howard Stearns	30c0dda9ed	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-02-15 09:27:48 -08:00
Simon Walton	748747da2d	Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist ... Case 19724: If sorting PAL by loudness re-sort upon loudness updates	2019-02-15 09:24:34 -08:00
amantley	425413419a	fixed merge conflict in avatar.h	2019-02-15 08:26:54 -08:00
Angus Antley	382a03929e	changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint	2019-02-15 07:06:43 -08:00
Bradley Austin Davis	d45d87031d	Merge pull request #14782 from SamGondelman/NOverlaysFinal ... Case 20723, Case 20334: Internally, replace all overlays with local entities	2019-02-14 13:49:47 -08:00
Brad Davis	292602afd7	Resolving more master differences	2019-02-14 12:55:28 -08:00
Brad Davis	0f4d1f073b	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-14 12:49:56 -08:00
Sam Gateau	969c62d0df	Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac ... Case 21157: Fix Desktop.qml crash on local mac build	2019-02-14 12:15:50 -08:00
Thijs Wenker	3026fd625a	Avatar Doctor	2019-02-14 18:52:50 +01:00
Roxanne Skelly	20d7e00ea8	Standalone Tags - Checkpoint	2019-02-14 08:48:37 -08:00
danteruiz	562e159ab4	the proper fix for browser qml issues	2019-02-13 10:45:07 -08:00
danteruiz	a111aa1724	fix blocks app	2019-02-12 16:45:45 -08:00
Shannon Romano	10e5e9e0c3	Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix ... Fixed MS21059: Avatar App Keyboard Raise in Desktop	2019-02-12 15:02:28 -08:00
Brad Davis	db121957d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-12 15:00:03 -08:00
Dante Ruiz	5e9b63b352	fix-qml-crash-on-mac	2019-02-12 13:56:56 -08:00
Roxanne Skelly	a82221d2a5	Case 21118 - descending sorts don't work in new (qml) marketplace	2019-02-12 13:20:47 -08:00
Brad Davis	a6f23f48d6	Merge branch 'feature/quest_custom_plugins' into feature/quest	2019-02-12 09:53:12 -08:00
Mark	9d81ace243	Fixed MS21059: Avatar App Keyboard Raise in Desktop	2019-02-12 09:45:51 -08:00
Simon Walton	73296aa986	Change update rate to 1 Hz	2019-02-11 16:59:18 -08:00
Cristian Luis Duarte	009f24dda1	Android - Make minWidth of message dialog wider so error messages like protocol version error fits in two lines	2019-02-11 21:28:31 -03:00
Cristian Luis Duarte	37b5f11489	Merge remote-tracking branch 'origin/master' into connection_failure_dialog	2019-02-11 19:53:11 -03:00
Simon Walton	4f2223ced3	Change max update to 10 Hz	2019-02-11 14:17:55 -08:00
Roxanne Skelly	4f8de7ed0b	Case 21123, Case - marketplace license display has weird crud in it (new qml version)	2019-02-11 12:48:04 -08:00
Roxanne Skelly	a0199c5884	Case 21119, 21120 ... Case 21119 - text filter doesn't change as you type in new (qml) marketplace Case 21120 - text filter doesn't clear in new (qml) marketplace	2019-02-11 12:27:02 -08:00
Simon Walton	44c163b7cc	Tweak inventory-delete message to be more accurate	2019-02-11 10:30:51 -08:00
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub	a23f436a9f	Merge pull request #14880 from kencooke/audio-meter-improvements ... Case 21091: Improved audio metering	2019-02-08 19:08:31 -08:00
Roxanne Skelly	74f8615fb7	Merge pull request #14876 from roxanneskelly/QmlMarketplace ... Case 20653: QmlMarketplace - disable links if 3dhtml surfaces are not available	2019-02-08 15:04:35 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
Roxanne Skelly	93665fa501	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-08 14:21:29 -08:00
danteruiz	76a56c679a	making requested changes	2019-02-08 10:03:05 -08:00
Cristian Duarte	d034b080f7	Increase min width so texts like protocol mismatch fit and let the OK appear	2019-02-08 14:19:44 -03:00
Ken Cooke	5681a996a1	Fix meter color gradient, to encourage proper mic levels. ... High levels are now yellow, actual digital clipping sets red indicator light.	2019-02-07 16:33:41 -08:00
Ken Cooke	d2abf1a56d	Add "clipping" indicator to audio level meter	2019-02-07 15:52:29 -08:00
Ken Cooke	52aa20b4d5	Add "gated" indicator to audio level meter	2019-02-07 15:47:56 -08:00
Roxanne Skelly	4bbb030ad7	Show only free items when running from the oculus store	2019-02-07 15:34:44 -08:00
danteruiz	d71fb2a100	moved missed QtWebEngine references to +webengines	2019-02-07 14:57:25 -08:00
SamGondelman	c217f8d80f	remove overlay picks from stats qml	2019-02-07 14:25:07 -08:00
Roxanne Skelly	c775a9b23f	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-07 13:23:59 -08:00
Roxanne Skelly	d04445c244	Qml Marketplace - remove some quest incompatibilities and disable ... links for quest	2019-02-07 13:22:49 -08:00
danteruiz	95d30e5cbf	Merge branch 'master' of github.com:highfidelity/hifi into feature/quest	2019-02-07 10:41:44 -08:00
SamGondelman	e74ff18bef	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:49:27 -08:00
SamGondelman	25ca52d892	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:48:13 -08:00
Cristian Duarte	babb972d89	Merge remote-tracking branch 'hifi/master' into android_handshake	2019-02-07 14:44:22 -03:00
Sam Gateau	632d6e8a73	Merge pull request #14863 from danteruiz/android-apps-directories ... Case 20877: Support CMake time configuration of QmlFileSelectors	2019-02-07 09:30:49 -08:00
SamGondelman	b1e7c3d4fd	allow negative dimensions for planar overlays via HACK, set default texture for line overlays to white pixel	2019-02-06 16:04:40 -08:00
Simon Walton	58d8945aa5	Limit re-sort rate to 2 Hz.	2019-02-06 14:41:27 -08:00
Brad Davis	8b70f1771e	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-06 13:16:22 -08:00
Simon Walton	a2da59271d	If sorting PAL by loudness re-sort upon loudness updates	2019-02-06 11:38:48 -08:00
danteruiz	d0fecac0d8	+android -> +android_interface	2019-02-06 11:37:52 -08:00
Shannon Romano	61459d5756	Merge pull request #14775 from roxanneskelly/QmlMarketplace ... Qml marketplace	2019-02-06 11:20:49 -08:00
Brad Davis	91e18f569b	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-06 10:15:36 -08:00
amantley	07a4f49c58	adding the armik nodes into the json	2019-02-05 17:21:39 -08:00
Jeff Clinton	35608c35de	Merge pull request #14808 from danteruiz/webengine-fileselector ... Case 20879: Migrate webEngine referencing QML into +webengine folder	2019-02-05 12:57:38 -08:00
Roxanne Skelly	d3bc536b58	Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace	2019-02-05 11:35:28 -08:00
Roxanne Skelly	2b40260953	QmlMarketplace - disable HTML for quest	2019-02-05 09:27:12 -08:00
Roxanne Skelly	364a1698fe	QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions	2019-02-04 17:24:30 -08:00
Roxanne Skelly	db9b44a71a	QmlMarketplace - The QML Text object has sufficient markup to handle ... all of our needs, so use that instead of webengineview	2019-02-04 15:30:53 -08:00
Roxanne Skelly	78aa1783a0	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-04 15:04:55 -08:00
Roxanne Skelly	e23c589de7	QmlMarketplace - fix issue with footer not appearing in marketplaces list	2019-02-04 15:04:18 -08:00
Roxanne Skelly	1840f874ab	Add Attributions to Qml Marketplace	2019-02-04 13:29:06 -08:00
amantley	34d32eeda8	removed the extra ikoverlay in the avatar-animation.json	2019-02-04 10:17:22 -08:00
Roxanne Skelly	39ad36a4d0	QmlMarketplace - bugfixes and Markup rendering of descriptions ... * Render markup in descriptions (bold, italic, quote, etc.) * Back button from marketplaces list now works properly * Layout fixes	2019-02-01 15:27:17 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
Dante Ruiz	f4118213b1	give tablet root color	2019-02-01 10:12:04 -08:00
Gabriel Calero	a1d18feb0a	Set message dialog text width so wrap mode takes effect	2019-01-31 16:30:02 -03:00
amantley	f68ee4e7ce	merged with master	2019-01-31 09:56:46 -08:00
amantley	d547d5b854	changed the json reader to take an array not a string for the flex targets	2019-01-30 18:16:02 -08:00
Dante Ruiz	93a91cdba2	webengine fileselector	2019-01-30 13:57:49 -08:00
Gabriel Calero	6a665835e7	Merge remote-tracking branch 'upstream/master' into android_handshake	2019-01-30 17:06:41 -03:00
Brad Davis	10a7403d44	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-01-30 10:19:46 -08:00
Jeff Clinton	0def57f2c8	Merge pull request #14805 from danteruiz/fix-qml-rendering ... Case 20902: Give SendAsset.qml a background color	2019-01-30 08:54:03 -08:00
Dante Ruiz	ccf02d8b65	fix SendAssets.qml	2019-01-29 17:16:27 -08:00
Roxanne Skelly	0fdbca8ade	QmlMarketplace Bugfixes ... * Fix upgrades * Certificate 'View in Marketplace' wasn't working * command-line hifiapp:MARKET wasn't launching * Home link wasn't disappearing where it should * Log In button on marketplace wasn't working * Other minor UI bugfixes	2019-01-29 16:07:27 -08:00
Simon Walton	e45634d4ea	Merge remote-tracking branch 'upstream/master' into pal_username_update	2019-01-29 11:55:39 -08:00
sabrina-shanman	203e8e2455	Realize joint properties isFree and freeLineage are unused, so tear them out	2019-01-29 11:55:35 -08:00
Angus Antley	3994311583	starting the move of the initial head base spline to myskeletonmodel	2019-01-29 08:54:35 -08:00
SamGondelman	0d1e4bed66	merge with master	2019-01-28 18:13:05 -08:00
amantley	1919cc3b1a	disable mid joint when not valid. more work on this tomorrow	2019-01-28 17:49:46 -08:00
Simon Walton	d2af7eed3d	Don't update PAL namecard with empty strings	2019-01-28 17:44:04 -08:00
Brad Davis	b1e4e17f47	Santa Cruz	2019-01-28 15:52:36 -08:00
Shannon Romano	d8f781deae	Merge pull request #14719 from jherico/feature/quest_frame_serialization ... case 20883: GPU frame serialization and related tools	2019-01-28 15:47:55 -08:00
Roxanne Skelly	2fe78383ed	QmlMarketplace - Fix issues found during test ... * command line --url hifiapp:MARKET was not bringing up correct marketplace * Search field was not being cleared when 'home' button was clicked after a search * tablet button was not lit when marketplace was launched	2019-01-28 15:14:49 -08:00
amantley	ffd3a24bf2	further cleaning, broke the arms	2019-01-28 13:53:30 -08:00
amantley	f8bfef6dbd	cleaning up the _hipsIndex references, cleaning in general	2019-01-28 11:50:23 -08:00
Roxanne Skelly	d3cffa50d6	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-28 11:11:28 -08:00
Roxanne Skelly	8357f1f9b5	CR fixes	2019-01-28 11:10:35 -08:00
Angus Antley	2679a3a30d	changed the naming of the middle joint from secondary target to midJoint, also generalized the handling of the neck head rotation after the middle spline is updated	2019-01-27 16:30:13 -08:00
amantley	0b6d0b4baf	renamed json to reflect spline node	2019-01-25 18:17:15 -08:00
Shannon Romano	f084021fdf	Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type ... Added HMD Avatar Alignment Type	2019-01-25 17:32:41 -08:00
Shannon Romano	fe874ca5b1	Merge pull request #14511 from danteruiz/spinbox-fixes ... case 20100: fix SpinBox.qml in ControlsUit and adjusting OpenVrConfiguration SpinBoxes	2019-01-25 17:30:16 -08:00
amantley	f2a7f37950	got rid of the lag in the spline code by setting the flex coeffs to 1.0	2019-01-25 17:11:07 -08:00
Roxanne Skelly	dfac0d88a2	QmlMarketplace - Add 'logged out' behavior, fix issue with search scope ... display	2019-01-25 16:41:13 -08:00
Jeff Clinton	f78fdffeda	Merge pull request #14727 from wayne-chen/oculusLoginFeature ... MS20311: Oculus login feature	2019-01-25 16:16:32 -08:00
Howard Stearns	2070e9a173	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-01-25 15:40:04 -08:00
amantley	bcbd9323c0	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-01-25 14:42:24 -08:00
amantley	446d7b9514	added the flex coeff for the primary and secondary spline targets to the json	2019-01-25 14:41:18 -08:00
r3tk0n	9ea476ea89	Attempt to add acceleration curve.	2019-01-25 14:27:54 -08:00
Howard Stearns	49a3a13d57	use space a bit better	2019-01-25 14:13:58 -08:00
Howard Stearns	52a43ca4cd	support artist's stocking to inventory	2019-01-25 14:09:00 -08:00
Roxanne Skelly	49e6120e73	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-25 14:06:44 -08:00
Adam Smith	f651ad2f67	Merge pull request #14711 from SamGondelman/NOverlays10 ... Case 20585: Add missing Web Overlay functionality to Web Entities	2019-01-25 14:00:52 -08:00
Roxanne Skelly	6123c4ec96	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-25 13:45:04 -08:00
Roxanne Skelly	ff2d51701e	QML Marketplace ... Add keyboard while in search General cleanup	2019-01-25 13:41:16 -08:00
Wayne Chen	c136f24181	Merge branch 'master' into oculusLoginFeature	2019-01-25 11:44:14 -08:00
Shannon Romano	90c7423dfb	Merge pull request #14772 from wayne-chen/loginScreenPreserveRatio ... MS20825: Login Screen Aspect/Crop with resizing	2019-01-25 11:16:10 -08:00
SamGondelman	5ce8f566cc	more overlay wip	2019-01-25 11:10:11 -08:00
Roxanne Skelly	cfaf01b22a	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-24 17:21:16 -08:00
Roxanne Skelly	c1ff51a02d	QML Marketplace ... Checkpoint full functionality	2019-01-24 17:20:42 -08:00
amantley	37f92d2319	added code to read tip and base var info from the json	2019-01-24 17:02:30 -08:00
Wayne Chen	4880c7081e	adding blurred images	2019-01-24 16:00:24 -08:00
Wayne Chen	5c55761e4d	adding fill mode for aspect/crop	2019-01-24 15:57:04 -08:00
Wayne Chen	9da7465698	readding render session, adding newlines for oculus failure	2019-01-24 15:33:50 -08:00
r3tk0n	09d15c9cb0	Block TranslateZ when off-hand Y axis is active.	2019-01-24 14:20:42 -08:00
SamGondelman	5d19666f60	merge with master	2019-01-23 17:58:56 -08:00
SamGondelman	9a734b2011	merge with master	2019-01-23 17:48:24 -08:00
amantley	cdd03646c2	latest spline code with ik node removed started cleanup	2019-01-23 17:22:13 -08:00
Anthony Thibault	a7a71e4286	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -08:00
Dante Ruiz	df34d8dcc0	fix spinbox and adjusting OpenVrConfiguration spin boxes	2019-01-23 14:59:37 -08:00
Wayne Chen	049282e2b3	fixing text alignment issues, adding some oculus user log	2019-01-23 14:38:06 -08:00
Brad Davis	e18e3fc138	Gpu Frame serialization	2019-01-23 13:21:34 -08:00
Wayne Chen	e6426cb680	fixing bug with cancel button	2019-01-23 10:26:51 -08:00
Clement	61be5a3cc4	Enable "Add To World" Asset Browser button for glTF	2019-01-22 17:01:06 -08:00
amantley	dbd03e2eb4	got the spline arms and legs working without any inverse kinematic node in the json, using _withIKnode.json	2019-01-22 11:53:18 -08:00
amantley	8d88c627b0	nearly have the arms legs and back working with out the ik node	2019-01-21 17:41:08 -08:00
r3tk0n	9586f88ebc	Add hand dominance state awareness to bindings, add bindings for both cases.	2019-01-21 15:39:27 -08:00
Roxanne Skelly	8010d86210	QML Marketplace support ... Support QML UI for the Marketplace as some devices do not handle web on 3d surfaces. Checkpoint code	2019-01-21 13:39:16 -08:00
amantley	6680ca53ad	added updateHands2 which deals with two bone hands animvars	2019-01-20 08:56:39 -08:00
amantley	3a2697fa8c	working on the two bone ik for the hands	2019-01-18 17:55:19 -08:00
amantley	7777162351	got the spine2 rotationa and the head spline working	2019-01-18 15:28:41 -08:00
SamGondelman	d6f0fbd17b	fix snap app issue	2019-01-18 10:48:20 -08:00
Anthony Thibault	0ab13f1e48	Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp ... Change Avatar App design for avatar collisions	2019-01-17 16:06:17 -08:00
Wayne Chen	238f020392	remove trailing whitespace	2019-01-17 14:20:47 -08:00
Wayne Chen	2859784e17	Merge branch 'master' into oculusLoginFeature	2019-01-17 14:20:00 -08:00
John Conklin II	19e4a7389b	Merge pull request #14676 from wayne-chen/updateLoginUserLogging ... case 20654: Updating user activity logging for login experience	2019-01-17 12:59:12 -08:00
Wayne Chen	123f2d71e5	dismissing login dialog on popup if bad linking	2019-01-17 11:38:42 -08:00
Adam Smith	f955313afc	Merge pull request #14687 from SamGondelman/cancel ... Case 20580: Trying to fix wearables and avatar app	2019-01-17 11:25:30 -08:00
Wayne Chen	ef63213d28	fixing linking account problems on oculus/steam, changing callback	2019-01-16 21:07:54 -08:00
amantley	e5b16ef174	implemented the splineIK in animSplineIK.cpp, todo: disable animinversekinematic.cpp	2019-01-16 18:31:52 -08:00
Wayne Chen	bb61334c0d	Merge branch 'master' into oculusLoginFeature	2019-01-16 17:24:22 -08:00
Wayne Chen	673c4ad434	fixing error message spacing	2019-01-16 17:22:00 -08:00
Wayne Chen	3ad0f60dd5	fixing error message spacing	2019-01-16 17:20:01 -08:00
Wayne Chen	8e916ea41b	linking oculus acct creation to spinner	2019-01-16 17:05:59 -08:00
Wayne Chen	f4d4220e58	adding final create failure message handling, ui improvements	2019-01-16 17:05:56 -08:00
Wayne Chen	c54bce3953	fixing desktop login page crash	2019-01-16 17:05:55 -08:00
Wayne Chen	d38a657c54	filling username with oculus username, checking create error	2019-01-16 17:05:54 -08:00
Wayne Chen	671f15b63c	removing isLogIn	2019-01-16 17:05:53 -08:00
Wayne Chen	3b3b86888e	adding blur to login bg	2019-01-16 17:05:53 -08:00
Wayne Chen	fbc2dc5103	adding changes to forms	2019-01-16 17:05:52 -08:00
Wayne Chen	5c54930910	adding tablet close upon login	2019-01-16 17:05:52 -08:00
Wayne Chen	ca0916886a	adding more qml for oculus login	2019-01-16 17:05:51 -08:00
Wayne Chen	6bc1164d58	more wip on oculus login	2019-01-16 17:05:50 -08:00
Wayne Chen	970798705c	improving flow from Oculus API to login dialog wip	2019-01-16 17:05:48 -08:00
Wayne Chen	db06533018	adding more staging	2019-01-16 17:05:48 -08:00
Wayne Chen	1fc51445d0	adding files for staging login	2019-01-16 17:05:47 -08:00
Seth Alves	fd09180776	Merge pull request #14645 from ctrlaltdavid/M19774-d ... Make mouselook directly proportional to right-click mouse	2019-01-16 09:09:38 -08:00
Wayne Chen	3b913db609	fixing typo	2019-01-15 14:21:37 -08:00
Shannon Romano	eed53f60ba	Merge pull request #14556 from vladest/avatar_app_warnings ... Fix Avatar apps warnings.	2019-01-15 11:03:43 -08:00
SamGondelman	68e15c6c07	fixes from 78	2019-01-14 13:36:21 -08:00
luiscuenca	824a93f900	Fix menu update on app reopened	2019-01-14 12:27:59 -07:00
luiscuenca	43d967329c	Change Avatar App design for avatar collisions	2019-01-14 10:13:12 -07:00
SamGondelman	4b67a79561	more web entity wip	2019-01-11 09:57:42 -08:00
Wayne Chen	ba8620b644	updating user activity logging	2019-01-09 13:51:40 -08:00
Anthony Thibault	5d606981de	Added HMD Avatar Alignment Type ... Adds a new API to set this type, and an option to the Avatar App. * "eye" - Match the user eyes with the avatar eyes. The previous default behavior. If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down. * "head" - Match the user head with the avatar head. The new default behavior. This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.	2019-01-08 18:35:28 -08:00
amantley	3b5d8db650	updated the json to have a spline node at the root	2019-01-08 17:33:14 -08:00
David Back	d9e229d38e	remove add Grid entity button, fix color	2019-01-07 18:20:20 -08:00
David Back	90e2feb977	replace placeholder icon with real icon from Alan	2019-01-07 18:20:20 -08:00
David Back	e0e9a7de15	tabs	2019-01-07 18:20:20 -08:00
David Back	9013eee352	add grid entities to create - icons pending	2019-01-07 18:20:19 -08:00
Jeff Clinton	75d26dc45f	Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption ... Add menu checkbox to toggle collisions with other avatars	2019-01-07 08:58:09 -08:00
luiscuenca	d630fe9dbd	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
Thijs Wenker	5d40e1e480	- CR/style fixes ... - Moved the old Avatar Packager tool to Developer -> Avatar -> ..	2019-01-04 23:39:04 +01:00
Thijs Wenker	a3f72a7a08	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-04 21:10:35 +01:00
Ryan Huffman	6d5b9a88e4	Remove dead code in AvatarUploadStatusItem	2019-01-04 11:29:07 -08:00
Ryan Huffman	c2ceeb3d76	Apply AvatarPackager code review cleanup	2019-01-04 09:41:31 -08:00
Ryan Huffman	f27ee1767c	Fix rename not working correctly in AvatarPackager	2019-01-04 08:43:43 -08:00
Thijs Wenker	8625037285	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-04 15:29:07 +01:00
Antonina Savinova	4414579a6e	Merge pull request #14591 from Atlante45/feat/stats ... Fix network stats to use low-level values	2019-01-03 16:54:03 -08:00
Ryan Huffman	93f53cf43d	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 14:18:40 -08:00
Ryan Huffman	847496048f	Fix waiting-for-inventory sticking around on avatar uploader	2019-01-03 13:51:45 -08:00
Thijs Wenker	68521e11a7	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml # interface/resources/qml/hifi/avatarPackager/InfoBox.qml	2019-01-03 22:13:04 +01:00
Thijs Wenker	ecc578c2dd	- error messages ... - style changes	2019-01-03 22:00:22 +01:00
Ryan Huffman	7953507cb8	Update avatar project rename to have audio and highlighting	2019-01-03 11:59:16 -08:00
Ryan Huffman	c13badcbc8	Fix project rename focus and create project not initializing	2019-01-03 10:20:13 -08:00
Clement	f163bbc0d5	Sample connections stats every seconds	2019-01-03 10:04:38 -08:00
Ryan Huffman	9c96f7bd01	Add RalewayButton	2019-01-03 08:21:52 -08:00
David Rowe	14d39d1747	Make mouselook yaw and pitch directly proportional to mouse movement	2019-01-03 15:53:37 +13:00
Ryan Huffman	61ac9d0050	Update various styling in Avatar Packager	2019-01-02 16:47:09 -08:00
Anthony Thibault	95c93e59a7	Make the Out of Range Strategy drop down wider ... So the "DropAfterDelay" item is not cut off on the Settings > Controlls > Calibration screen.	2018-12-31 09:23:33 -08:00
Thijs Wenker	cb33a91a34	- rename functionality ... - avatar packager works in tablet now	2018-12-29 03:31:56 +01:00
Thijs Wenker	1ec8aa8fa5	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-28 17:13:05 +01:00
Ryan Huffman	24aaeee5fd	Disable back button on avatar upload page	2018-12-27 22:55:54 -08:00
Ryan Huffman	83a60a541b	Fix styling and flow issues in avatar uploader	2018-12-27 18:53:07 -08:00
Ryan Huffman	c21d037800	Fix marketplace uploader not working with projects larger than 128MB	2018-12-27 17:51:27 -08:00
Ryan Huffman	9e7f89e2b0	Update link text for avatar project files	2018-12-27 14:38:46 -08:00
Ryan Huffman	89b03a3cdc	Add info popup box for avatar project files	2018-12-27 14:30:44 -08:00
Thijs Wenker	656d96c725	Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml	2018-12-27 21:52:57 +01:00
Thijs Wenker	1a38abe230	- add jointIndexes to new ... - attempt to fix OSX / linux build - ability to actually load a recent project (previously was only able to load the top recent project)	2018-12-27 21:47:10 +01:00
Ryan Huffman	882975f01c	Update icons in avatar packager	2018-12-27 12:43:43 -08:00
Thijs Wenker	2f32458f72	recent projects	2018-12-27 19:52:56 +01:00
Ryan Huffman	1da179dc04	Update avatar packager styling	2018-12-27 00:13:45 -08:00
vladest	8d9cff3c58	Merge branch 'master' into avatar_app_warnings	2018-12-23 16:45:59 +01:00
Ryan Huffman	8c56e35f69	Add granular status to avatar upload	2018-12-23 00:13:01 -08:00
Ryan Huffman	b717188ed0	Update avatar project styling	2018-12-22 21:57:09 -08:00
Ryan Huffman	9955de6288	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2018-12-21 11:43:49 -08:00
Ryan Huffman	748135eef9	Fix login-required size and projectFiles warning	2018-12-21 11:43:20 -08:00
Thijs Wenker	ad2d9bc79a	- fst read/write should work ... - images are being copied into the correct directory - scripts are added to fst upon project load - modal overlay fix	2018-12-21 19:34:54 +01:00
Thijs Wenker	1da5b3fae2	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2018-12-21 19:20:16 +01:00
Ryan Huffman	7602da6f92	Add AvatarProjectUpload.qml	2018-12-21 08:16:18 -08:00
Thijs Wenker	ea901aa179	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-21 14:11:57 +01:00
Thijs Wenker	dab4a621a3	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2018-12-21 01:59:11 +01:00
Ryan Huffman	556f516be6	Update uploader screen	2018-12-20 16:30:08 -08:00
sam gateau	26c9d7a94e	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:22:19 -08:00
Shannon Romano	21ec4e0c53	Merge pull request #14524 from SamGondelman/NOverlays3 ... Case 20132, Case 16928: First class Image Entities	2018-12-20 21:20:49 +00:00
sam gateau	49df69e609	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:17:02 -08:00
Thijs Wenker	79a9c82168	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-20 18:56:33 +01:00
Jeff Clinton	3d4311b7d4	Merge pull request #14613 from zfox23/MS20253_eventBridge ... MS20253: Only emit screenChanged once screen has changed	2018-12-20 08:58:53 -08:00
Sam Gateau	8fba8062c3	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-19 20:01:48 -08:00
Zach Fox	b0ce3a54d5	Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash	2018-12-19 15:16:55 -08:00
Zach Fox	d0998174ff	Un-wear things when trashing them if worn	2018-12-19 15:16:48 -08:00
Zach Fox	46e00cf1b3	Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash	2018-12-19 15:03:36 -08:00
Ryan Huffman	202326dbac	Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager	2018-12-19 12:03:30 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
Ryan Huffman	c2aca64b11	Add start of opening uploaded avatar in inventory	2018-12-19 11:30:21 -08:00
Thijs Wenker	cb74313de8	create projects / style changes	2018-12-19 19:23:24 +01:00
Zach Fox	7fee0fc1e4	Fix MS20253: Only emit screenChanged once screen has changed	2018-12-19 09:50:52 -08:00
Zach Fox	116edcc224	I have no idea how this happened	2018-12-19 09:36:05 -08:00
sam gateau	9c436bc28c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-19 09:31:41 -08:00
Jeff Clinton	a7e7a2426e	Merge pull request #14538 from ElderOrb/FB19355 ... FB19355 - When I have avatar entities as children of my avatar, the A…	2018-12-19 09:09:54 -08:00
Zach Fox	f407042f3e	Quick polish fix to prevent UI flashing	2018-12-18 17:11:10 -08:00
sam gateau	265b1591d6	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-18 14:43:12 -08:00
Ryan Huffman	720cd90dc7	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-18 13:17:28 -08:00
Ryan Huffman	ad471387f7	Integrate marketplace upload API	2018-12-18 13:08:55 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
Wayne Chen	302e314787	keep me logged in by default	2018-12-17 15:21:41 -08:00
vladest	63aa27475e	Merge branch 'master' into avatar_app_warnings	2018-12-15 19:08:56 +01:00
Shannon Romano	a89c53cc52	Merge pull request #14581 from zfox23/MS20308_unknownItems ... Fix MS20308: Allow users to checkout uncertifiable items	2018-12-15 00:44:50 +00:00
Zach Fox	47a46c1d1b	Fix MS20308: Allow users to checkout uncertifiable items	2018-12-14 11:17:56 -08:00
Shannon Romano	131b53e4df	Merge pull request #14315 from wayne-chen/loginInitiative2 ... 2nd initiative for encouraging login	2018-12-14 01:59:35 +00:00
Ryan Huffman	2269447741	Fix AvatarPackager QML size	2018-12-13 15:27:10 -08:00
Shannon Romano	3e10bea1ce	Merge pull request #14567 from davidkelly/dk/18639 ... Return more connections in pal	2018-12-13 22:48:00 +00:00
Wayne Chen	1ce7d8a31c	dev feedback	2018-12-13 13:47:07 -08:00
Ryan Huffman	78c4c2599e	Add start of marketplace uploading and project file list	2018-12-13 13:27:31 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
Wayne Chen	a2ebb67cd5	dev feedback/fixing keyboard in profile creation	2018-12-12 17:33:22 -08:00
Wayne Chen	67fe05da97	fixing spacing	2018-12-12 15:31:33 -08:00
Wayne Chen	b4e2b74f3d	adding text wrapping/fixing keep me logged in setting	2018-12-12 15:27:42 -08:00
Wayne Chen	941050d42c	fixing tablet apps/referenceerror	2018-12-12 12:43:01 -08:00
Thijs Wenker	96673bb5b9	show project page	2018-12-12 21:15:44 +01:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Thijs Wenker	c0bd9121fb	open avatar projects	2018-12-12 19:55:14 +01:00
Wayne Chen	941df8bc35	attempting fix on losing logged in setting	2018-12-12 10:08:50 -08:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Zach Fox	dff7804cdc	Change username to trashbot	2018-12-11 16:26:49 -08:00
Zach Fox	d74f7eb098	Implement MS20187: Add trash can feature to Inventory	2018-12-11 15:44:42 -08:00
Wayne Chen	f63c1b3fc5	dismiss dialog only if login dialog popped up	2018-12-11 15:42:35 -08:00
David Kelly	b2645bc23b	Return more connections in pal	2018-12-11 14:47:18 -08:00
Shannon Romano	efedc1f0b5	Merge pull request #14563 from danteruiz/teleport-settings ... Adding menu settings to disable teleporting	2018-12-11 21:08:23 +00:00
Zach Fox	826644ef08	Merge pull request #14559 from zfox23/MS20161_updatesDot ... Fix MS20161: Fix INVENTORY notification dot state	2018-12-11 13:03:26 -08:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
Zach Fox	75ba1cb3c7	I forgot to clear dot immediately	2018-12-11 10:30:12 -08:00
Thijs Wenker	3943fe2861	avatar packager initial	2018-12-10 21:29:03 +01:00
Wayne Chen	e53e8435eb	more fixing of logging in	2018-12-10 11:51:34 -08:00
Wayne Chen	2a37ed21b2	more centering	2018-12-10 11:16:31 -08:00
Wayne Chen	5c354c4bc7	centering logged in text	2018-12-10 11:13:55 -08:00
Wayne Chen	c80f7c5a29	fixing typos	2018-12-10 10:55:02 -08:00
Wayne Chen	f11c60d9ff	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-12-10 10:52:14 -08:00
Jeff Clinton	40f50eccb1	Merge pull request #14550 from zfox23/MS20208_assetsToInventory ... Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'	2018-12-10 10:49:06 -08:00
Wayne Chen	3c4382773a	fixing code for max height/width	2018-12-09 07:56:09 -08:00
vladest	c05e3e7d09	Fix Avatar apps warnings. Added notification for HMD.active property	2018-12-08 19:12:02 +01:00
Wayne Chen	a787b39cae	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 17:39:51 -08:00
John Conklin II	0a80c16686	Merge pull request #14419 from SamGondelman/splash ... Case 19740: Improve startup times by pre-compiling shaders with splash screen	2018-12-07 16:10:52 -08:00
Wayne Chen	23d3b96446	add spinner/design updates/fix steam link	2018-12-07 15:17:33 -08:00
Sam Gondelman	4c5ff0dc3e	Merge branch 'master' into NOverlays3	2018-12-07 14:26:59 -08:00
Jamil Akram	bc5166d1d8	Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking ... Added DropAfterDelay strategy to Vive Tracker Calibration Dialog	2018-12-07 12:09:44 -08:00
Zach Fox	4cc5fc755f	Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'	2018-12-07 11:42:03 -08:00
Wayne Chen	4e6f162e01	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
Wayne Chen	2f4805dc04	adding focus disable signal to fix focus	2018-12-06 16:38:10 -08:00
Zach Fox	7dcf5da954	Merge pull request #14503 from zfox23/payOut1 ... Pay-Out API Frontend, Part One	2018-12-06 15:25:54 -08:00
Wayne Chen	1a86b8d172	50% opacity/bold shortcut text	2018-12-06 14:58:39 -08:00
Wayne Chen	4f0e23ed69	changing link steam flow/height of error message	2018-12-06 11:26:33 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
Jeff Clinton	43f84a9577	Merge pull request #14426 from ElderOrb/FB19400 ... FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null	2018-12-06 11:18:39 -08:00
Zach Fox	a2af50a9d0	Show pre-auth'd transactions in Recent Activity before redemption	2018-12-06 11:07:26 -08:00
Wayne Chen	9f894ae977	fixing case with KB pw prop./bolding error msg	2018-12-06 10:52:10 -08:00
Wayne Chen	89a216a5ec	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-12-06 09:05:07 -08:00
Wayne Chen	ce65e557bc	cleaning up commented code	2018-12-06 09:04:57 -08:00
Wayne Chen	f8a55a9196	25% opacity from PM req/fixing error message in profile body	2018-12-05 19:42:44 -08:00
Wayne Chen	a3a575acd1	updating background img binaries	2018-12-05 19:12:21 -08:00
Wayne Chen	f7265378bd	updating background img	2018-12-05 19:11:58 -08:00
Wayne Chen	037abd9b5e	don't allow PC keyboard in HMD login/fix sign up password	2018-12-05 18:14:59 -08:00
Zach Fox	235b27a198	Merge branch 'master' of github.com:highfidelity/hifi into payOut1	2018-12-05 16:35:07 -08:00
Zach Fox	02307d2308	Secret to Coupon ID	2018-12-05 16:34:53 -08:00
Alexander Ivash	090bc4fc0d	FB19355 - When I have avatar entities as children of my avatar, the Avatar app is not consistent in displaying wearables	2018-12-05 23:33:34 +03:00