1304 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	692dc75977	Merge pull request #10025 from ZappoMan/improvedKinectCmake ... add the default environment variable name for the kinect plugin to the search hints	2017-03-28 15:07:56 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
Andrew Meadows	e22d825d07	Merge pull request #9989 from birarda/bullet-rel-with-debug ... fix fresh MinSizeRel and RelWithDebugInfo builds	2017-03-28 12:35:24 -07:00
ZappoMan	876dd4c850	add the default environment variable name for the kinect plugin to the search hints	2017-03-27 15:02:00 -07:00
Seth Alves	bb28976d0e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-26 09:32:35 -07:00
Seth Alves	7455dcc2db	Merge pull request #9985 from jherico/cmake_threads ... Force thread linkage	2017-03-26 07:27:07 -08:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Stephen Birarda	a798773425	fix polyvox location for MinSizeRel	2017-03-23 17:31:02 -07:00
Stephen Birarda	85dc63a671	fix multi-line strings in VHACD and faceshift externals	2017-03-23 17:26:32 -07:00
Stephen Birarda	22c7d4032b	fix debug config handling of release faceshift lib	2017-03-23 17:13:19 -07:00
Stephen Birarda	6d38b1fe72	handle MinSizeRel configuration in vhacd external	2017-03-23 17:11:30 -07:00
Stephen Birarda	0367f70a39	interpolate CONFIG for polyvox library path	2017-03-23 17:07:51 -07:00
Stephen Birarda	ee521ed369	handle library release path for faceshift MinSizeRel build	2017-03-23 17:06:22 -07:00
Stephen Birarda	5311de1f7b	handle MinSizeRel library discovery for bullet external	2017-03-23 17:05:08 -07:00
Stephen Birarda	e100a7bedb	point VHACD external to correct library for RelWithDebugInfo	2017-03-23 16:54:21 -07:00
Stephen Birarda	670f51af0b	fix reference to RelWithDebugInfo library for polyvox	2017-03-23 16:50:03 -07:00
Stephen Birarda	be34e5a814	fix RelWithDebInfo path for faceshift	2017-03-23 16:46:52 -07:00
Stephen Birarda	654ae5032b	simplify the RelWithDebInfo check in bullet ext	2017-03-23 16:11:48 -07:00
Stephen Birarda	b023cb71be	when building RelWithDebInfo check for correct bullet libs	2017-03-23 16:02:39 -07:00
Brad Davis	8116de7c14	Force thread linkage	2017-03-23 13:45:13 -07:00
Stephen Birarda	c9d1916eea	fix for build with win path with spaces	2017-03-20 18:24:19 -07:00
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -08:00
Brad Davis	f9dcfa54aa	Add debug/release builds to oculus lib	2017-03-06 16:08:21 -08:00
Bradley Austin Davis	c892d8a81a	Update Oculus SDK to 1.11	2017-03-03 10:41:47 -08:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
Ken Cooke	ab0d5ec178	Fix for memory-leak in Windows audio stack (audiodg.exe grows without bound)	2017-01-30 11:59:30 -08:00
Brad Hefta-Gaub	e4c59472ee	Merge pull request #9468 from kencooke/audio-mixformat-float ... Fix another audio failure	2017-01-23 16:52:54 -08:00
Zach Pomerantz	daf507fc81	revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX	2017-01-23 13:02:15 -05:00
Ken Cooke	4d6eea9a63	Updated WASAPI plugins to force dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT	2017-01-20 16:40:32 -08:00
Stephen Birarda	d0236af334	use select_library_configurations for LibOVRPlatform	2017-01-05 11:20:44 -08:00
Stephen Birarda	1a50a11741	have FindLibOVRPlatform produce LIBOVRPLATFORM_LIBRARY	2017-01-05 11:20:44 -08:00
Stephen Birarda	ac7637f8ff	use _LIBRARY_RELEASE for LibOVRPlatform external	2017-01-05 11:20:44 -08:00
Stephen Birarda	4278d7b20d	download and link oculus platform for oculus plugin	2017-01-05 11:20:44 -08:00
Zach Pomerantz	0bb82d2b73	use libquazip5.so in debug	2016-12-28 16:06:32 -05:00
Seth Alves	26639aac15	Merge pull request #8789 from Atlante45/fix/settings ... Use JSON for application Settings	2016-12-15 07:00:46 -08:00
Brad Hefta-Gaub	a2ba03284e	Merge pull request #9186 from ZappoMan/kinectPlugin ... Kinect Plugin	2016-12-13 15:29:41 -08:00
Brad Hefta-Gaub	1b047d6901	fix cmake snafu	2016-12-12 11:39:10 -08:00
Brad Hefta-Gaub	4959a88581	first cut at kinect input plugin	2016-12-08 22:13:56 -08:00
Atlante45	5f2c77928a	Restore "Updated the Qt audio plugins"" ... This reverts commit f7e8d47426.	2016-12-08 14:14:48 -08:00
Clément Brisset	06331494af	Revert "Revert "Select Audio DLL at runtime""	2016-12-08 14:14:03 -08:00
Ken Cooke	b888ce890c	Updated the Qt audio plugins	2016-12-03 07:26:55 -08:00
Atlante45	e6b9d3604d	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-12-01 09:45:50 -08:00
Atlante45	db263df03e	Select Audio DLL at runtime	2016-11-29 19:42:59 -08:00
Atlante45	3035d43772	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
Zach Fox	2c0cfdf241	Fix build for real?	2016-11-18 14:39:30 -08:00
Zach Fox	5e8afb04c7	Potentially fix OSX and Linux build errors?	2016-11-18 14:39:30 -08:00
Zach Fox	fc21cae904	More stable than ever! Uses external GifCreator lib. Still frame timing issues.	2016-11-18 14:39:29 -08:00
Chris Collins	c81b0fc018	Merge pull request #9091 from kencooke/audio-multichannel ... Multichannel audio support	2016-11-18 13:32:59 -08:00
Atlante45	2f2da8ccd3	Do not read launchClientNowState if client disabled	2016-11-16 13:15:10 -08:00
Atlante45	9e0230980b	Enable Server Only install	2016-11-16 10:52:30 -08:00