5970 commits

Author	SHA1	Message	Date
David Back	6a4c5ed12a	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-22 11:58:28 -07:00
John Conklin II	835528b212	Merge pull request #13383 from dback2/autoLaserFix2 ... Fix auto lasering locked web entities & only auto laser tablet and web overlays	2018-06-21 09:21:54 -07:00
Andrew Meadows	a18ba36dd2	merge 'master' into 'workload'	2018-06-18 13:40:08 -07:00
David Back	0c644c0504	Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2	2018-06-18 11:06:56 -07:00
David Back	175e4b7013	also check tabletID	2018-06-18 11:06:33 -07:00
Andrew Meadows	222756371e	set max region radiuses in workload UI	2018-06-18 10:31:41 -07:00
Andrew Meadows	6d422e4678	Merge 'master' into 'workload'	2018-06-18 10:30:13 -07:00
David Back	bb0b1cc4a4	no myAvatarIndex needed	2018-06-15 17:35:18 -07:00
David Back	d16b777977	tabs	2018-06-15 17:33:49 -07:00
David Back	b10cf364c4	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-15 17:32:32 -07:00
David Back	6ef8206f3a	temp disable myAvatar collisions when stretching	2018-06-15 17:32:03 -07:00
Gabriel Calero	583c46b3a0	Merge remote-tracking branch 'upstream/master' into breakpad_android	2018-06-15 21:21:03 -03:00
Seth Alves	b4b6c85aaf	Merge pull request #13366 from danteruiz/fixing-invisible-cursor ... fixing invisible cursor when coming from HMD mode	2018-06-15 17:16:46 -07:00
Seth Alves	7ca6dfc8c5	Merge pull request #13371 from danteruiz/fix-focus-issues ... fix focus issues when mouse is offscreen	2018-06-15 17:15:42 -07:00
David Back	cb9c255acd	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-15 14:51:53 -07:00
Gabriel Calero	4cd94a32b8	Crash on audio button press with testing purpose	2018-06-15 17:44:28 -03:00
David Back	fcccaaea48	tabs	2018-06-14 17:49:02 -07:00
David Back	ed5b05eef4	fix auto laser on locked web entity, only auto laser at tablet or web overlays	2018-06-14 17:43:45 -07:00
John Conklin II	fa1dc78469	Merge pull request #13374 from thoys/fix/dynamic-cloneDynamic ... [RC69] fix cloneDynamic	2018-06-14 12:58:17 -07:00
John Conklin II	d023d6adef	Merge pull request #13321 from danteruiz/tablet-imporvments ... Tablet improvements	2018-06-14 12:38:20 -07:00
John Conklin II	4f561b00da	Merge pull request #13003 from alexiamandeville/sittingUpdates ... Adding sitting and love to emote app	2018-06-14 11:52:47 -07:00
John Conklin II	b43d5287e2	Merge pull request #13286 from ElderOrb/spinbox-bugs ... Introduce test 'controls gallery' application for controls testing & few spinbox fixes	2018-06-14 10:21:17 -07:00
Thijs Wenker	4d3087b98c	fix cloneDynamic	2018-06-14 19:07:20 +02:00
Dante Ruiz	abee3e8b96	fix focus issue when mouse is offscreen	2018-06-13 17:07:05 -07:00
Dante Ruiz	a6202cf3cb	fixing invisible cursor	2018-06-13 11:31:14 -07:00
Dante Ruiz	60e46481b2	emissive maps	2018-06-13 10:41:02 -07:00
John Conklin II	0ba97fa83b	Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags ... Scripted Blendshapes and Procedural Face Movement Flags	2018-06-13 10:32:59 -07:00
Zach Fox	ffb9a47be0	Merge pull request #13355 from zfox23/MS14314_multipleSnapshots ... Interface Fix for MS14314: Make use of original image filename when sharing	2018-06-12 15:10:22 -07:00
Anthony Thibault	717093abf7	Merge pull request #13171 from luiscuenca/handTouchToDefault ... Enable Avatar Hand Touch Script by Default	2018-06-12 14:54:26 -07:00
Zach Fox	bf5d6de780	Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots	2018-06-12 11:19:05 -07:00
Zach Fox	cf9cf45d02	Merge pull request #13348 from zfox23/MS14129_buyButtonStuck ... Fix MS14129: Prevent Marketplace buttons from getting stuck in hover state	2018-06-12 11:02:52 -07:00
Dante Ruiz	f1d11f9566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-12 10:21:12 -07:00
Luis Cuenca	9126a6f66d	hide debug lines	2018-06-12 10:12:28 -07:00
Zach Fox	860f9db939	Remove logging	2018-06-12 09:25:09 -07:00
Anthony J. Thibault	042f902d2e	Merge branch 'master' into scriptedBlendshapesFaceFlags	2018-06-11 17:13:30 -07:00
Zach Fox	14034f29a1	Interface Fix for MS14314: Make use of original image filename when sharing	2018-06-11 17:10:09 -07:00
Sam Gondelman	e8ec32c7f8	Merge pull request #13340 from SamGondelman/modelTextures ... Try to fix ModelOverlay texture loading	2018-06-11 16:09:10 -07:00
Dante Ruiz	6685fbbfc4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 13:56:54 -07:00
Dante Ruiz	f2d6b84e6c	fix qa fail issues	2018-06-11 13:56:44 -07:00
John Conklin II	9db71fb40d	Merge pull request #13322 from dback2/fixEquipMessage ... Fix Hifi-Grab-Hand message for equipping	2018-06-11 13:16:39 -07:00
Zach Fox	a5ef3fa729	Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state	2018-06-11 12:00:51 -07:00
John Conklin II	d5b8570ef6	Merge pull request #13343 from ctrlaltdavid/21888 ... Fix tablet attaching to hand while far-grabbing an entity	2018-06-11 10:26:37 -07:00
Howard Stearns	5ce122f148	Merge pull request #13307 from howard-stearns/infinite-scroll ... Infinite scroll	2018-06-11 10:03:52 -07:00
Sam Gondelman	9c66ee412a	Merge pull request #13325 from Cristo86/patch-1 ... Use third person camera mode when switching to My View from Top View mode.	2018-06-11 09:36:29 -07:00
Dante Ruiz	ba86c9753d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 09:13:14 -07:00
howard-stearns	d2cf042a88	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-09 14:09:42 -07:00
SamGondelman	2dae613612	remove conserveResources	2018-06-08 17:58:06 -07:00
Anthony Thibault	044d142635	Merge pull request #13133 from amantley/nativeCGCode ... Center of Gravity Leaning	2018-06-08 17:53:55 -07:00
David Rowe	54b96cd602	Fix incomplete transition from far-grabbing entity to grabbing tablet	2018-06-09 11:32:10 +12:00
Anthony J. Thibault	c3da4e74de	Code review feedback	2018-06-08 16:22:00 -07:00