19280 commits

Author	SHA1	Message	Date
Andrew Meadows	6f4d9bfba3	Merge pull request #9858 from kunalgosar/logBolding ... Change to Log Font and Formatting	2017-03-16 13:09:37 -07:00
kunalgosar	0cee9ee172	font change	2017-03-16 11:57:46 -07:00
Seth Alves	eba2417f41	Merge pull request #9912 from AndrewMeadows/model-cleanup-4 ... minor cleanup of render pipeline for models and avatars	2017-03-16 10:39:43 -08:00
kunalgosar	e7a16d4294	code standard fixes	2017-03-16 10:53:35 -07:00
Seth Alves	31e0cfe296	Merge pull request #9825 from thoys/record-fixes ... Avatar Recorder and Playback Fixes	2017-03-16 07:27:42 -08:00
Andrew Meadows	361e03fc78	remove unused variable	2017-03-15 16:57:31 -07:00
Andrew Meadows	d3fa28d4bc	remove cruft and fix indentation	2017-03-15 16:17:59 -07:00
Andrew Meadows	f250c0d298	simpler bindTransform() for ModelMeshPartPayload	2017-03-15 14:41:13 -07:00
Anthony Thibault	495deba771	Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races ... Fixes for race conditions in DebugDraw	2017-03-15 10:38:26 -07:00
Anthony J. Thibault	efc7fbacb1	Bug fix for potential crash when getting DebugDraw::instance ... (cherry picked from commit b0ad9a8110)	2017-03-13 15:23:10 -07:00
Andrew Meadows	546f32431d	Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate ... Various noise gate, scope, and audio stats improvements	2017-03-13 11:52:16 -07:00
Andrew Meadows	6e7f4b0418	Merge pull request #9829 from ZappoMan/addDoubleClick ... Add double click message support to entities and overlays	2017-03-13 10:44:54 -07:00
Brad Hefta-Gaub	a38965d628	add more audio stats	2017-03-11 09:50:30 -08:00
Brad Hefta-Gaub	6ce50269ac	add audio mixer in/out stats to the client stats	2017-03-10 18:42:18 -08:00
Brad Hefta-Gaub	aa65f03509	fix mac warning and remove accidentally added whitespace	2017-03-10 18:14:00 -08:00
Brad Hefta-Gaub	23e47f2fdc	added icons to the audioScope app	2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub	7eb4b8f5f7	expose AudioScope to QML	2017-03-10 17:38:13 -08:00
Brad Hefta-Gaub	eaea718de1	add various scriping interfaces for managing the audio scope and detecting noise gate transitions	2017-03-10 17:08:19 -08:00
kunalgosar	a974282bdf	bolding timestamps on log	2017-03-10 11:55:36 -08:00
Dante Ruiz	c6c0c6d382	toolbar becomes visible after taking a snapshot	2017-03-09 22:54:22 +00:00
Seth Alves	adc3581d63	remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay	2017-03-07 19:32:34 -08:00
Brad Hefta-Gaub	8ae6f2727d	add support for double click messages to overlays and entities	2017-03-07 17:52:55 -08:00
Thijs Wenker	b54d6cb0e1	stop avatar controller while playing back a recording, which makes it not collide anymore	2017-03-08 00:07:49 +01:00
howard-stearns	cb41b9135b	fix broken merge	2017-03-07 12:10:52 -08:00
howard-stearns	8a489f36f4	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal	2017-03-07 10:49:53 -08:00
Howard Stearns	f0fd29abd3	Merge pull request #9815 from davidkelly/dk/3377 ... Retain selection in PAL when sorting or reloading	2017-03-07 09:38:07 -08:00
David Kelly	b760e86226	rest of cr feedback	2017-03-07 10:17:32 -07:00
David Kelly	c6dbfc85f0	cr feedback	2017-03-07 09:54:00 -07:00
Vladyslav Stelmakhovskyi	2d2b2094fd	Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination	2017-03-07 10:11:09 +01:00
Brad Hefta-Gaub	b111bcb826	Merge pull request #9818 from ctrlaltdavid/21205 ... Remove Developer > Network > Bandwith Details dialog	2017-03-06 22:02:33 -08:00
David Rowe	51739f2f99	Remove Developer > Network > Bandwith Details dialog	2017-03-07 15:02:26 +13:00
David Kelly	3d39aae35b	minor tweak - just in case	2017-03-06 15:52:33 -07:00
David Kelly	f23f882595	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377	2017-03-06 15:26:21 -07:00
David Kelly	e14a1ad1af	minor cleanup	2017-03-06 15:26:03 -07:00
David Kelly	db036d997c	first pass	2017-03-06 15:18:35 -07:00
Zach Fox	5223f872c1	Merge pull request #9753 from zfox23/FB_3234_TakeTwo ... Optimize AvatarMixer with respect to Identity and Avatar Data	2017-03-06 13:37:29 -08:00
Andrew Meadows	1b8f6b9835	Merge pull request #9784 from samcake/blue ... Fixing Emissive on overlay for models (opaque and transparent)	2017-03-06 13:24:00 -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
howard-stearns	632cdc1b38	semicolons and whitespace per coding standard	2017-03-06 11:04:12 -08:00
Zach Fox	c9c07c4269	Basically rebase and squash	2017-03-06 10:03:41 -08:00
sam	cffd838d1d	merging with master	2017-03-05 12:57:13 -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
howard-stearns	a715a694f0	fix 'banned user doesn't disappear from pal until refresh'	2017-03-03 16:27:38 -08:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08: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	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