6281 commits

Author	SHA1	Message	Date
John Conklin II	6447bcab5b	Merge pull request #13765 from dback2/serverScriptStatus ... Fix server script status	2018-08-09 14:51:17 -07:00
John Conklin II	f31776516b	Merge pull request #13791 from dback2/editHandlesAlpha ... Alpha 1 for edit handles	2018-08-09 14:50:43 -07:00
John Conklin II	6481aea2f4	Merge pull request #13715 from SamGondelman/parabolic ... Enable parabolic teleport	2018-08-09 13:12:17 -07:00
Dante Ruiz	9a8ebdd021	Merge pull request #13739 from dback2/cloneChildrenFix ... Fix cloning a parented entity	2018-08-09 13:05:28 -07:00
John Conklin II	f4f0c5fcad	Merge pull request #13767 from ctrlaltdavid/M15772 ... Fix entity stay highlighted after hand leaves when far grabbing another	2018-08-09 12:53:41 -07:00
David Back	a6d944e034	use alpha 1 for edit handles	2018-08-09 10:32:34 -07:00
John Conklin II	34697b6b07	Merge pull request #13770 from huffman/fix/edit-duplicate-fix ... Fix duplicating multiple entities causing infinite looping	2018-08-09 09:07:37 -07:00
Anthony Thibault	90b0bd333f	Merge pull request #13774 from danteruiz/revert-tablet-material-entity ... Revert to using overlays instead of material entities for button highlighting.	2018-08-08 17:33:26 -07:00
Ryan Huffman	544a6504f2	Merge pull request #13760 from ctrlaltdavid/M16932 ... Render Touch controllers at physical hands's locations	2018-08-08 13:11:21 -07:00
Sam Gondelman	16b483b338	Merge pull request #13766 from SamGondelman/shaders ... Miscellaneous shader fixes	2018-08-08 11:34:36 -07:00
SamGondelman	6ff0b9d417	fix debug tools	2018-08-07 15:25:56 -07:00
David Back	3c5c5d8552	Merge pull request #13750 from dback2/editLogSpamFix ... Fix edit log spam with -1 hand	2018-08-07 13:51:39 -07:00
David Rowe	a7170a5892	Fix typo	2018-08-08 08:49:29 +12:00
Dante Ruiz	269afb9a49	remove tablet material entities code remove create	2018-08-07 11:19:22 -07:00
Dante Ruiz	8c5eefcc95	some file and code cleanup	2018-08-07 10:58:45 -07:00
Dante Ruiz	d78c571df6	revert to use overlays instead of entities for tablet highlighting	2018-08-07 10:56:53 -07:00
David Back	d88615219c	CR changes	2018-08-07 10:19:48 -07:00
Ryan Huffman	61fdce9c11	Fix duplicating multiple entities causing infinite looping	2018-08-07 09:52:14 -07:00
David Rowe	c9c23b8db3	Fix entity stay highlighted after hand leaves when far grabbing another	2018-08-07 15:34:17 +12:00
David Back	f9e25d36e7	use wrapper emitScriptEvent, change to Fetching	2018-08-06 17:52:27 -07:00
David Back	e5abd9d57d	fix server script status event, use [ Getting status ]	2018-08-06 17:03:32 -07:00
David Back	112327a3c1	Merge pull request #13735 from dback2/entityCameraKeyFix ... Use key codes for entity camera keys	2018-08-06 14:07:48 -07:00
David Rowe	83ed572a33	Render Touch controllers at physical hands's locations	2018-08-04 19:27:44 +12:00
David Back	0565e0400c	fix edit log spam with -1 hand	2018-08-03 11:08:56 -07:00
David Back	0b9e520b53	fix grab cloning parented entitiy	2018-08-01 16:00:25 -07:00
John Conklin II	f02e91806c	Merge pull request #13686 from huffman/fix/undo-create-entity ... Fix added entities not being undoable in Create	2018-08-01 13:11:17 -07:00
David Back	cdbf75666f	new line	2018-08-01 12:46:49 -07:00
David Back	f946bb73ef	remove constants	2018-08-01 12:46:17 -07:00
David Back	97e45643b0	spacing	2018-08-01 12:44:40 -07:00
David Back	ca3151ae39	Merge branch 'master' of https://github.com/highfidelity/hifi into entityCameraKeyFix	2018-08-01 12:43:04 -07:00
David Back	3e9e00f1d6	use key codes for entity camera keys	2018-08-01 12:42:50 -07:00
Thijs Wenker	c562a6945d	Merge pull request #13671 from huffman/fix/create-copy-follows-user ... Fix duplication not working as expected on grabbed entities	2018-08-01 19:25:33 +02:00
SamGondelman	e11030bbc3	mukul's changes, enable parabolic teleport	2018-08-01 09:46:17 -07:00
Ryan Huffman	6369cee0d1	Fix added entities not being undoable in Create	2018-08-01 09:40:29 -07:00
David Back	e8068fea0a	block selecting overlays with other hand	2018-07-31 17:18:35 -07:00
Ryan Huffman	bbdc7ba380	Fix Uuid null comparison and dangling comma in Create tool	2018-07-31 13:57:27 -07:00
David Back	ad9ec26781	print	2018-07-31 11:53:17 -07:00
David Back	7bf7663f09	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-31 11:51:26 -07:00
David Back	4a722a62f7	use click handler only, remove triggerClicked	2018-07-31 11:51:16 -07:00
Ryan Huffman	431cbf2694	Merge pull request #13699 from thoys/fix/create/triggerable ... MS16809: handle both triggerable and wantsTrigger in CreateApp	2018-07-31 10:34:31 -07:00
John Conklin II	8e277758ad	Merge pull request #13700 from danteruiz/fix-grabbing-problem ... Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js	2018-07-31 09:46:57 -07:00
David Back	03f0116b79	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-31 09:28:14 -07:00
John Conklin II	bd2ab38bfe	Merge pull request #13701 from ElderOrb/FB16702 ... FB16702 - Avatar App does not save Animation JSON Override URL	2018-07-30 14:51:32 -07:00
John Conklin II	6d7116fad7	Merge pull request #13676 from thoys/fix/api/agent ... MS15184: Remove deprecated functions in Agent API	2018-07-30 14:48:10 -07:00
John Conklin II	200292c18e	Merge pull request #13675 from howard-stearns/forget-you ... pal refresh fixes	2018-07-30 14:38:24 -07:00
David Back	b420ef8cf2	fix trigger clicks on vive	2018-07-30 13:21:09 -07:00
David Back	bec54cc182	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-30 12:26:48 -07:00
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic ... Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00
Thijs Wenker	d486a0721d	Merge pull request #13698 from dback2/resetPropertiesNoSelection ... Reset entity property fields when no selection	2018-07-30 19:37:12 +02:00
Dante Ruiz	0f46001f9a	remove redundent variable	2018-07-30 10:29:53 -07:00