28149 commits

Author	SHA1	Message	Date
NissimHadar	bb54353644	Compilation error.	2018-12-30 22:36:15 -08:00
NissimHadar	4b4ef4412a	Merge branch 'master' of github.com:highfidelity/hifi into 20466-addPlatormInfo	2018-12-30 20:24:16 -08:00
NissimHadar	76ce63da64	Can read graphics card type.	2018-12-30 20:24:00 -08:00
David Rowe	d12b504a88	Use Controller axis value timestamp for mouse movement Controller events	2018-12-31 12:15:51 +13:00
NissimHadar	6debd996c5	Added method to get total system memory in MB.	2018-12-29 21:59:18 -08:00
NissimHadar	3a9214747a	Can read number of logical processors	2018-12-29 20:49:54 -08:00
NissimHadar	63ea300921	Can get CPU brand.	2018-12-29 17:24:44 -08:00
Thijs Wenker	cb33a91a34	- rename functionality ... - avatar packager works in tablet now	2018-12-29 03:31:56 +01:00
Adam Smith	833ad936c0	Merge pull request #14630 from jherico/fix/20284_master ... Fix for Oculus reset view issue	2018-12-28 16:24:40 -08:00
NissimHadar	246c4dab94	Created the PlatformInfo scripting object.	2018-12-28 14:41:55 -08:00
NissimHadar	c28167f797	Initial creation of class - has COPY of getOperatingSystemType().	2018-12-28 14:24:19 -08:00
John Conklin II	4f3dd390b5	Merge pull request #14625 from SamGondelman/deprecateDashed ... Case 20392: Deprecated 3D Overlay dashed/isDashed	2018-12-28 10:16:27 -08: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	8f70865cf7	Fix marketplace upload finishing before inventory item is valid	2018-12-27 21:02:56 -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
Brad Hefta-Gaub	440f517b88	Merge pull request #14602 from samcake/punk ... Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera	2018-12-27 15:43:17 -08:00
Ryan Huffman	a79bf783d2	Fix MyAvatar::collisionWithEntity not firing	2018-12-27 15:12:23 -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
Thijs Wenker	b6359a6cb4	Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager	2018-12-27 14:25:13 +01:00
Ryan Huffman	1da179dc04	Update avatar packager styling	2018-12-27 00:13:45 -08:00
Thijs Wenker	a1ef1b4447	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-24 16:48:40 +01: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
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05: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
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
Ryan Huffman	556f516be6	Update uploader screen	2018-12-20 16:30:08 -08:00
Brad Davis	c985eb3e80	Fix for Oculus reset view issue	2018-12-20 16:07:55 -08:00
SamGondelman	bb030660bd	Merge remote-tracking branch 'upstream/master' into NOverlays4	2018-12-20 13:26:23 -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
SamGondelman	837c261fd5	deprecated dashed/isDashed	2018-12-20 11:28:42 -08:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
Thijs Wenker	79a9c82168	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-20 18:56:33 +01:00
David Kelly	2c647462b1	ACs don't need to call into flagtimeForConnecitonStep	2018-12-20 10:15:44 -07: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	22c2954423	Merge pull request #14568 from zfox23/MS20187_itemTrash ... Implement MS20187: Add trash can feature to Inventory	2018-12-19 18:19:29 -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
Wayne Chen	50d57e8b60	sending user to previous location on second launch	2018-12-19 12:37:08 -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
Jeff Clinton	c80b3dea52	Merge pull request #14611 from wayne-chen/fixScriptsNotBeingSaved-78 ... MS20356: Running Scripts list doesn't persist between Interface restarts	2018-12-19 08:52:40 -08:00
Jeff Clinton	16e3914cd7	Merge pull request #14598 from amantley/ripOutCruft ... Fix for Camera-perspective-is-off-in-first-person-view, master branch	2018-12-18 17:15:58 -08:00
Zach Fox	f407042f3e	Quick polish fix to prevent UI flashing	2018-12-18 17:11:10 -08:00
Jeff Clinton	f51bdead20	Merge pull request #14606 from wayne-chen/fixFileLoginMenuButton ... MS#20355: HMD persisting extra login windows	2018-12-18 17:04:46 -08:00
Wayne Chen	017eb9d1a3	adding fix for scripts not being saved	2018-12-18 16:32:44 -08:00
sam gateau	265b1591d6	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-18 14:43:12 -08:00
sam gateau	2f18555ee0	removing comments and dead code, rewiring the debug	2018-12-18 14:42:45 -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
vladest	84fcf5bf8b	Remove duplicate signals #2	2018-12-18 22:07:54 +01:00
Wayne Chen	b82ba8c085	do nothing with file>login in login state	2018-12-18 12:51:01 -08:00
Jeff Clinton	2ff4905ed3	Merge pull request #14599 from wayne-chen/keepMeLoggedInDefault-78 ... MS20352: Keep me logged in checkbox as on by default	2018-12-18 11:57:17 -08:00
Wayne Chen	b5c3d7c3ed	Merge pull request #14596 from wayne-chen/loginForSmallAvatars-master ... MS20332: HMD Login Prompt-- small avatars cannot reach easily	2018-12-18 10:49:26 -08:00
Sam Gateau	d0d771ce1e	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-17 18:48:07 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
Wayne Chen	50902080ce	fixing typos	2018-12-17 16:48:02 -08:00
Wayne Chen	816733b55f	reverting to master	2018-12-17 16:47:11 -08:00
Wayne Chen	302e314787	keep me logged in by default	2018-12-17 15:21:41 -08:00
Adam Smith	14ab53571f	Merge pull request #14564 from sabrina-shanman/hfm_prep ... (case 20274) Create the HFM Preparation Step	2018-12-17 15:17:19 -08:00
amantley	3e1beb2dca	removed white space and stray semi colon	2018-12-17 15:05:51 -08:00
amantley	a81576f311	Merge remote-tracking branch 'upstream/master' into ripOutCruft ... sync	2018-12-17 14:20:00 -08:00
Wayne Chen	5d89ed2a81	matching master	2018-12-17 13:46:55 -08:00
Wayne Chen	28fd1380df	adding target scale and default avatar to login state	2018-12-17 13:37:28 -08:00
Jeff Clinton	a5ae4081a5	Merge pull request #14588 from wayne-chen/loginInitiative2 ... MS20328: New login breaks nitpick	2018-12-17 10:14:09 -08:00
Wayne Chen	711457b2d7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-17 09:12:29 -08:00
sam gateau	5a6f30b458	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-17 08:26:24 -08:00
Angus Antley	77fa4e7d13	took out the unnecessary hfm.jointindex code	2018-12-16 17:29:16 -08:00
vladest	63aa27475e	Merge branch 'master' into avatar_app_warnings	2018-12-15 19:08:56 +01:00
Wayne Chen	899918006f	fixing for autotester	2018-12-14 17:12:27 -08:00
Shannon Romano	78c9fb2b91	Merge pull request #14580 from wayne-chen/loginInitiative2 ... MS20319: fixing keyboard position offset	2018-12-15 00:51:03 +00: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
Wayne Chen	befca68917	fixing keyboard position offset	2018-12-14 10:57:42 -08:00
Sam Gateau	30277213c6	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-13 20:40:50 -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
Wayne Chen	e744f40d54	fixing url to login overlay	2018-12-13 16:43:12 -08:00
Wayne Chen	1d86f3816d	fixing build error	2018-12-13 15:43:42 -08:00
Ryan Huffman	2269447741	Fix AvatarPackager QML size	2018-12-13 15:27:10 -08:00
Wayne Chen	502de63d3f	fixing bug	2018-12-13 14:59:40 -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	3806914e76	fixing variable names to match coding standard	2018-12-13 14:34:25 -08:00
Wayne Chen	0daa909192	more dev feedback	2018-12-13 14:25:52 -08: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
sam gateau	94ae345daf	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-13 08:45:29 -08:00
Wayne Chen	34130778ec	fixing merge bug	2018-12-12 18:41:28 -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
Dante Ruiz	089a223c2d	more CR changes	2018-12-12 15:29:01 -08:00
Wayne Chen	b4e2b74f3d	adding text wrapping/fixing keep me logged in setting	2018-12-12 15:27:42 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -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
sam gateau	89dfd9aa86	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-12 09:58:28 -08:00
Zach Fox	735be62271	Merge pull request #14562 from zfox23/portalPrototype ... Add a "Portal" mode to the Secondary Camera	2018-12-12 09:27:55 -08:00
Sam Gateau	34a69889d1	shadows in 2ndary maybe	2018-12-12 09:23:39 -08:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Wayne Chen	dbebf1a67f	having stats mirror master	2018-12-11 19:29:17 -08:00
Sam Gateau	8599a340ed	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-11 19:02:48 -08:00
Wayne Chen	4b8200d5bb	forcing stats to be false until login determined	2018-12-11 17:27:54 -08:00
Zach Fox	dff7804cdc	Change username to trashbot	2018-12-11 16:26:49 -08:00
Wayne Chen	b3911e466f	feedback changes/don't switch modes on login in-world	2018-12-11 16:04:30 -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
SamGondelman	250baa9c72	add missing properties to text entities	2018-12-11 15:42:24 -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
Sam Gateau	556a3ad00c	Merge pull request #14561 from SamGondelman/androidCrash ... Case 20250: Disable splash screen on android	2018-12-11 11:21:08 -08:00
Sam Gateau	c401f3c8bd	Merge pull request #14521 from jherico/feature/build/gradle-wrapper ... 20197: Containerized Android builds	2018-12-11 11:16:00 -08:00
sabrina-shanman	566d09dc9c	Add model preparation step to ModelCache using new library model-baker	2018-12-11 11:15:54 -08:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Shannon Romano	a3c870ed90	Merge pull request #14479 from sabrina-shanman/hfm_mimetype ... (case 20037) Add robust MIME type detection for loading models in ModelCache	2018-12-11 18:41:55 +00:00
Zach Fox	75ba1cb3c7	I forgot to clear dot immediately	2018-12-11 10:30:12 -08:00
SamGondelman	17dcd8b87a	disable splash screen on android	2018-12-11 10:13:19 -08:00
sam gateau	9ffe38f40c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-10 15:13:58 -08:00
Jeff Clinton	b6a87f2251	Merge pull request #14555 from vladest/linux_build_fix ... Added missed header	2018-12-10 15:06:08 -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
Brad Davis	8504619067	Dockerized build, updated build script, ndk18	2018-12-10 11:33:41 -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
Wayne Chen	7ab1d649f1	fixing limit for overlay too far/close	2018-12-09 07:49:48 -08:00
Sam Gateau	79cad36c58	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-08 19:14:21 -08:00
vladest	c05e3e7d09	Fix Avatar apps warnings. Added notification for HMD.active property	2018-12-08 19:12:02 +01:00
vladest	ead49e5f03	Added missed header	2018-12-08 16:49:34 +01:00
Wayne Chen	a787b39cae	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 17:39:51 -08:00
Wayne Chen	9fd1b7fb2d	cancel pitch and check if overlay too far/close	2018-12-07 17:25:55 -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
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Wayne Chen	23d3b96446	add spinner/design updates/fix steam link	2018-12-07 15:17:33 -08:00
Sam Gondelman	ccdf1c8614	Merge branch 'master' into NOverlays4	2018-12-07 14:27:34 -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
sabrina-shanman	7cbe3776f5	Simplify serializer registration process	2018-12-07 12:05:27 -08:00
Zach Fox	4cc5fc755f	Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'	2018-12-07 11:42:03 -08:00
Wayne Chen	a2572d5710	fix switch display mode crash/keyboard spawn problem	2018-12-07 11:17:06 -08:00
Wayne Chen	4e6f162e01	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
SamGondelman	92117d602c	remove cruft	2018-12-07 09:23:03 -08:00
Sam Gateau	50fcd7f40a	trying...	2018-12-06 22:45:44 -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	1ddba8e787	KB following updated login screen/keep login screen active	2018-12-06 14:58:06 -08:00
Sam Gondelman	d21d764131	Merge branch 'master' into NOverlays4	2018-12-06 12:48:05 -08:00
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Wayne Chen	4f0e23ed69	changing link steam flow/height of error message	2018-12-06 11:26:33 -08:00
Sam Gondelman	c38a6966a9	Merge branch 'master' into NOverlays4	2018-12-06 11:25:43 -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	30f1016f1c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-06 09:55:00 -08:00
Jeff Clinton	b9156d68e5	Merge pull request #14508 from amantley/restingHandsBug ... removed the code that turns off inactive hands in MyAvatar.cpp	2018-12-06 09:42:34 -08:00
Jeff Clinton	e8c1c4a27b	Merge pull request #14536 from danteruiz/fix-audio-switching ... Respect changed audio settings when switch displays (Master)	2018-12-06 09:13:47 -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
SamGondelman	9923e76968	cleanup	2018-12-05 17:18:26 -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