23198 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	cbded766b1	Merge pull request #10676 from NeetBhagat/21369 ... WL 21369 - Implement parts of the JS "console" object	2017-06-20 11:06:34 -07:00
Seth Alves	428dc81083	Merge pull request #10696 from AndrewMeadows/avoid-ownership-bid-race ... ignore remote update younger than recent ownership bid	2017-06-20 10:42:54 -07:00
Thijs Wenker	07fefdcb2f	Merge pull request #10748 from samcake/brown ... Fix the local lights issue	2017-06-20 05:17:18 +02:00
samcake	ba9dbbb4d4	Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...	2017-06-19 17:34:50 -07:00
Stephen Birarda	cf9a97cf10	use length sent by AssetServer to verify asset size	2017-06-19 15:15:45 -07:00
Howard Stearns	ddce665613	Merge pull request #10739 from zfox23/spectatorCamera_mergeable_20170619 ... Spectator Camera - Mergeable Rendering Components	2017-06-19 14:55:43 -07:00
Brad Davis	8aeeab30e7	Merge pull request #10689 from Atlante45/fix/ktx ... Fix KTX performance problems	2017-06-19 14:44:52 -07:00
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Atlante45	c4c6142935	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/ktx	2017-06-19 11:06:51 -07:00
Atlante45	8d45c4da7c	Fix comments	2017-06-19 11:02:31 -07:00
Zach Fox	08eb07242d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-19 10:31:31 -07:00
Brad Davis	1d4b443113	Prevent cache ejection of textures in use	2017-06-19 09:51:11 -07:00
Clément Brisset	3262e10d76	Merge pull request #10727 from jherico/file_cache_locking ... Prevent deadlocks from different locking orders in FileCache	2017-06-17 15:13:47 -07:00
Brad Davis	1632e3b35a	PR feedback	2017-06-16 20:04:23 -07:00
Atlante45	d090ac4396	CR	2017-06-16 17:04:57 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Andrew Meadows	b105ad8338	measure linear velocity of tractor position	2017-06-16 16:55:00 -07:00
Brad Davis	a675dfe7d2	Prevent deadlocks from different locking orders in FileCache	2017-06-16 15:30:50 -07:00
Zach Fox	7a76c9cf7f	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 14:59:23 -07:00
Atlante45	097e75285a	Remove extra profiling	2017-06-16 14:31:56 -07:00
Atlante45	c2650c2b71	Declare KTXDescriptor* metatype	2017-06-16 14:31:56 -07:00
Atlante45	54fc8085f3	Remove pointer to file in NetworkTexture	2017-06-16 14:31:56 -07:00
Atlante45	4d3fc39ab6	Make KTX async tasks thread safe	2017-06-16 14:31:56 -07:00
Atlante45	fb8aa96a57	Add resource processing tracking to KTX	2017-06-16 14:31:56 -07:00
Atlante45	306b55e45d	Synchronous mip loading	2017-06-16 14:31:56 -07:00
Atlante45	57e8d8e1fd	Fix download retries	2017-06-16 14:31:56 -07:00
Atlante45	31d2592e7d	Handle header and high mips in the same callback	2017-06-16 14:31:56 -07:00
Atlante45	d2251bb840	Offload ktx processing to threadpool	2017-06-16 14:31:56 -07:00
Atlante45	3110dd72bf	More ktx work	2017-06-16 14:31:56 -07:00
Atlante45	35a0c41cf5	Move Ktx processing to thread pool.	2017-06-16 14:31:56 -07:00
NeetBhagat	2909aa9ac8	Resolve comments of @zappoman. ... -- Rename "asserts" to "assert" -- Log printing methods will accept lists of objects or strings.	2017-06-17 01:00:32 +05:30
Chris Collins	f160034bf0	Merge pull request #10681 from zzmp/audio/parity ... Revamp audio device selection	2017-06-16 10:31:55 -07:00
Zach Fox	416ebaa2e8	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 10:08:10 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Zach Fox	130d98fcfc	Merge pull request #10708 from zfox23/spectatorCamera_fixMonitorDisplay ... Ensure monitor never shows frozen SpectatorCamera preview	2017-06-15 15:35:31 -07:00
Zach Fox	d7a9354b37	More CR comments; rename function	2017-06-15 13:25:16 -07:00
Andrew Meadows	5e0be1a823	Merge pull request #10662 from ctrlaltdavid/21394 ... Smoothly ease hands from uncontrolled to controlled positions	2017-06-15 13:17:26 -07:00
Zach Fox	1088d248e3	Howard's CR comments	2017-06-15 13:13:58 -07:00
Zach Fox	834a2a5c3b	Ensure monitor never shows frozen SpectatorCamera preview	2017-06-15 12:49:09 -07:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
Zach Fox	47e5fb56d3	Show MyAvatar's head in the SpectatorCamera view!	2017-06-15 11:31:20 -07:00
Zach Fox	60549075dd	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-15 10:09:07 -07:00
ZappoMan	d352163d77	fix no audio device from previously removed audio device	2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub	035a9e898f	Merge pull request #10684 from howard-stearns/avatar-whitelist ... avatar whitelist	2017-06-15 08:45:16 -07:00
NeetBhagat	a6b1b17d45	Merge branch 'master' into 21369	2017-06-15 11:04:22 +05:30
Andrew Meadows	8d19395b0a	ignore remote update younger than recent bid	2017-06-14 16:04:52 -07:00
Zach Fox	f214712b33	Merge pull request #10678 from zfox23/spectatorCamera_improvements1 ... Secondary camera and rendering improvements	2017-06-14 14:39:38 -07:00
Zach Fox	6b6b6026a4	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-14 13:44:13 -07:00
howard-stearns	2deb26551f	typos in comments/help-strings	2017-06-14 11:56:47 -07:00