27850 commits

Author	SHA1	Message	Date
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
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
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