1420 commits

Author	SHA1	Message	Date
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