51821 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
Brad Hefta-Gaub	781e0be0e3	Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh ... preserve audio data during pal refresh	2017-03-06 08:45:46 -08:00
Philip Rosedale	b730342283	Merge pull request #9810 from kencooke/glm-simd-bugfix ... Fix unsafe SIMD optimizations	2017-03-05 20:47:24 -08:00
Ken Cooke	818425707b	update unit tests	2017-03-04 16:14:31 -08:00
Ken Cooke	a5571bd49d	redo unsafe optimization	2017-03-04 16:02:39 -08:00
Ken Cooke	44c1f8500d	redo unsafe optimization	2017-03-04 15:55:53 -08:00
Ken Cooke	50f92cb934	redo unsafe optimization	2017-03-04 15:29:23 -08:00
Ken Cooke	46c5f96113	redo unsafe optimization	2017-03-04 15:24:03 -08:00
Ken Cooke	117bba8b6a	redo unsafe optimization	2017-03-04 15:17:09 -08:00
Ken Cooke	0bababf1f5	Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128	2017-03-04 14:53:07 -08:00
Seth Alves	c677326025	Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet ... Touch the tablet with your finger	2017-03-04 11:58:47 -08:00
howard-stearns	15d680d4f9	preserve audio data during pal refresh	2017-03-03 16:56:12 -08:00
Brad Hefta-Gaub	aaec6ce9f7	Merge pull request #9722 from davidkelly/dk/agentAvatarDataUpdates ... Agent Avatars sending loudness in AvatarData	2017-03-03 14:26:26 -08:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
Seth Alves	bccfa79e8b	Merge pull request #9749 from ctrlaltdavid/21176 ... If someone else is grabbing entity you want to grab show their grab beam	2017-03-03 13:43:28 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	40caa1ea49	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-03 09:01:57 -08:00
Philip Rosedale	ac16d86835	Merge pull request #9788 from ctrlaltdavid/21186 ... Distance grab with second hand rotates entity	2017-03-03 08:39:22 -08:00
David Rowe	388a144af1	Tidying after merge	2017-03-03 18:44:50 +13:00
David Rowe	482c23ead5	Merge branch 'master' into 21186 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-03-03 18:38:42 +13:00
Seth Alves	807e15ade9	Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2 ... avoid animation blending for other avatars	2017-03-02 18:37:18 -08:00
Brad Hefta-Gaub	e655e442a0	Merge pull request #9799 from sethalves/steady-hand-lasers ... Steady hand lasers	2017-03-02 18:27:39 -08:00
Seth Alves	f055711c76	refix	2017-03-02 16:47:19 -08:00
Seth Alves	3b581a8dfe	merge from upstream	2017-03-02 16:35:44 -08:00
Seth Alves	9f07079be6	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 16:34:06 -08:00
Seth Alves	155a310852	Merge pull request #9761 from Menithal/21166 ... WL#21166 Cloneable Equipment	2017-03-02 16:33:13 -08:00
Seth Alves	10cb7aab06	Merge pull request #9684 from Menithal/parent-hotkey ... WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks	2017-03-02 16:30:43 -08:00
Seth Alves	88d6fe6a04	fix offset relative to endParent	2017-03-02 16:26:56 -08:00
Seth Alves	5f570c1ba8	fix up bounds handling in Line3DOverlay	2017-03-02 16:16:48 -08:00
Seth Alves	6a4d477381	fix up bounds handling in Line3DOverlay	2017-03-02 16:15:41 -08:00
Anthony J. Thibault	bc256f3e8f	Fix for multi-threaded access to maps in DebugDraw.	2017-03-02 14:42:06 -08:00
Anthony J. Thibault	644e29a43d	disable WANT_STATE_DEBUG in handControllerGrab.js	2017-03-02 14:15:05 -08:00
Seth Alves	f321ffdf91	don't clear EDIT_SETTING flag when creating new entities	2017-03-02 13:00:52 -08:00
Seth Alves	bbfd373887	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 12:51:52 -08:00
Seth Alves	9b3c16d489	get handControllerGrab overlay lines working again	2017-03-02 12:48:37 -08:00
Seth Alves	2047e0194d	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 12:44:10 -08:00
David Kelly	29f263a296	oh man, this was hard to find	2017-03-02 12:43:41 -07:00
Menithal	91fa871d55	Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey	2017-03-02 21:40:45 +02:00
Menithal	9c31f66b75	Addressed CR of 9684	2017-03-02 21:39:56 +02:00
Seth Alves	94b5e6333c	get handControllerGrab overlay lines working again	2017-03-02 11:02:06 -08:00
Ryan Huffman	1564c76ab4	Merge pull request #9792 from huffman/feat/hand-controller-drop ... Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped	2017-03-02 10:51:35 -08:00
Chris Collins	85f25fdfd1	Merge pull request #9800 from highfidelity/stable ... Sync Stable with Master	2017-03-02 10:45:51 -08:00
Seth Alves	9d4445fd61	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 10:07:37 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Seth Alves	8893c4770e	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 10:02:33 -08:00
Seth Alves	93055a67a8	use new-style hand-lasers for both hands	2017-03-02 10:01:08 -08:00
Howard Stearns	50cf7b00fd	Merge pull request #9797 from davidkelly/dk/3348 ... fix unmute when ignoring in PAL (you can't)	2017-03-02 09:32:38 -08:00
Andrew Meadows	6612d71f85	Merge pull request #9793 from thoys/fix_readme_links ... Prefer HTTPS links in readme/build docs	2017-03-02 08:25:33 -08:00
Andrew Meadows	a55ab94cd9	other avatars use jointData no Rig animation	2017-03-02 07:52:02 -08:00
David Kelly	79e440be81	fix unmute when ignoring in PAL (you can't)	2017-03-02 08:36:58 -07:00