527 commits

Author	SHA1	Message	Date
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	04e84f1d23	Moving to cmake time shader compiling	2018-08-03 14:58:11 -07:00
John Conklin II	de33ca512f	Merge pull request #13553 from Atlante45/feat/crashpad-mac ... Add Crashpad to Mac	2018-07-11 19:16:24 -07:00
Stephen Birarda	b4b0131065	grab correct commit hash for conflicting PR	2018-07-05 14:33:21 -07:00
Clement	546ee2b96f	cleanup cmake code	2018-07-05 14:18:09 -07:00
Stephen Birarda	bbc757a193	Merge pull request #13385 from marko8904/timestampServerUpdate ... Updated time stamping server for authenticode signatures	2018-06-29 16:46:22 -07:00
Gabriel Calero	583c46b3a0	Merge remote-tracking branch 'upstream/master' into breakpad_android	2018-06-15 21:21:03 -03:00
Marko Kudjerski	0ac1ea078e	Updated time stamping server for authenticode signatures ... Symantec's time stamp server seems to be more robust.	2018-06-15 08:20:58 -07:00
SimonWalton-HiFi	66cad7831e	Merge branch 'master' into snoretoast	2018-06-13 12:10:51 -07:00
Simon Walton	01ef636411	Merge branch 'master' into snoretoast ... Two simple conflicts fixed.	2018-06-13 11:19:56 -07:00
Stephen Birarda	7a9d77d0d9	force git abbreviated SHA to have length of 7	2018-06-08 17:21:09 -07:00
Stephen Birarda	112abc9d7e	Merge pull request #13148 from birarda/feat/new-version-numbers ... add SHA to PR/master version, add build_type (stable/master/pr/dev)	2018-06-08 14:44:22 -07:00
Gabriel Calero	3911a93a38	Merge remote-tracking branch 'upstream/master' into breakpad_android	2018-06-07 19:00:16 -03:00
Gabriel Calero	8869af069e	Integrate Breakpad in android Interface	2018-06-07 18:59:43 -03:00
Simon Walton	97613f1f07	Only set app ID on sandbox link ... Also pass down the app ID from CMake files to installer and server-console.	2018-06-01 14:13:52 -07:00
Sam Gondelman	ae3b933a80	Merge branch 'master' into etc2comp	2018-05-30 17:17:03 -07:00
Stephen Birarda	b9e9c952de	fix setting of abbreviated SHA for master builds	2018-05-30 12:15:39 -07:00
Stephen Birarda	33a122c08e	remove short SHA where it should not appear	2018-05-30 12:05:07 -07:00
Bradley Austin Davis	3beb77694f	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -07:00
Stephen Birarda	2c9648daaf	grab correct SHA for PR_BUILD, fatally error if not found	2018-05-24 12:04:32 -07:00
Stephen Birarda	2cb7c9cc62	add a BUILD_TYPE to BuildInfo, fix conditional	2018-05-24 12:04:32 -07:00
Stephen Birarda	7c852916b9	fail master/PR build without short SHA	2018-05-24 12:03:33 -07:00
Stephen Birarda	c3595a3216	pass STABLE_BUILD instead of BUILD_BRANCH through cmake	2018-05-24 12:03:03 -07:00
Stephen Birarda	50baccdb63	add the short SHA to master and PR build version	2018-05-24 12:02:13 -07:00
SamGondelman	12b91a2ab7	compress skyboxes	2018-05-18 13:18:43 -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
Clement	157ca8cd68	Update docs with correct qt version	2018-04-12 16:21:26 -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	55a3dc3a49	make client/server only installers have special naming	2018-04-05 13:55:37 -07:00
Stephen Birarda	b52a877d8d	optionally grab serverless tutorial, on for installers	2018-03-26 14:32:11 -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
Stephen Birarda	f93935f5f6	change PR build compression to bzip2	2018-03-20 14:21:52 -07:00
Stephen Birarda	c743bfcf27	templatize conditional for selection of server component	2018-03-20 14:21:52 -07:00
Stephen Birarda	1405c8fcb3	add a client only option to cmake	2018-03-20 14:20:58 -07:00
Stephen Birarda	0074c0470d	Merge pull request #12524 from birarda/feat/runtime-beside-exe ... switch back to app-local VC runtimes and UCRT	2018-03-20 14:07:27 -07:00
Atlante45	0117179fe4	Pull GA ID from env variables	2018-03-19 14:49:19 -07:00
Stephen Birarda	499defe77e	grab VS2013 redistributables that are needed by externals	2018-03-15 12:20:07 -07:00
Atlante45	2fe9f6df6f	Add google analytics to installer	2018-03-14 14:17:38 -07:00
Stephen Birarda	0d7d382540	pass additional exclusions to windeployqt	2018-02-28 16:42:25 -08:00
Stephen Birarda	e1421f2e3a	switch back to app-local VC runtimes and UCRT	2018-02-28 10:45:08 -08:00
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Bradley Austin Davis	6092f1503e	Fixing android build	2018-02-06 17:22:06 -08:00
Brad Davis	d087530423	Add nvtt to android build	2018-02-02 13:42:26 -08:00