444 commits

Author	SHA1	Message	Date
Sam Gateau	c53a15ec78	Merge pull request #13314 from jherico/feature/oculus_update ... Update Oculus integration	2018-06-07 11:45:31 -07:00
Bradley Austin Davis	e38059797d	Update Oculus integration	2018-06-06 17:27:30 -07:00
Ryan Huffman	f87775c269	Update serverless content to v2	2018-06-05 10:03:39 -07:00
Sam Gondelman	ae3b933a80	Merge branch 'master' into etc2comp	2018-05-30 17:17:03 -07:00
Stephen Birarda	c03b9833fd	Merge pull request #13233 from highfidelity/RC68 ... Merge RC68 back to master	2018-05-24 16:55:44 -07:00
Andrew Meadows	7e03b8b33c	one more try to eliminate windows compile warnings	2018-05-24 11:28:52 -07:00
Andrew Meadows	da7dc487cc	remove windows build warnings in Bullet lib	2018-05-24 11:28:52 -07:00
Andrew Meadows	1112609ae7	upgrade to Bullet-2.88	2018-05-24 11:28:52 -07:00
Ryan Huffman	3554334dfc	Update serverless tutorial for RC68	2018-05-24 10:27:00 -07:00
Andrew Meadows	1c0f6818a3	apply orenh1's patch to make GLM-0.9.8.5 compile on updated linux	2018-05-23 14:52:28 -07:00
Andrew Meadows	aedb5cc746	upgrade to glm-0.9.8.5	2018-05-23 14:52:28 -07:00
SamGondelman	282e61c085	patch etc2comp for mac	2018-05-21 16:20:09 -07:00
SamGondelman	6b268191c8	local compression, patched etc2comp	2018-05-15 14:05:21 -07:00
SamGondelman	07600f2a81	add etc2comp dependency on desktop and android	2018-05-08 17:30:48 -07:00
Seth Alves	a245bb2174	fix libquazip debug filename. link libatomic where needed	2018-04-28 13:30:28 -07:00
Stephen Birarda	e9ac581309	update RC67 serverless content to include default path	2018-04-26 16:31:31 -07:00
Stephen Birarda	d3661ac22c	use baked uncompressed KTX skyboxes for macOS compatibility	2018-04-25 18:23:45 -07:00
Stephen Birarda	005a2bce14	update to serverless content for RC67	2018-04-23 16:29:40 -07:00
John Conklin II	6def70791e	Merge pull request #12864 from sethalves/backtrace-annotations ... switch to backtrace's newer crashpad blob	2018-04-13 15:34:05 -07:00
Stephen Birarda	16f6ac5295	use serverless content with baked skybox and help textures	2018-04-11 13:53:13 -07:00
Seth Alves	625905007f	use new filename for new blob	2018-04-11 11:49:53 -07:00
Seth Alves	366498c6d3	switch to backtrace's newer crashpad blob	2018-04-11 11:44:49 -07:00
Stephen Birarda	7ec65e8c0c	fix unreadable baked textures in serverless tutorial	2018-04-10 17:02:37 -07:00
Stephen Birarda	2e3db99f7e	update to serverless tutorial with RC66 fixes	2018-04-05 17:17:00 -07:00
Seth Alves	60ed033667	new content md5	2018-03-26 14:33:08 -07:00
Stephen Birarda	b52a877d8d	optionally grab serverless tutorial, on for installers	2018-03-26 14:32:11 -07:00
Ryan Huffman	6552aeac4d	Fix quazip not building with correct build type	2018-03-15 12:17:35 -07:00
Atlante45	2067c95931	Fix NVTT for mac	2018-03-01 18:05:05 -08:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
Atlante45	ced5aad1d1	backtrace for rc-63	2018-01-26 09:20:07 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Ken Cooke	c324f342b4	Fix to check ANDROID before UNIX	2017-11-09 13:39:13 -08:00
Ken Cooke	9a1386bf0d	Fix build errors on Linux	2017-11-09 10:34:52 -08:00
Ken Cooke	6d019b4302	Update the audio codecs	2017-11-08 18:16:42 -08:00
Ken Cooke	6ca9cc0239	Update WASAPI audio plugin	2017-11-03 18:40:55 -07:00
Stephen Birarda	8976961bfb	add build config to draco install dir	2017-10-19 17:04:39 -07:00
Seth Alves	4d2f16efc3	allow project to be built with clang on Linux	2017-10-08 18:01:41 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Atlante45	ae14f1f88e	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-09-14 15:34:20 -07:00
Stephen Birarda	c365e1718e	set include dir for draco the same across the board	2017-09-13 13:51:26 -07:00
Stephen Birarda	1e6154fbc8	make draco compile flags OS X only	2017-09-13 13:45:26 -07:00
Stephen Birarda	f9cc82c992	use draco 1.1.0 in external	2017-09-12 10:25:44 -07:00
Stephen Birarda	1b2ba3acb6	force libc++ for OS X draco build	2017-09-11 12:07:57 -07:00
Stephen Birarda	09d18b5ba9	handle special include path for Draco on WIN	2017-09-08 09:47:16 -07:00
Stephen Birarda	91f4551598	add draco to the oven tool	2017-09-08 09:46:55 -07:00
Brad Davis	9c03fa0369	Cleanup CMake	2017-09-02 16:15:14 -07:00
Stephen Birarda	feef7dfec3	compare MSVC version numerically with greater_equal	2017-08-10 09:46:58 -07:00
Stephen Birarda	5b072b591e	remove commas breaking MSVC dir setting	2017-08-09 18:41:34 -07:00
Stephen Birarda	57fe5ae802	use tbb binaries more and update for vc14	2017-08-09 17:55:15 -07:00
Ken Cooke	3c1607715e	Updated WASAPI plugin	2017-08-02 17:42:56 -07:00
Brad Davis	b1aa6e1962	Move hosting for quazip back to hifi S3	2017-07-25 13:43:10 -07:00
Brad Davis	3a31805dff	Fix warnings in Qt 59 / VS 2017 build	2017-07-20 11:57:12 -07:00
Seth Alves	f42146c139	dry up quazip cmake	2017-06-18 13:24:24 -07:00
Seth Alves	a1571608db	try some more	2017-06-18 11:48:11 -07:00
Seth Alves	242d615b50	sigh	2017-06-18 11:16:36 -07:00
Seth Alves	fd137e1a84	build quazip with c++11	2017-06-18 10:22:50 -07:00
Ken Cooke	45db8c3bef	Rebase optimizations on NVTT 2.1.0 instead of master	2017-06-05 11:18:54 -07:00
Ken Cooke	024499bdc4	Optimized NVTT library with fast gamma conversion	2017-06-04 12:59:15 -07:00
Ken Cooke	807a6d5831	Bugfix: new threading changes in the Qt5.7.1 plugin were causing deadlock	2017-05-08 18:03:50 -07:00
Ken Cooke	746ae6dfd3	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-wasapi-qt562	2017-05-08 17:56:19 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Ken Cooke	9e77771c99	Update WASAPI audio plugin for Qt5.6.2	2017-04-28 12:00:01 -07:00
Stephen Birarda	e3ab2615c1	allow NVTT to be built as external on android	2017-04-25 15:56:23 -07:00
Stephen Birarda	7968045626	update md5 for patched external nvtt	2017-04-25 15:56:23 -07:00
Stephen Birarda	11fa2797b7	force the release DLL path for NVTT on windows	2017-04-25 15:56:23 -07:00
Stephen Birarda	202e933d8b	don't build, install, or configure nvtt on windows	2017-04-25 15:56:23 -07:00
Stephen Birarda	06b3b3d5f4	ad missing include dir for NVTT on win	2017-04-25 15:56:23 -07:00
Stephen Birarda	d72e5e5b24	add handling for install_name_tool calls on OS X	2017-04-25 15:56:23 -07:00
Stephen Birarda	3a217f75f4	force release for NVTT on Win32	2017-04-25 15:56:23 -07:00
Stephen Birarda	5c12180b58	use pre-built NVTT on windows	2017-04-25 15:56:23 -07:00
Stephen Birarda	27c6011e6e	change nvtt external to ignore release type	2017-04-25 15:56:23 -07:00
Stephen Birarda	ee62e7dcb8	update nvtt external to build from source	2017-04-25 15:56:22 -07:00
Atlante45	94e1cbbc95	Upload nvtt archive to S3	2017-04-25 15:56:22 -07:00
Atlante45	0428b22b63	Add nvtt external	2017-04-25 15:56:22 -07:00
Anthony J. Thibault	42262aac78	OpenVR: upgrade to version 1.0.6, for better generic tracker support	2017-04-05 18:41:43 -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	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
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	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
Atlante45	5f2c77928a	Restore "Updated the Qt audio plugins"" ... This reverts commit f7e8d47426.	2016-12-08 14:14:48 -08:00
Zach Fox	2c0cfdf241	Fix build for real?	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