6311 commits

Author	SHA1	Message	Date
Seth Alves	83718ca06d	Merge pull request #13746 from alexiamandeville/emoteIcon ... updating emote app icon	2018-08-15 08:29:48 -07:00
Seth Alves	3623590e90	Merge pull request #13784 from sethalves/far-point-joints ... Far point joints	2018-08-14 15:40:07 -07:00
John Conklin II	8c5344ad1a	Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut ... MS17380: Create App fix for angularVelocity zeroing out on duplication or undo	2018-08-14 11:37:33 -07:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
Seth Alves	54fa7dd0b6	Merge pull request #13817 from sethalves/fix-desktop-handshake ... fix desktop press-x handshake	2018-08-14 08:42:10 -07:00
John Conklin II	73ef2ff09c	Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit ... MS17291: Create-app increase focus distance limit	2018-08-13 14:58:17 -07:00
Seth Alves	4fa0c96046	fix desktop press-x handshake	2018-08-13 11:57:48 -07:00
Thijs Wenker	221dfb8979	typo fix	2018-08-11 05:46:48 +02:00
Thijs Wenker	f26188d5b8	added comment for limit choice	2018-08-11 01:54:13 +02:00
Thijs Wenker	876079bb81	deactivate Create App when desktop windows are closed	2018-08-11 00:41:50 +02:00
John Conklin II	61f0e9323a	Merge pull request #13800 from samcake/zvork-shadow ... Fixing PR13731 shader error on Mac	2018-08-10 14:10:47 -07:00
Ryan Huffman	c0ac76bf4a	Merge pull request #13797 from dback2/rotationRingSize ... Edit handle rotation ring size	2018-08-10 13:53:10 -07:00
David Back	1d0da4042a	Merge pull request #13771 from dback2/entityListCtrlReselection ... Reselecting same entity in list will unselect it	2018-08-10 10:41:57 -07:00
John Conklin II	de0cdf6d8d	Merge pull request #13793 from wayne-chen/fixWebTabletJSBug ... Fixing web tablet JavaScript error	2018-08-10 09:31:17 -07:00
Thijs Wenker	925cfc9b23	Set a max focus distance value of 14km to not lose the edit handles by far-clipping	2018-08-10 16:45:27 +02:00
Howard Stearns	1c9e409444	Merge pull request #13794 from zfox23/72_MS17495 ... Fix MS17495: Initially wire sendMessage to ignore in appUi module	2018-08-09 20:07:11 -07:00
John Conklin II	6c647c8185	Merge pull request #13768 from thoys/fix/create/triggerable-reset ... MS17413 Triggerable value does not reset on entity deselect	2018-08-09 17:13:34 -07:00
Alexia Mandeville	38973f0840	Adding icon states to emote app, active state	2018-08-09 16:00:36 -07:00
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
David Back	cc953ab691	Merge branch 'master' of https://github.com/highfidelity/hifi into rotationRingSize	2018-08-09 13:36:13 -07:00
David Back	e36e9aa68f	tweak rotation ring size	2018-08-09 13:35:55 -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
Zach Fox	394f93f39c	Fix SortOrder	2018-08-09 11:44:03 -07:00
Zach Fox	e00dbcecc6	Fix MS17495: Initially wire sendMessage to ignore in appUi module	2018-08-09 11:33:26 -07:00
Wayne Chen	2a6ff90a2c	fixing web tablet error	2018-08-09 11:30:10 -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
David Back	a04ffd969e	deselect when reselecting same entity, fix indents	2018-08-08 13:32:38 -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
David Back	adc2c9c6fc	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListCtrlReselection	2018-08-08 12:41:54 -07:00
Sam Gondelman	16b483b338	Merge pull request #13766 from SamGondelman/shaders ... Miscellaneous shader fixes	2018-08-08 11:34:36 -07:00
Olivier Prat	2584ce4c96	Merged with master	2018-08-08 08:42:44 +02: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
Thijs Wenker	9c96a10f6c	Fix for angularVelocity zeroing out on duplication or undo	2018-08-07 19:35:49 +02:00
David Back	d88615219c	CR changes	2018-08-07 10:19:48 -07:00
David Back	174519e86e	fix reselecting same entity in list	2018-08-07 09:56:51 -07:00
Ryan Huffman	61fdce9c11	Fix duplicating multiple entities causing infinite looping	2018-08-07 09:52:14 -07:00
Thijs Wenker	95c32c8e45	fix reset triggerable checkbox	2018-08-07 17:23:49 +02: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