1546 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
Sam Gondelman	ae3b933a80	Merge branch 'master' into etc2comp	2018-05-30 17:17:03 -07:00
John Conklin II	6095a3b319	Merge pull request #13082 from jherico/feature/shader_cache ... Shader load time performance optimiziations	2018-05-30 13:55:34 -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
Bradley Austin Davis	3beb77694f	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -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	12b91a2ab7	compress skyboxes	2018-05-18 13:18:43 -07:00
SamGondelman	6b268191c8	local compression, patched etc2comp	2018-05-15 14:05:21 -07:00
vladest	fee3cc0aca	Implemented backend for About dialog	2018-05-15 15:49:20 +02:00
SamGondelman	eede3ff1ba	Merge remote-tracking branch 'upstream/master' into etc2comp	2018-05-11 11:23:33 -07:00
Brad Davis	e9dc3c650b	Breakup building and testing	2018-05-09 13:20:47 -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
John Conklin II	282d319972	Merge pull request #12977 from birarda/feat/new-serverlesss-tutorial ... update serverless content for RC67	2018-04-25 13:23:22 -07:00
Stephen Birarda	005a2bce14	update to serverless content for RC67	2018-04-23 16:29:40 -07:00
Stephen Birarda	02c1cd2d50	optionally use campaign serverless content during install	2018-04-23 13:54:47 -07:00
Stephen Birarda	0da51672bb	don't stop image slideshow when install concludes	2018-04-19 18:52:45 -07:00
Stephen Birarda	7ecc279e00	show default or campaigned slideshow during install	2018-04-19 17:58:21 -07:00
Ken Cooke	3630198c27	Merge pull request #12886 from kencooke/audio-gverb-deadcode ... Remove dead code	2018-04-16 08:20:38 -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
Ken Cooke	ee6e9ee81e	Remove dead code left over from Gverb	2018-04-13 10:36:13 -07:00
Clement	157ca8cd68	Update docs with correct qt version	2018-04-12 16:21:26 -07:00
Stephen Birarda	16f6ac5295	use serverless content with baked skybox and help textures	2018-04-11 13:53:13 -07:00
John Conklin II	005b55f997	Merge pull request #12853 from birarda/new-serverless-tutorial ... RC66: fix unreadable baked textures in serverless tutorial	2018-04-11 13:44:21 -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	0d237f84b0	remove the installer information file during uninstall	2018-04-10 14:56:47 -07:00
John Conklin II	f6721d4ad0	Merge pull request #12802 from birarda/client-only-installer-name ... 66 fix - installer changes for client only name and clean install	2018-04-06 11:53:22 -07:00
Stephen Birarda	a2250a2a6d	write an install info ini file to the installation dir	2018-04-05 18:52:07 -07:00
Stephen Birarda	2e3db99f7e	update to serverless tutorial with RC66 fixes	2018-04-05 17:17:00 -07:00
Stephen Birarda	16335a3b4b	only remove selected components on clean install, leave wallet	2018-04-05 17:09:38 -07:00
Stephen Birarda	55a3dc3a49	make client/server only installers have special naming	2018-04-05 13:55:37 -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
Stephen Birarda	cfdf8c2588	handle launch client option for client only	2018-03-20 14:22:37 -07:00
Stephen Birarda	45d16731c3	fix abort of setup options page for express client	2018-03-20 14:22:37 -07:00
Stephen Birarda	9a664f25dc	setup custom or express label correctly in installer	2018-03-20 14:22:37 -07:00
Stephen Birarda	38606f83c8	add SERVER_ONLY handling for installer generation	2018-03-20 14:22:37 -07:00
Stephen Birarda	932c55ca08	handle client section in component-less install	2018-03-20 14:22:37 -07:00
Stephen Birarda	6ee6f88087	only add components to cmake for multi-component installer	2018-03-20 14:22:12 -07:00