19329 commits

Author	SHA1	Message	Date
Chris Collins	4c789c44aa	Merge pull request #9922 from birarda/bug/stuck-ess ... fix a couple of ESS issues during ES/ESS restart	2017-03-21 12:44:53 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Chris Collins	ea13151d55	Merge pull request #9945 from mnafees/21233 ... 21233: Remove Scripts Editor option from Edit menu and all related files	2017-03-21 08:01:36 -07:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Stephen Birarda	a4d72c4e67	make AudioScriptingInterface a Dependency	2017-03-20 13:40:15 -07:00
Brad Hefta-Gaub	bc5d7d8698	Merge pull request #9851 from AndrewMeadows/simulation-ownership-2 ... zero velocity of deactivated dynamic entities	2017-03-20 10:20:11 -07:00
Brad Hefta-Gaub	af790d8474	Merge pull request #9875 from birarda/bug/spin-strafe ... fix double snap turn strafing	2017-03-20 10:08:05 -07:00
Chris Collins	af2748410d	Merge pull request #9932 from Triplelexx/21231 ... 21231 - Remove About Interface from File menu	2017-03-20 09:55:57 -07:00
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
Mohammed Nafees	c460523980	Remove related icon files for Scripts Editor	2017-03-20 00:25:50 -04:00
Mohammed Nafees	3612b9fccc	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04: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
Triplelexx	eba6c8de5e	remove About Interface from File menu	2017-03-17 17:37:19 +00: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
Zach Pomerantz	789bb7c855	rename audio(Mic)OutboundPPS	2017-03-15 13:30:39 -04:00
Stephen Birarda	490cb83489	move advanced movement control changes to MyAvatar	2017-03-14 15:03:01 -07:00
Stephen Birarda	1fe02477b0	fix LX behaviour in snap/advanced/basic	2017-03-14 14:21:21 -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
Stephen Birarda	0926b2df2a	add LX snap turn to standard mapping	2017-03-13 15:14:20 -07:00
Ryan Huffman	8a1bd781f0	Fix overlay findRayIntersection not properly handing multiple drawInFront overlays	2017-03-13 14:44:14 -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