28201 commits

Author	SHA1	Message	Date
Wayne Chen	1c6521486e	fixing compile errors	2019-01-25 13:56:56 -08:00
Wayne Chen	6f49914167	Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature	2019-01-25 12:19:20 -08:00
Wayne Chen	635c7533b9	more code review feedback	2019-01-25 12:15:38 -08:00
Wayne Chen	c136f24181	Merge branch 'master' into oculusLoginFeature	2019-01-25 11:44:14 -08:00
Wayne Chen	0928b1bff1	code review feedback	2019-01-25 11:36:58 -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
Shannon Romano	28edb472fc	Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale ... 20565 Avatar::_collideWithOtherAvatars does not scale	2019-01-25 11:06:36 -08:00
Shannon Romano	552729abe7	Merge pull request #14759 from Atlante45/feat/gltf ... Enable "Add To World" Asset Browser button for glTF	2019-01-25 09:56:40 -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
Adam Smith	dadd49f535	Merge pull request #14667 from SamGondelman/NOverlays9 ... Case 20535: renderLayer, primitiveMode, groupCulled Entity properties	2019-01-24 14:36:27 -08:00
Jeff Clinton	49fa2dc75d	Merge pull request #14715 from ctrlaltdavid/M20052 ... Case 20052: Fix tablet sometimes not working after domain change	2019-01-23 15:29:20 -08:00
Wayne Chen	049282e2b3	fixing text alignment issues, adding some oculus user log	2019-01-23 14:38:06 -08:00
Jeff Clinton	b9f9766b01	Merge pull request #14747 from SimonWalton-HiFi/wallet-in-hmd ... Fix security-image display in HMD	2019-01-23 13:18:45 -08:00
Wayne Chen	e6426cb680	fixing bug with cancel button	2019-01-23 10:26:51 -08:00
Simon Walton	77293150b7	Const declarations to enforce singleton capability	2019-01-22 18:05:47 -08:00
Simon Walton	3a5d550fa5	Treat QmlCommerce as a singleton class	2019-01-22 17:13:36 -08:00
Clement	61be5a3cc4	Enable "Add To World" Asset Browser button for glTF	2019-01-22 17:01:06 -08:00
Jeff Clinton	3776472550	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats ... cases 20709 and 20715: wear and see mexico hats	2019-01-22 12:58:56 -08:00
raveenajain	2393db5e12	collision logic	2019-01-21 16:24:32 -08:00
raveenajain	3f2aa56187	feedback changes	2019-01-21 13:24:07 -08:00
Simon Walton	c3a8c71f60	Add TabletMenu to list of pages that trigger the QmlCommerce bridge	2019-01-21 12:27:14 -08:00
raveenajain	379f98b26d	just using change	2019-01-18 18:20:28 -08:00
raveenajain	d2e37d0c90	my and other avater changes, if setting toggled can pass through other avatar	2019-01-18 16:50:44 -08:00
Andrew Meadows	9a854291af	supress spurious not important AvatarEntity updates	2019-01-18 15:36:38 -08:00
Adam Smith	da7cd6b2f7	Merge pull request #14691 from SamGondelman/multifrustum ... Case 20394: Fix multi-frustum view updating	2019-01-18 15:23:58 -08:00
Antonina Savinova	8c4c488676	Merge pull request #14721 from Atlante45/feat/upstream-limitter ... Limit upstream bandwidth to the Avatar Mixer	2019-01-18 13:32:03 -08:00
Jeff Clinton	09b16d2d7a	Merge pull request #14735 from SamGondelman/snap ... Case 20724: Fix Snap app settings issue	2019-01-18 13:00:18 -08:00
Shannon Romano	11b8ae6d44	Merge pull request #14710 from sethalves/mouse-grab-with-traits ... case 15962: case 20481: Mouse grab with traits	2019-01-18 11:56: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
Shannon Romano	c764f5182f	Merge pull request #14717 from roxanneskelly/Case20277 ... Case20277 - Ignoring user causes loading orb to appear at /0,0,0	2019-01-17 15:36:31 -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
Andrew Meadows	74f9a415d3	move _cauterizationNeedsUpdate back to MyAvatar	2019-01-17 13:58:34 -08:00
Seth Alves	4fbc257be0	don't cauterize head-children when they are grabbed	2019-01-17 13:34:36 -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
John Conklin II	45ec44423b	Merge pull request #14694 from danteruiz/delete-only-domain-entities ... case 20595: case 20563: Do not delete local entities when switching domains.	2019-01-17 11:25:58 -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	79ffc311e1	code cleanup + adding password error	2019-01-17 10:19:40 -08:00
Wayne Chen	ef63213d28	fixing linking account problems on oculus/steam, changing callback	2019-01-16 21:07:54 -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	116a15afe8	removing oculus userID to server - no need	2019-01-16 17:15:40 -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