51872 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	27066e89a6	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:46:19 -08:00
Seth Alves	a2d2c41f02	remove debug print	2017-03-06 11:45:49 -08:00
Seth Alves	08e2e421e4	Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js	2017-03-06 11:08:27 -08:00
Seth Alves	eb47db4441	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:07:22 -08:00
Seth Alves	4b02e550db	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 11:07:12 -08:00
Seth Alves	8a614bf0b3	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:07:05 -08:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
Seth Alves	6ac576c9e6	Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays	2017-03-06 10:43:43 -08:00
Seth Alves	19a31d7630	don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 10:15:53 -08:00
Seth Alves	767d6e43fb	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:58:22 -08:00
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
David Rowe	6403e51d20	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-04 09:00:49 +13: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
David Rowe	854292b193	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 17:51:12 +13:00
David Rowe	55963c4418	Style audio stats dialog button	2017-03-03 17:46:12 +13:00
David Rowe	b31cf23c8d	Fix tablet QML fonts path ... This is the path for running scripts from build/install directory rather than from source directory.	2017-03-03 17:45:23 +13:00
David Rowe	3285816fca	Fix up audio stats displayed in tablet	2017-03-03 16:45:35 +13:00
David Rowe	02a2bb6fc3	Rename QML file	2017-03-03 16:25:15 +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
David Rowe	2b53cb4722	Display audio stats in tablet	2017-03-03 11:31:41 +13: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