1595 commits

Author	SHA1	Message	Date
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
John Conklin II	afcfbfe721	Merge pull request #12644 from Atlante45/feat/ga-installer ... Add Google Analytics to installer	2018-03-20 12:07:29 -07:00
Atlante45	0117179fe4	Pull GA ID from env variables	2018-03-19 14:49:19 -07:00
Stephen Birarda	283eccd043	remove unneeded ANDROID block, revert removed line in NSIS	2018-03-15 16:21:49 -07:00
Atlante45	bbe98f61a6	Pull GUID storage in Registry for now.	2018-03-15 12:20:19 -07:00
Stephen Birarda	499defe77e	grab VS2013 redistributables that are needed by externals	2018-03-15 12:20:07 -07:00
Ryan Huffman	6552aeac4d	Fix quazip not building with correct build type	2018-03-15 12:17:35 -07:00
Stephen Birarda	10dd16ae8d	remove VS redist handling from NSIS template	2018-03-14 17:59:04 -07:00
Atlante45	2fe9f6df6f	Add google analytics to installer	2018-03-14 14:17:38 -07:00
Seth Alves	3ee41c71e4	Merge pull request #12529 from Atlante45/fix/nvtt-mac ... Fix NVTT for mac	2018-03-13 11:28:42 -07:00
Atlante45	2067c95931	Fix NVTT for mac	2018-03-01 18:05:05 -08: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	97729e8f41	Cleanup bad install	2018-01-30 17:10: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
Stephen Birarda	c329a58c14	ignore vcredist when performing fixup_bundle	2017-12-06 11:26:34 -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
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
Brad Davis	56b1c7d0ee	Fix finding the SSL binary path	2017-11-02 14:51:40 -07:00
Stephen Birarda	8976961bfb	add build config to draco install dir	2017-10-19 17:04:39 -07: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	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Sam Gateau	11dd4d2945	Merge pull request #11353 from jherico/clean_runtime ... Remove old versions of the VC Runtime from the installation directory	2017-09-21 09:02:57 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Bradley Austin Davis	2eff3dcbd6	Add additional DLL cleanup	2017-09-19 09:18:40 -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
Brad Davis	e595541da0	Remove old versions of the VC Runtime from the installation directory	2017-09-13 17:21:54 -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
Ryan Huffman	395c9283dc	Merge remote-tracking branch 'upstream/feat/auto-bake' into feat/auto-bake-fbxwriter	2017-09-12 14:09:59 -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
Andrew Meadows	f7ca6a45b6	Merge pull request #11299 from jherico/cleanup_cmake ... Cleanup CMake	2017-09-11 08:21:30 -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
Stephen Birarda	3cf77f377c	remove FBX SDK from CMake files	2017-09-07 18:46:44 -07:00
Brad Hefta-Gaub	ca00349abc	Merge pull request #11248 from birarda/feat/install-remember-custom ... remember if express or custom was selected for install	2017-09-07 12:43:01 -07:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Thijs Wenker	e2229b3c38	Merge pull request #11302 from cain-kilgore/21523 ... WL 21523 - Update text in the "How to Quit The Sandbox" Prompt	2017-09-07 21:04:34 +02:00
Cain Kilgore	84f37b9663	Changed string name	2017-09-07 18:53:05 +01:00
Cain Kilgore	d429bd0b01	Changed the Interface text to say 'Task bar' instead of 'system tray'	2017-09-06 13:42:13 +01:00
Cain Kilgore	2a6b523542	Again	2017-09-06 13:09:43 +01:00
Cain Kilgore	14e5cf31f2	Apparently I didn't need 'em	2017-09-06 12:42:17 +01:00
Cain Kilgore	4d0df705a9	Forgot some {}'s	2017-09-06 11:46:57 +01:00
Cain Kilgore	e9f666d970	Made the system tray message specific to Sandbox only	2017-09-06 02:06:10 +01:00
Cain Kilgore	99a99ce71b	WL 21513 - Update text in the "How to Quit The Sandbox" Prompt	2017-09-04 21:14:26 +01: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
Bradley Austin Davis	fb79ba2c6c	Migrate to vcpkg version of OpenSSL	2017-08-31 10:49:49 -07:00
Stephen Birarda	81fdc27ca8	use 2017.1 FBX SDK on all platforms, change linux location	2017-08-30 16:46:43 -07:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Stephen Birarda	2661f92e09	fix state setting for express/custom	2017-08-25 14:05:40 -07:00
Stephen Birarda	6ac255dd21	add custom install reg key to cpack properties	2017-08-25 12:07:26 -07:00
Stephen Birarda	e848253618	remember if express or custom was selected for install	2017-08-25 10:59:56 -07:00
Ryan Huffman	39f04adc8d	Improve baking interface and add automatic baking to asset server	2017-08-24 16:15:28 -07:00
druiz17	d5644885fa	Merge pull request #11177 from anshuman64/icon-rename ... Correct desktop icon name	2017-08-14 08:55:17 -07:00
Anshuman Dewangan	3bc185e67c	Correct desktop icon name	2017-08-11 15:37:55 -07:00
Brad Davis	be9c1b0d12	Revert "Fix bad plugins causing instant crash on startup"	2017-08-10 16:05:16 -07:00
Anshuman Dewangan	f79bf4e009	High Fidelity Interface rename	2017-08-10 13:40:00 -07:00
Chris Collins	5a5ba08ae9	Merge pull request #11155 from jherico/fix_bad_plugins ... Fix bad plugins causing instant crash on startup	2017-08-10 12:35:58 -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
Brad Davis	0452bcfbd5	Fix bad plugins causing instant crash on startup	2017-08-09 17:15:04 -07:00
utkarshgautamnyu	56c695acbb	Update NSIS.template.in	2017-08-07 18:34:20 -07:00
utkarshgautamnyu	dc4121f9d1	Update NSIS.template.in	2017-08-07 17:55:45 -07:00
utkarshgautamnyu	b80def995f	Update NSIS.template.in	2017-08-07 17:53:39 -07:00
utkarshgautamnyu	c9c36bb19e	indentation fixes	2017-08-07 17:50:53 -07:00
utkarshgautamnyu	3ee5f78c40	bug fixes for express installer	2017-08-07 17:44:07 -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
Marko Kudjerski	2279e174e6	Switching to completely silent VC++ redistributable installation	2017-08-03 09:41:41 -07:00
Ken Cooke	3c1607715e	Updated WASAPI plugin	2017-08-02 17:42:56 -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	ae31df426c	remove vcredist_x64 after installation	2017-07-31 16:52:38 -07:00
Marko Kudjerski	46966b1132	switching from LZMA (default) to BZIP2 for NSIS compression	2017-07-31 16:19:34 -07:00
Marko Kudjerski	de97dfc9d7	install the bundled vcredist_x64 instead of relying on DLLs being setup by cmake directly in the install folder	2017-07-31 15:25:02 -07:00
Brad Hefta-Gaub	3aca1e1d84	Merge pull request #11004 from highfidelity/express_custom_install ... Added a page in installer for express/custom installation	2017-07-27 13:14:56 -07:00
utkarshgautamnyu	e5ddded464	Moved Express/Custom install window just after EULA window	2017-07-25 16:16:15 -07:00
Brad Davis	b1aa6e1962	Move hosting for quazip back to hifi S3	2017-07-25 13:43:10 -07:00
utkarshgautamnyu	0ae8f4526e	Merge branch 'express_custom_install' of https://github.com/highfidelity/hifi into express_custom_install	2017-07-20 13:55:39 -07:00
utkarshgautamnyu	7ddac54b37	copy from production for PR builds unchecked for custom and express also over rides deselection	2017-07-20 13:55:04 -07:00
Brad Davis	3a31805dff	Fix warnings in Qt 59 / VS 2017 build	2017-07-20 11:57:12 -07:00
utkarshgautamnyu	2310ecab8d	Update NSIS.template.in	2017-07-20 11:18:49 -07:00
utkarshgautamnyu	de5984d121	Update NSIS.template.in	2017-07-20 10:39:04 -07:00
utkarshgautamnyu	0277f6a7e6	Update NSIS.template.in	2017-07-20 10:11:24 -07:00
utkarshgautamnyu	0a64a1e3b0	Added a page in installer for express/custom installation	2017-07-19 18:26:35 -07:00
utkarshgautamnyu	35f97837e7	ensured clean install state is not saved in the registry	2017-07-13 10:50:14 -07:00
utkarshgautamnyu	902705297f	indentation fix	2017-07-12 16:28:21 -07:00
utkarshgautamnyu	d6ac67d221	Added option for clean install	2017-07-12 16:09:30 -07:00
Ryan Huffman	b8ce4b9006	Merge pull request #10801 from huffman/fix/oven-native-separators ... Add support for native separators in oven, and vs2015/2017 FBX sdk	2017-07-03 12:07:26 -07:00
Ryan Huffman	5f92c1adc0	Update FindFBX to use newer MSVC_VERSION	2017-06-26 09:40:07 -07:00
Ryan Huffman	7298cd6940	Add support for vs2015 and vs2017 FBX libs	2017-06-23 10:54:31 -07:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
Zach Fox	e5666fbb2f	Two different options for server and client	2017-06-22 15:44:55 -07:00
Zach Fox	2318b6aef8	Add a /forceNoLaunch switch to the installer	2017-06-22 15:02:59 -07:00