398 commits

Author	SHA1	Message	Date
Liv	2fe9913d22	update tutorial content	2018-06-22 20:48:59 -04:00
SamGondelman	64fdb8fe62	simplify etc2comp cmake	2018-06-21 09:32:39 -07:00
Seth Alves	b60e3c6c7b	fix etclib link when building RelWithDebInfo on OSX	2018-06-15 17:09:32 -07:00
Clement	920263ef49	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-06-12 17:00:25 -07:00
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