19311 commits

Author	SHA1	Message	Date
Chris Collins	509057c6d8	Merge pull request #9941 from Triplelexx/21232 ... 21232 - Remove Mini Mirror from View menu	2017-03-20 09:55:37 -07:00
Chris Collins	ed27c550af	Merge pull request #9939 from ctrlaltdavid/21237 ... Disable Developer > Assets > ATP Asset Migration menu item	2017-03-20 06:29:33 -07:00
Chris Collins	2e6291f470	Merge pull request #9929 from ctrlaltdavid/21235 ... Replace Developer > Network > Disk cache editor with menu action	2017-03-20 06:26:36 -07:00
Triplelexx	8e086a8fc8	fix build error	2017-03-18 03:51:55 +00:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
David Rowe	ab7d82edb6	Use #ifdef instead of comment	2017-03-18 12:56:34 +13:00
David Rowe	38bb48e72c	Disable Developer > Assets > ATP Asset Migration menu item	2017-03-18 12:13:13 +13:00
David Rowe	e3b9d588ec	Merge branch 'master' into 21235 ... # Conflicts: # interface/src/Menu.cpp # interface/src/ui/DialogsManager.h	2017-03-18 09:42:36 +13:00
Brad Hefta-Gaub	a75acd139b	Merge pull request #9885 from sethalves/model-scripting ... Model scripting	2017-03-17 13:13:17 -07:00
Andrew Meadows	60e0eb0cf9	Merge pull request #9917 from Atlante45/fix/sit ... Cancel Avatar velocity when sitting down.	2017-03-17 10:04:25 -07:00
Atlante45	698791295a	Expose DriveKeys enum to JS	2017-03-16 20:03:27 -07:00
David Rowe	939b4f1612	Remove Developer > Network > Disk Cache Editor menu item and dialog	2017-03-17 13:49:09 +13:00
Atlante45	5a1ce4bb05	CR	2017-03-16 17:46:47 -07:00
Atlante45	9155cc6334	Fix windows warnings	2017-03-16 17:44:56 -07:00
David Rowe	e21d7d9edf	Add Developer > Network > Clear Disk Cache menu action	2017-03-17 13:34:11 +13:00
David Rowe	dc71f502f0	Delete Developer > Network > RAM Caches Size menu item and dialog	2017-03-17 13:09:06 +13:00
Atlante45	42316e713d	CR drive keys	2017-03-16 16:24:52 -07:00
Atlante45	3e9474e878	CR	2017-03-16 16:24:36 -07:00
Atlante45	7517f224a8	Add MyAvatar drive keys capture capability	2017-03-16 15:44:17 -07:00
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
Seth Alves	693aee0628	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-03-15 16:54:40 -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
Seth Alves	e8a9ff867d	merge from upstream	2017-03-13 17:57:01 -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