544 commits

Author	SHA1	Message	Date
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
Olivier Prat	ac92b3c130	Merge branch 'master' of http://github.com/highfidelity/hifi into scribe	2018-02-02 14:01:59 +01:00
Bradley Austin Davis	b97c938544	Merge pull request #12216 from thoys/feat/js-script-console-auto-complete ... JS scripting console auto-complete	2018-01-31 10:39:51 -08:00
John Conklin II	2ae9395283	Merge pull request #12299 from highfidelity/stable ... Merge stable back into master	2018-01-30 20:03:06 -08:00
Atlante45	d155d19198	Fix cmake install cmd	2018-01-30 17:08:10 -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	019a2d346c	Fix spaces	2018-01-30 12:04:01 -08:00
Atlante45	edfffc575a	Handle multiple targets for add_crashpad	2018-01-30 11:48:01 -08:00
Atlante45	db08f1dda6	Move backtrace to interface	2018-01-30 11:39:48 -08:00
Seth Alves	2a6ff80911	fix indentation	2018-01-30 09:13:47 -08:00
Thijs Wenker	8fdbac521f	move ADD_CUSTOM_QRC_PATH function to its own file	2018-01-27 19:58:15 +01:00
Thijs Wenker	898c99e5b8	append file jsdoc json file to resources.rcc resource file	2018-01-27 19:50:52 +01:00
Seth Alves	b7303414f2	unmangle merges	2018-01-26 11:57:30 -08:00
Atlante45	093fff9c9e	Add crashpad	2018-01-26 09:20:38 -08:00
Seth Alves	47f44eb21f	extirpate bugsplat	2018-01-26 09:20:23 -08:00
Atlante45	ced5aad1d1	backtrace for rc-63	2018-01-26 09:20:07 -08:00
Thijs Wenker	45487a1e45	Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete ... # Conflicts: # interface/CMakeLists.txt	2018-01-25 22:51:35 +01:00
Olivier Prat	95882e0cde	Merged with master	2018-01-24 10:51:54 +01:00
Thijs Wenker	79dbde6a6f	optional auto-complete build (requires NPM installed)	2018-01-23 23:01:59 +01:00
Olivier Prat	604817bb59	Forgot to fix output custom command on all other platforms than Windows	2018-01-17 19:21:58 +01:00
Olivier Prat	54690219e3	Changed the way shader type is sent to Scribe	2018-01-17 11:12:37 +01:00
Olivier Prat	7b420d48e2	Generated shader files are now grouped in a sub-filter group in the project	2018-01-17 10:59:48 +01:00
Olivier Prat	3911ce59cc	Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code	2018-01-16 19:02:12 +01:00
Bradley Austin Davis	bac3388693	Fixing Linux build	2018-01-15 09:09:30 -08:00
Brad Davis	55bfdc105b	Switch android to GLAD	2018-01-14 10:22:18 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	51a0131414	Fix linkage	2018-01-12 19:37:28 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
Brad Davis	22d133c71f	Allow GLES client on desktop builds	2018-01-11 23:31:34 -08:00
Brad Davis	7a7aee770c	Switching to binary resources	2018-01-10 13:39:56 -08:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
Brad Davis	c6bc6f6ef2	Merge remote-tracking branch 'upstream/master' into android_nov	2017-12-16 16:20:16 -08:00
Brad Davis	0379ebad63	Updating android toolchain for QML	2017-12-07 11:19:31 -08:00
Stephen Birarda	99b5b8942a	add file download command to install step	2017-12-06 12:15:42 -08:00
Stephen Birarda	008b4285f5	don't use cmake sys library install, grab vcredist as external	2017-12-06 11:35:14 -08:00
Bradley Austin Davis	5febbc32f5	CMake header cleanup	2017-11-28 13:54:46 -08:00
Bradley Austin Davis	a30395e945	Tweaking android cmake	2017-11-28 13:46:01 -08:00
Brad Davis	8d6d1f67f1	Support RELEASE_TYPE and RELEASE_NUM for Android	2017-11-28 11:32:36 -08:00
Bradley Austin Davis	ddc2548c53	Add polyvox, fix task copy bugs	2017-11-28 11:32:34 -08:00
Bradley Austin Davis	d6072f2bf2	Add bullet and draco to precompiled libraries	2017-11-28 11:32:34 -08:00
Brad Davis	d769acd345	Updating Android toolchain	2017-11-28 11:32:32 -08:00
Bradley Austin Davis	aa6c841357	Merge pull request #11588 from jherico/future/qrc ... Package all UI resources into a QRC built into the application.	2017-10-18 15:29:34 -07:00
Bradley Austin Davis	17a6847609	Fix CMake command line options	2017-10-16 14:58:19 -07:00
Brad Davis	2ae61cb96b	Prototype packaging QML and related resources into a QRC	2017-10-14 14:40:46 -07:00
Seth Alves	aa08053a28	fix osx build	2017-10-09 17:34:43 -07:00
Seth Alves	4d2f16efc3	allow project to be built with clang on Linux	2017-10-08 18:01:41 -07:00
Flame Soulis	0c33f46ab1	Update SetupQt.cmake ... This change allows -DQT_CMAKE_PREFIX_PATH to function again. Previously, set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}") always ran, which overrode QT_CMAKE_PREFIX_PATH every time on cmake. This proposed change now only uses the environment variable if DQT_CMAKE_PREFIX_PATH is not specified.	2017-10-05 21:42:16 -04:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Andrew Meadows	f7ca6a45b6	Merge pull request #11299 from jherico/cleanup_cmake ... Cleanup CMake	2017-09-11 08:21:30 -07:00
Brad Davis	e64227bccd	Fix mac build	2017-09-03 09:50:25 -07:00
Brad Davis	9c03fa0369	Cleanup CMake	2017-09-02 16:15:14 -07:00
Stephen Birarda	e848253618	remember if express or custom was selected for install	2017-08-25 10:59:56 -07:00
Anshuman Dewangan	3bc185e67c	Correct desktop icon name	2017-08-11 15:37:55 -07:00
Anshuman Dewangan	f79bf4e009	High Fidelity Interface rename	2017-08-10 13:40:00 -07:00
Chris Collins	6d57b4df38	Merge pull request #11108 from jherico/installer_remove_pdb ... Fix installer issues	2017-08-03 12:51:58 -07:00
Brad Davis	5a7a6bab70	Remove PDB files, eliminate sixense	2017-08-02 14:08:46 -07:00
Marko Kudjerski	6855dcbacf	use bzip2 compression only for PR builds (so that we internally benefit from faster builds)	2017-07-31 17:17:11 -07:00
Marko Kudjerski	46966b1132	switching from LZMA (default) to BZIP2 for NSIS compression	2017-07-31 16:19:34 -07:00
Brad Davis	3a31805dff	Fix warnings in Qt 59 / VS 2017 build	2017-07-20 11:57:12 -07:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Ken Cooke	b3bb91af8c	CMAKE: detect compiler support, add flags for AVX512 source files	2017-06-21 10:25:34 -07:00
David Rowe	2ca4283828	Fix Leap Motion SDK access	2017-06-17 12:02:26 +12:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Stephen Birarda	b57bf956e2	make server plugins a dependency of AC too	2017-04-10 11:23:43 -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
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
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00: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	4959a88581	first cut at kinect input plugin	2016-12-08 22:13:56 -08:00
Clément Brisset	06331494af	Revert "Revert "Select Audio DLL at runtime""	2016-12-08 14:14:03 -08:00
Clément Brisset	3659e8e585	Revert "Select Audio DLL at runtime"	2016-12-02 14:15:11 -08:00
Atlante45	db263df03e	Select Audio DLL at runtime	2016-11-29 19:42:59 -08:00
Atlante45	d7d54dd82f	Only launch interface if selected	2016-11-16 10:44:59 -08:00
Seth Alves	92836caf57	when creating plugins on Linux with memory-debugging enabled, use asan flags such that the shared libraries can be loaded	2016-11-12 10:01:29 -08:00
Seth Alves	4d55bc1b32	adjust build arguments used with asan on Linux	2016-10-27 10:09:29 -07:00
Anthony J. Thibault	7ac3a189a0	generate pdb files for plugins as well ... I'm going to coordinate with marco to ensure that these pdb files are uploaded to bugsplat as well. It will make hard to reproduce crashes in display plugins easier to diagnose in the future.	2016-10-26 17:48:28 -07:00
Mat Tyndall	1966a710b5	set inital USE_STABLE_GLOBAL_SERVICES to 0	2016-10-13 00:12:05 -07:00
Mat Tyndall	0e567da8d2	changed USE_STABLE_GLOBAL_SERVICES to use 1	2016-10-13 00:01:17 -07:00