28139 commits

Author	SHA1	Message	Date
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
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
Wayne Chen	11c40666e4	removing trailing tests	2018-12-05 11:29:58 -08:00
Wayne Chen	27e4e1c245	pitch updates login pos/fix signup errors	2018-12-05 11:24:27 -08:00
SamGondelman	287878ff98	merge with master	2018-12-05 10:35:08 -08:00
Dante Ruiz	3123bb37e4	fix audio switching issue	2018-12-05 10:34:47 -08:00
Wayne Chen	eb51a5b7b6	changing opacity to 0.5	2018-12-05 10:16:48 -08:00
Wayne Chen	37beab3ab3	fixing the desktop tablet problem again	2018-12-05 09:36:56 -08:00
Wayne Chen	40053ef13a	make sure android still functions as expected	2018-12-05 09:10:17 -08:00
Wayne Chen	328e1ebc27	autotester param fully functional	2018-12-05 08:51:13 -08:00
Wayne Chen	3d99ffc459	outing oculus login	2018-12-05 08:25:01 -08:00
Wayne Chen	a30f4ed0b3	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-12-05 08:17:06 -08:00
Wayne Chen	07599c02c8	true reversion of scrips param	2018-12-05 08:16:54 -08:00
Wayne Chen	4daa943510	fixing scripts param/reverting some qml	2018-12-04 17:17:58 -08:00
Wayne Chen	2a77a29f8a	Delete LoginScreenDialog.qml	2018-12-04 17:07:03 -08:00
Wayne Chen	57b21730de	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 17:01:56 -08:00
Wayne Chen	3951203b55	adding tablet bg/no movement in login state	2018-12-04 16:50:01 -08:00
Brad Hefta-Gaub	77e1c98264	Merge pull request #14528 from sethalves/fix-delete-home ... work around menu-item name hash collision for Home	2018-12-04 15:04:25 -08:00
John Conklin II	725cf6c526	Merge pull request #14518 from hyperlogic/bug-fix/puck-offsets ... Head and Hand offsets for Vive Trackers now function as expected	2018-12-04 14:25:02 -08:00
Wayne Chen	2d8b638370	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 14:19:28 -08:00
Wayne Chen	a24cd41367	getting textfield into focus	2018-12-04 14:19:09 -08:00
Wayne Chen	1375e85f2c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 10:21:12 -08:00
Wayne Chen	e7e42e3430	adding steam linking	2018-12-04 10:03:40 -08:00
Sam Gateau	d2ff4d4674	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-12-03 20:52:43 -08:00
Anthony Thibault	7f2e427584	Added DropAfterDelay strategy to Vive Tracker Calibration Dialog ... This is a hybrid of None and Drop strategies. Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.	2018-12-03 18:56:45 -08:00
Seth Alves	541d0ab4d6	work around menu-item name hash collision for Home	2018-12-03 17:33:04 -08:00
Wayne Chen	dc3381d4a9	updating artwork	2018-12-03 17:28:10 -08:00
Wayne Chen	22bf4fc5c4	removing fromBody	2018-12-03 16:11:13 -08:00
Wayne Chen	5beb810604	adding more steam login flow	2018-12-03 16:09:10 -08:00
Zach Fox	ab184c5c2b	Authorized Script to Coupon	2018-12-03 15:16:06 -08:00
Clément Brisset	62f21822ce	Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash ... Fix Agent crash on shutdown	2018-12-03 14:17:35 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
Anthony Thibault	c0bf832e39	Head and Hand offsets for Vive Trackers now function as expected ... In the Settings > Controller... > Calibration menu, when using head or hand trackers The provided Y and Z offsets should function correctly now. This gives you the ability to adjust the offsets of the pucks to the hands/head. For example: this allows you to wear the hand pucks on your forearms rather then the backs of your palms.	2018-12-02 16:18:36 -08:00
Wayne Chen	43b5a14180	fixing missing header function	2018-11-30 20:25:35 -08:00
sabrina-shanman	243a1d6598	Add ModelFormatRegistry for handling model loading on the application side	2018-11-30 16:50:53 -08:00
Zach Fox	0d66d230c5	Merge branch 'master' of github.com:highfidelity/hifi into payOut1	2018-11-30 16:45:03 -08:00
Wayne Chen	224ad28ed7	lowering banner/adding space btwn cancel/signup	2018-11-30 13:09:54 -08:00
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -08:00
Wayne Chen	c8783776fe	removing mousearea, fixing continue button	2018-11-30 13:02:29 -08:00
Shannon Romano	1f29423a58	Merge pull request #14423 from vladest/qml_warning_fix ... Fix QML achoring warnings on Layouts	2018-11-30 10:50:30 -08:00
Jeff Clinton	0bca290de2	Merge pull request #14485 from sethalves/crash-on-exits ... suppress 'No instance available' messages during shutdown. try a dif…	2018-11-30 10:10:43 -08:00
amantley	88a9a96346	removed the code that turns off inactive hands in MyAvatar.cpp	2018-11-30 10:08:05 -08:00
Shannon Romano	0bf5be57f8	Merge pull request #14488 from danteruiz/limit-avatar-entity-data ... don't save joint information for avatar entities in avatarbookmarks.json	2018-11-30 09:49:01 -08:00
Shannon Romano	dacf43d70c	Merge pull request #14483 from danteruiz/keyboard-toggle-option ... Keyboard menu option in general settings	2018-11-30 09:43:10 -08:00
Shannon Romano	1b24d051f7	Merge pull request #14432 from ctrlaltdavid/M17988 ... Fix memory accumulating while Interface is minimized	2018-11-30 09:39:14 -08:00
Shannon Romano	08bbe27522	Merge pull request #14489 from ctrlaltdavid/M17990-a ... Remove unused avatar attachment constant	2018-11-30 09:37:40 -08:00
Wayne Chen	5e82bc78b7	fixing sign up screen	2018-11-29 20:17:18 -08:00
Wayne Chen	707339dd2a	allowing clicking any mousearea back to the textfield/disable movement ctrls	2018-11-29 17:18:40 -08:00
Wayne Chen	e033492472	enable mouse capture upon resume	2018-11-29 15:40:00 -08:00
Wayne Chen	62848700f3	disable mouse capture in login state	2018-11-29 15:37:35 -08:00
Wayne Chen	a80017c8c3	fixing typo	2018-11-29 15:04:34 -08:00
Wayne Chen	ba62cbf45c	making lasers appear on the tip of the mallets	2018-11-29 14:17:39 -08:00
Zach Fox	bc39dbba8b	Finish out the feature	2018-11-29 12:44:30 -08:00
Sam Gateau	54fa4365b8	FIxing build issue doh...	2018-11-28 22:21:58 -08:00
Sam Gateau	9353745054	MErge with master	2018-11-28 21:40:24 -08:00
Wayne Chen	295d40724a	adding difference in text shown between tablet/other mode	2018-11-28 19:24:47 -08:00
Wayne Chen	34fb7159e2	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-28 19:24:20 -08:00
Wayne Chen	b0fb7778cf	fixing some text, turning off lasers until they intersect login overlay	2018-11-28 19:17:30 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
Clement	181f2b4263	Fix Agent crash on shutdown	2018-11-28 18:40:52 -08:00
Wayne Chen	527f8a2b59	UI feedback + new overlay position update	2018-11-28 15:38:37 -08:00
Jeff Clinton	f98f070c8b	Merge pull request #14445 from danteruiz/fix-stylus-dimensions ... fixing keyboard mallets dimensions	2018-11-28 14:19:53 -08:00
David Rowe	1683179fe5	Remove unused constant	2018-11-29 09:14:10 +13:00
Shannon Romano	ff934a8f87	Merge pull request #14394 from sabrina-shanman/hfm_serializer ... (case 20005) Create HFMSerializer interface for model loaders	2018-11-28 11:10:27 -08:00
Zach Fox	371c50b2ab	Start work on Pay Out UI	2018-11-28 11:01:40 -08:00
Dante Ruiz	8be775c2b7	don't save joint information for avatar entities	2018-11-28 10:54:39 -08:00
Zach Fox	022fea107f	Merge pull request #14476 from zfox23/payIn1 ... Pay-In API Frontend, Part One	2018-11-28 10:32:01 -08:00
Seth Alves	fac27553d7	suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.	2018-11-27 17:02:48 -08:00
Sam Gondelman	4d621ba61c	Merge branch 'master' into splash	2018-11-27 16:01:07 -08:00
SamGondelman	1f354f813c	rework shader pre-compilation	2018-11-27 14:38:02 -08:00
Wayne Chen	d8a1c4e956	reverting header in qml	2018-11-27 14:34:58 -08:00
Zach Fox	a4175b0428	Error handling in checkout	2018-11-27 14:17:28 -08:00
Wayne Chen	d5e16ae920	removing login state sound	2018-11-27 13:31:41 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
Dante Ruiz	29028386c8	Keyboard menu option in general settings	2018-11-27 11:56:07 -08:00
Zach Fox	67dfccafec	Show item name when sending item	2018-11-27 10:19:14 -08:00
Wayne Chen	94789d0170	standardizing font of text fields	2018-11-26 21:06:42 -08:00
Wayne Chen	1258676d56	fixing text height/toolbar coming back	2018-11-26 21:01:34 -08:00
Zach Fox	a9fd443f28	'improve' UI slightly	2018-11-26 16:03:07 -08:00
Zach Fox	31f7d747c8	Bugfixes; enable purchase asset from marketplace screen raise	2018-11-26 15:48:49 -08:00
Wayne Chen	c53febceac	adding oculus to login dialog/adding focus wip	2018-11-26 15:10:04 -08:00
Zach Fox	8df5db4239	Allow scripts to open SendAsset screen with pre-filled info	2018-11-26 13:26:17 -08:00
SamGondelman	e282d51883	CR	2018-11-26 01:15:07 -05:00
sam gateau	9ee35def3d	trying to fix the include issue	2018-11-21 15:42:35 -08:00
Wayne Chen	bf285b3570	adding experimental login state sound	2018-11-21 14:14:07 -08:00
Wayne Chen	51f5942a7f	adding sound to login screen	2018-11-21 13:36:36 -08:00
sam gateau	be03859ed6	Warnings from build	2018-11-21 13:31:54 -08:00
Wayne Chen	d12655ed7b	sfx to login mousearea/hiding desktop toolbar	2018-11-21 12:21:19 -08:00
sam gateau	44b9b92450	Getting ready for merge	2018-11-20 17:32:04 -08:00
Wayne Chen	cdee10d0b8	getting dominant hand laser + sign up working	2018-11-20 16:54:16 -08:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
Wayne Chen	4d55081184	changing the keyboard password flag appropriately	2018-11-20 10:56:34 -08:00
Wayne Chen	5f658b90ff	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-20 10:44:29 -08:00
Wayne Chen	d55c9467e7	fixing keyboard offset	2018-11-20 10:37:30 -08:00
Dante Ruiz	db607e564f	fixing keyboard mallets dimensions	2018-11-20 09:13:07 -08:00
SamGondelman	372f4390e8	replicate default skybox	2018-11-19 19:14:07 -05:00
sam gateau	84cd2a8ef6	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-19 15:23:55 -08:00
Wayne Chen	e0eba2135a	Merge branch 'master' into loginInitiative2	2018-11-19 15:23:43 -08:00
Wayne Chen	2820328137	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-19 15:21:24 -08:00
Wayne Chen	1419ec907b	adding wip	2018-11-19 13:57:55 -08:00
Ryan Huffman	c87748830f	Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity ... MS19903: don't trigger virtual keyboard scroll on non input focus.	2018-11-19 13:52:22 -08:00
David Rowe	7ffa70d0ac	Fix memory accumulating while Interface is minimized	2018-11-20 09:36:58 +13:00
Thijs Wenker	84e8e21d85	don't trigger virtual keyboard scroll on non input focus.	2018-11-19 21:08:21 +01:00
John Conklin II	6b25179aa9	Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue ... Dismiss keyboard when backout of the login screen	2018-11-19 09:58:54 -08:00
John Conklin II	d63a850ec0	Merge pull request #14409 from danteruiz/keyboard-touchups ... keyboard address some feedback	2018-11-19 09:48:00 -08:00
Wayne Chen	3555276817	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-19 09:02:30 -08:00
Wayne Chen	b8d8710604	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-19 09:02:16 -08:00
vladest	db82994b4d	Merge branch 'master' into qml_warning_fix	2018-11-18 16:10:21 +01:00
Sam Gateau	837b321004	merging with master	2018-11-17 10:35:05 -08:00
Alexander Ivash	fe43c733f8	FB19400 during shutdown -- TypeError: Cannot read property 'buttons'	2018-11-17 22:56:59 +05:30
vladest	932d1dbcd7	Fixed width binding loop warning	2018-11-17 17:20:02 +01:00