74664 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
sam gateau	5a6f30b458	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-17 08:26:24 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
sam gateau	a4b9ec50e9	one step closer	2018-12-14 17:00:58 -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	0b03012e5e	introducing the Shadow Stage	2018-12-14 06:55:34 -08:00
Sam Gateau	e07bc208f3	introducing the Shadow Stage	2018-12-14 00:58:07 -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
sam gateau	8bfca612e3	Separating the state view dependant from the shadow to be able to have several versions in flight	2018-12-13 17:56:14 -08: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
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
Zach Fox	3a1f834576	Merge pull request #14574 from zfox23/MS17811_fixFrozeNAgain ... Fix a bug introduced in PR14566, actually fixing MS17811	2018-12-13 13:34:04 -08:00
Zach Fox	4e7b7346dc	Fix a bug introduced in PR14566, actually fixing MS17811	2018-12-13 10:06:46 -08:00
sam gateau	94ae345daf	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-13 08:45:29 -08:00
Sam Gateau	7f193d0e7c	WEll it sn not going to be that simple....	2018-12-13 00:32:59 -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	0a0b7bf1ad	removing onUsernameChanged signal to alter login settings	2018-12-12 16:26:35 -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
sam gateau	27da9b4542	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-12 12:13:07 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Clément Brisset	a9057e09e0	Merge pull request #14566 from zfox23/MS17811_ignoreFreeze ... Fix MS17811: Prevent frozen avatars in certain ignore cases	2018-12-12 10:37:03 -08: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
Wayne Chen	b3911e466f	feedback changes/don't switch modes on login in-world	2018-12-11 16:04:30 -08:00
Wayne Chen	f63c1b3fc5	dismiss dialog only if login dialog popped up	2018-12-11 15:42:35 -08:00
Zach Fox	d46b8d6471	Fix MS17811: Prevent frozen avatars in certain ignore cases	2018-12-11 14:52:11 -08:00
David Kelly	b2645bc23b	Return more connections in pal	2018-12-11 14:47:18 -08:00
Shannon Romano	95a169b446	Merge pull request #14545 from NissimHadar/20116_nitpick_v1.2 ... 20116 nitpick v1.2	2018-12-11 22:41:35 +00:00