4610 commits

Author	SHA1	Message	Date
Wayne Chen	89f9cd089f	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-23 11:51:39 -07:00
Ryan Huffman	d1da7675f6	Merge pull request #13648 from huffman/fix/create-xz-lines ... Fix xz guides not showing when translating with Shift	2018-07-23 10:44:47 -07:00
Seth Alves	4f45fbc5f5	Merge pull request #13661 from danteruiz/avatarapp-undefined-data ... fix avatar app from crashing when avatar entity variable is undefined.	2018-07-23 10:18:31 -07:00
Seth Alves	a6a4dd3b8e	Merge pull request #13570 from danteruiz/fix-tablet-material-entities ... clean up tablet material entities and don't display them in create menu	2018-07-23 09:50:23 -07:00
Wayne Chen	1880c49d03	removing garbage file	2018-07-20 17:18:58 -07:00
Wayne Chen	32886d67d9	optimizing near-/far- grabbable entities a bit	2018-07-20 17:17:36 -07:00
Wayne Chen	be5fdef974	adding check in isReady for grabbing non-web entitys	2018-07-20 15:26:55 -07:00
danteruiz	9bf6cff5cd	fix indent isssues	2018-07-20 12:27:51 -07:00
Ryan Huffman	ae26c5fe9a	Remove extraneous logging	2018-07-20 11:38:02 -07:00
Ryan Huffman	32122a7c1f	Replace magic numbers with RAIL_AXIS_LENGTH	2018-07-20 11:37:42 -07:00
danteruiz	ce3922a3c1	fix avatarEntities undefined crash	2018-07-20 11:23:02 -07:00
Wayne Chen	4e3a6cb320	adding ignore for far-/near- grabbable entities when operating on web surface	2018-07-20 11:18:20 -07:00
Wayne Chen	5276d84aa5	pushing what i coded out loud - it broke the way grabbing works	2018-07-19 17:08:12 -07:00
Wayne Chen	1942eaf68f	Merge branch 'fixGrabWebSurface-case-16192' of https://github.com/wayne-chen/hifi into fixGrabWebSurface-case-16192	2018-07-19 13:47:48 -07:00
Wayne Chen	b60d650843	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-19 13:47:38 -07:00
Ryan Huffman	25b558e6b4	Fix xz guides not showing when translating with Shift	2018-07-19 12:56:18 -07:00
Qliemillar	2163bf1ef0	Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes ... 16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )	2018-07-19 12:34:38 -06:00
Howard Stearns	2378cdfdc6	Merge pull request #13624 from howard-stearns/app-refactor4-merge ... appUi module, and use in People app	2018-07-19 11:07:54 -07:00
Qliemillar	3466d944fb	Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual ... Disable showing the entity edit tools when undoing while disabled	2018-07-19 09:03:40 -06:00
howard-stearns	a904182cc2	cr feedback	2018-07-18 14:03:26 -07:00
Thijs Wenker	b29044fd7e	Merge pull request #13618 from dback2/clickHandleSwitchEntityFix ... Fix quickly clicking an edit handle causing selected entity change	2018-07-18 22:49:11 +02:00
howard-stearns	74914ffb3e	Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge	2018-07-18 13:16:50 -07:00
Ryan Huffman	b015845371	Disable showing the entity edit tools when undoing while disabled	2018-07-18 11:54:40 -07:00
r3tk0n	a9eb8103f6	Clean up comments a bit.	2018-07-18 09:52:25 -07:00
r3tk0n	f7b49598b5	Disabled tip boxes for Vive controllers, as per experience team request.	2018-07-18 09:50:59 -07:00
Qliemillar	080d664341	Merge pull request #13619 from luiscuenca/handTouchDisabler ... Allow creators to disable hand touch from javascript	2018-07-18 08:16:37 -06:00
Wayne Chen	ac642f126a	adding extra conditional to ensure all modules are checked	2018-07-17 20:52:50 -07:00
Wayne Chen	30ca5a8cbd	code cleanup to use web laser if laser is not pointing at grabbable entity	2018-07-17 16:44:49 -07:00
Wayne Chen	eb7bde1bfc	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
Wayne Chen	f444d0ae28	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-17 15:03:04 -07:00
Qliemillar	07a7bbbcf6	Merge pull request #13621 from thoys/fix/create/desktop-tablet#master ... [FIX] Use create app in tablet mode when choosing to use tablet in desktop mode	2018-07-17 14:36:55 -06:00
howard-stearns	bfd9e208b5	Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge	2018-07-17 12:31:18 -07:00
Wayne Chen	2c16c6579f	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-17 11:54:15 -07:00
Wayne Chen	813c58a1fb	adding check to see if near grabbing is ready	2018-07-17 11:53:55 -07:00
Thijs Wenker	09e1090e72	Use create app in tablet mode when choosing to use tablet in desktop mode	2018-07-17 17:33:13 +02:00
Qliemillar	42daa33d11	Merge pull request #13560 from danteruiz/fix-parent-grab-and-flickering ... fix parent grab dropping and cullig flickering when flying at high velocities	2018-07-17 08:53:41 -06:00
luiscuenca	82a3b73de8	Added disable hand touch for entityID	2018-07-17 07:06:48 -07:00
howard-stearns	cb5ac6f42c	Merge branch 'master' of https://github.com/highfidelity/hifi into app-refactor4-merge	2018-07-16 17:43:53 -07:00
luiscuenca	84dac94379	Allow creator to disable hand touch	2018-07-16 17:03:50 -07:00
Zach Fox	7cdb84ee68	Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup ... Fix MS16562: Massive PAL speedup!	2018-07-16 16:45:01 -07:00
howard-stearns	2c92b02b95	lint	2018-07-16 16:28:44 -07:00
howard-stearns	f1fed37763	cleanup	2018-07-16 15:58:01 -07:00
howard-stearns	4e6aa34814	Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4	2018-07-16 13:07:08 -07:00
howard-stearns	ffa5259319	cleanup references to button, tablet	2018-07-16 13:06:12 -07:00
howard-stearns	46061a2a15	initial with pal	2018-07-16 11:54:05 -07:00
Dante Ruiz	20a8275343	min diff	2018-07-16 11:43:29 -07:00
Dante Ruiz	fa2b975e8f	undo some wrong changes	2018-07-16 11:42:38 -07:00
Dante Ruiz	0fa2a71d0f	actually fix requested changes	2018-07-16 11:35:53 -07:00
Dante Ruiz	d81420542c	making PR requests	2018-07-16 11:00:27 -07:00
Dante Ruiz	47eb7a0899	Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickering	2018-07-16 10:04:42 -07:00