4620 commits

Author	SHA1	Message	Date
Dante Ruiz	cf6850de48	better stuff	2018-07-27 17:53:21 -07:00
Dante Ruiz	887a416656	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-27 17:50:12 -07:00
Dante Ruiz	6320401308	somewhat better distance from bounding box	2018-07-27 17:49:49 -07:00
John Conklin II	fc88165e23	Merge pull request #13696 from SamGondelman/particleRot ... Particles don't spin with head roll, new spin + rotateWithEntity properties	2018-07-27 14:54:48 -07:00
Thijs Wenker	9dce1b64b6	Merge pull request #13695 from huffman/fix/create-focus-on-create ... Fix edit.js not being able to delete after creating entity	2018-07-27 22:43:34 +02:00
Dante Ruiz	30b4815bf9	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-27 13:13:10 -07:00
David Rowe	3bfdd3ff58	Maintain virtual and real world orientations when teleport	2018-07-27 15:18:40 +12:00
Dante Ruiz	74bb2301b0	minimize diff	2018-07-26 16:05:56 -07:00
Dante Ruiz	31d31af941	minimize diff	2018-07-26 16:05:18 -07:00
Dante Ruiz	02232daa58	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-26 15:26:24 -07:00
Dante Ruiz	6edd109dfe	revert back to the old way we checkForChildTooFarAway	2018-07-26 15:23:54 -07:00
SamGondelman	1c1b68ee66	emitterShouldTrail fix, review comments, rotateWithEntity	2018-07-26 11:41:16 -07:00
Zach Fox	cc921ed9c4	Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids ... Fix MS16820: Rate limit Snapshot Polaroids	2018-07-25 15:45:51 -07:00
Ryan Huffman	0e0966004c	Fix edit.js not being able to delete after creating entity ... This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'	2018-07-25 14:52:56 -07:00
Sam Gondelman	2aeef2e016	min spinSpread is 0	2018-07-25 09:40:52 -07:00
Sam Gondelman	b4cc9c8004	typo	2018-07-25 09:36:43 -07:00
SamGondelman	4750611af9	particles don't spin with head roll, add particle spin properties, negative emitSpeed	2018-07-24 23:47:58 -07:00
Zach Fox	04754d0dab	Fix MS16820: Rate limit Snapshot Polaroids	2018-07-24 15:28:37 -07:00
Alexander Ivash	6db46e84ff	FB17036 Avatar App causes error on cache reload (CTRL+R)	2018-07-25 01:11:26 +03:00
Thijs Wenker	b7d12c6b1c	Merge pull request #13656 from huffman/fix/create-selection-box ... Fix the Create selection box not always matching outline	2018-07-24 19:49:20 +02:00
John Conklin II	2ac9463830	Merge pull request #13653 from ElderOrb/fake-wearables-fix ... FB16870: Avatar Wearables showing incorrect number	2018-07-23 15:55:11 -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
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
Alexander Ivash	f5717b7648	add check for SELF_ID	2018-07-20 19:33:16 +03:00
Alexander Ivash	fb8640de47	FB16870: Avatar Wearables showing incorrect number	2018-07-20 02:51:17 +03:00
Ryan Huffman	2305099874	Fix the Create selection box not always matching outline	2018-07-19 16:09:21 -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
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
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