1399 commits

Author	SHA1	Message	Date
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
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
Bradley Austin Davis	fb79ba2c6c	Migrate to vcpkg version of OpenSSL	2017-08-31 10:49:49 -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
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