1967 commits

Author	SHA1	Message	Date
Ken Cooke	ee6e9ee81e	Remove dead code left over from Gverb	2018-04-13 10:36:13 -07:00
Clement	157ca8cd68	Update docs with correct qt version	2018-04-12 16:21:26 -07:00
Stephen Birarda	16f6ac5295	use serverless content with baked skybox and help textures	2018-04-11 13:53:13 -07:00
John Conklin II	005b55f997	Merge pull request #12853 from birarda/new-serverless-tutorial ... RC66: fix unreadable baked textures in serverless tutorial	2018-04-11 13:44:21 -07:00
Seth Alves	625905007f	use new filename for new blob	2018-04-11 11:49:53 -07:00
Seth Alves	366498c6d3	switch to backtrace's newer crashpad blob	2018-04-11 11:44:49 -07:00
Stephen Birarda	7ec65e8c0c	fix unreadable baked textures in serverless tutorial	2018-04-10 17:02:37 -07:00
Stephen Birarda	0d237f84b0	remove the installer information file during uninstall	2018-04-10 14:56:47 -07:00
John Conklin II	f6721d4ad0	Merge pull request #12802 from birarda/client-only-installer-name ... 66 fix - installer changes for client only name and clean install	2018-04-06 11:53:22 -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	2e3db99f7e	update to serverless tutorial with RC66 fixes	2018-04-05 17:17:00 -07:00
Stephen Birarda	16335a3b4b	only remove selected components on clean install, leave wallet	2018-04-05 17:09:38 -07:00
Stephen Birarda	55a3dc3a49	make client/server only installers have special naming	2018-04-05 13:55:37 -07:00
Seth Alves	60ed033667	new content md5	2018-03-26 14:33:08 -07:00
Stephen Birarda	b52a877d8d	optionally grab serverless tutorial, on for installers	2018-03-26 14:32:11 -07:00
Stephen Birarda	cfdf8c2588	handle launch client option for client only	2018-03-20 14:22:37 -07:00
Stephen Birarda	45d16731c3	fix abort of setup options page for express client	2018-03-20 14:22:37 -07:00
Stephen Birarda	9a664f25dc	setup custom or express label correctly in installer	2018-03-20 14:22:37 -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
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
Howard Stearns	922b66d447	Merge pull request #10779 from howard-stearns/no-sand-box-if-new-install-option ... installer allows /nSandboxIfNew command line switch	2017-06-22 13:37:28 -07:00
Brad Hefta-Gaub	197006e3d3	Merge pull request #10780 from kencooke/audio-hrtf-avx512 ... HRTF optimizations	2017-06-22 13:34:05 -07:00
howard-stearns	cec4b4e86b	change var to a global per CR	2017-06-22 12:54:30 -07:00
howard-stearns	6a5dfd6fc5	Merge branch 'master' of https://github.com/highfidelity/hifi into no-sand-box-if-new-install-option	2017-06-22 12:13:59 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
howard-stearns	8f51beda17	installer allows /nSandboxIfNew command line switch, which defaults ... sandbox to off if this is a new install	2017-06-21 16:54:47 -07:00
Seth Alves	0d9aa8182e	have cmake find fbx library on Linux	2017-06-21 17:10:19 -04:00
Ken Cooke	b3bb91af8c	CMAKE: detect compiler support, add flags for AVX512 source files	2017-06-21 10:25:34 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Seth Alves	f42146c139	dry up quazip cmake	2017-06-18 13:24:24 -07:00
Seth Alves	a1571608db	try some more	2017-06-18 11:48:11 -07:00
Seth Alves	242d615b50	sigh	2017-06-18 11:16:36 -07:00
Seth Alves	fd137e1a84	build quazip with c++11	2017-06-18 10:22:50 -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
Ken Cooke	45db8c3bef	Rebase optimizations on NVTT 2.1.0 instead of master	2017-06-05 11:18:54 -07:00
Ken Cooke	024499bdc4	Optimized NVTT library with fast gamma conversion	2017-06-04 12:59:15 -07:00
Brad Hefta-Gaub	a88f72024d	Merge pull request #10243 from birarda/bake-textures ... Add an internal tool for domain/model/skybox KTX texture baking	2017-05-12 12:26:33 -07:00
Ken Cooke	807a6d5831	Bugfix: new threading changes in the Qt5.7.1 plugin were causing deadlock	2017-05-08 18:03:50 -07:00
Ken Cooke	746ae6dfd3	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-wasapi-qt562	2017-05-08 17:56:19 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Ken Cooke	9e77771c99	Update WASAPI audio plugin for Qt5.6.2	2017-04-28 12:00:01 -07:00
Stephen Birarda	4863c924d1	don't link or include missing FBX library	2017-04-26 18:37:36 -07:00
Stephen Birarda	6519a9c45b	bump FBX SDK version back to 2017	2017-04-26 18:37:35 -07:00
Stephen Birarda	32c348eb3d	use SDK 2017 with new texture discovery strategy	2017-04-26 18:37:34 -07:00
Stephen Birarda	b04d507090	use correct FBX_VERSION for WIN32	2017-04-26 18:37:34 -07:00
Stephen Birarda	a586a31a93	stub the oven tool and add a find module for FBX SDK	2017-04-26 18:37:34 -07:00
Stephen Birarda	e3ab2615c1	allow NVTT to be built as external on android	2017-04-25 15:56:23 -07:00
Stephen Birarda	7968045626	update md5 for patched external nvtt	2017-04-25 15:56:23 -07:00
Stephen Birarda	11fa2797b7	force the release DLL path for NVTT on windows	2017-04-25 15:56:23 -07:00
Stephen Birarda	202e933d8b	don't build, install, or configure nvtt on windows	2017-04-25 15:56:23 -07:00
Stephen Birarda	06b3b3d5f4	ad missing include dir for NVTT on win	2017-04-25 15:56:23 -07:00
Stephen Birarda	d72e5e5b24	add handling for install_name_tool calls on OS X	2017-04-25 15:56:23 -07:00
Stephen Birarda	3a217f75f4	force release for NVTT on Win32	2017-04-25 15:56:23 -07:00
Stephen Birarda	5c12180b58	use pre-built NVTT on windows	2017-04-25 15:56:23 -07:00
Stephen Birarda	27c6011e6e	change nvtt external to ignore release type	2017-04-25 15:56:23 -07:00
Stephen Birarda	ee62e7dcb8	update nvtt external to build from source	2017-04-25 15:56:22 -07:00
Atlante45	94e1cbbc95	Upload nvtt archive to S3	2017-04-25 15:56:22 -07:00
Atlante45	0428b22b63	Add nvtt external	2017-04-25 15:56:22 -07:00
Stephen Birarda	b57bf956e2	make server plugins a dependency of AC too	2017-04-10 11:23:43 -07:00
Anthony J. Thibault	42262aac78	OpenVR: upgrade to version 1.0.6, for better generic tracker support	2017-04-05 18:41:43 -07:00
Brad Hefta-Gaub	692dc75977	Merge pull request #10025 from ZappoMan/improvedKinectCmake ... add the default environment variable name for the kinect plugin to the search hints	2017-03-28 15:07:56 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
Andrew Meadows	e22d825d07	Merge pull request #9989 from birarda/bullet-rel-with-debug ... fix fresh MinSizeRel and RelWithDebugInfo builds	2017-03-28 12:35:24 -07:00
ZappoMan	876dd4c850	add the default environment variable name for the kinect plugin to the search hints	2017-03-27 15:02:00 -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
Stephen Birarda	a798773425	fix polyvox location for MinSizeRel	2017-03-23 17:31:02 -07:00
Stephen Birarda	85dc63a671	fix multi-line strings in VHACD and faceshift externals	2017-03-23 17:26:32 -07:00
Stephen Birarda	22c7d4032b	fix debug config handling of release faceshift lib	2017-03-23 17:13:19 -07:00
Stephen Birarda	6d38b1fe72	handle MinSizeRel configuration in vhacd external	2017-03-23 17:11:30 -07:00
Stephen Birarda	0367f70a39	interpolate CONFIG for polyvox library path	2017-03-23 17:07:51 -07:00
Stephen Birarda	ee521ed369	handle library release path for faceshift MinSizeRel build	2017-03-23 17:06:22 -07:00
Stephen Birarda	5311de1f7b	handle MinSizeRel library discovery for bullet external	2017-03-23 17:05:08 -07:00
Stephen Birarda	e100a7bedb	point VHACD external to correct library for RelWithDebugInfo	2017-03-23 16:54:21 -07:00
Stephen Birarda	670f51af0b	fix reference to RelWithDebugInfo library for polyvox	2017-03-23 16:50:03 -07:00
Stephen Birarda	be34e5a814	fix RelWithDebInfo path for faceshift	2017-03-23 16:46:52 -07:00
Stephen Birarda	654ae5032b	simplify the RelWithDebInfo check in bullet ext	2017-03-23 16:11:48 -07:00
Stephen Birarda	b023cb71be	when building RelWithDebInfo check for correct bullet libs	2017-03-23 16:02:39 -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
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -08:00
Brad Davis	f9dcfa54aa	Add debug/release builds to oculus lib	2017-03-06 16:08:21 -08:00
Bradley Austin Davis	c892d8a81a	Update Oculus SDK to 1.11	2017-03-03 10:41:47 -08:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
Ken Cooke	ab0d5ec178	Fix for memory-leak in Windows audio stack (audiodg.exe grows without bound)	2017-01-30 11:59:30 -08:00
Brad Hefta-Gaub	e4c59472ee	Merge pull request #9468 from kencooke/audio-mixformat-float ... Fix another audio failure	2017-01-23 16:52:54 -08:00
Zach Pomerantz	daf507fc81	revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX	2017-01-23 13:02:15 -05:00
Ken Cooke	4d6eea9a63	Updated WASAPI plugins to force dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT	2017-01-20 16:40:32 -08:00
Stephen Birarda	d0236af334	use select_library_configurations for LibOVRPlatform	2017-01-05 11:20:44 -08:00
Stephen Birarda	1a50a11741	have FindLibOVRPlatform produce LIBOVRPLATFORM_LIBRARY	2017-01-05 11:20:44 -08:00
Stephen Birarda	ac7637f8ff	use _LIBRARY_RELEASE for LibOVRPlatform external	2017-01-05 11:20:44 -08:00
Stephen Birarda	4278d7b20d	download and link oculus platform for oculus plugin	2017-01-05 11:20:44 -08:00
Zach Pomerantz	0bb82d2b73	use libquazip5.so in debug	2016-12-28 16:06:32 -05:00
Seth Alves	26639aac15	Merge pull request #8789 from Atlante45/fix/settings ... Use JSON for application Settings	2016-12-15 07:00:46 -08: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	1b047d6901	fix cmake snafu	2016-12-12 11:39:10 -08:00
Brad Hefta-Gaub	4959a88581	first cut at kinect input plugin	2016-12-08 22:13:56 -08:00
Atlante45	5f2c77928a	Restore "Updated the Qt audio plugins"" ... This reverts commit f7e8d47426.	2016-12-08 14:14:48 -08:00
Clément Brisset	06331494af	Revert "Revert "Select Audio DLL at runtime""	2016-12-08 14:14:03 -08:00
Ken Cooke	b888ce890c	Updated the Qt audio plugins	2016-12-03 07:26:55 -08:00
Atlante45	e6b9d3604d	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-12-01 09:45:50 -08:00
Atlante45	db263df03e	Select Audio DLL at runtime	2016-11-29 19:42:59 -08:00
Atlante45	3035d43772	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
Zach Fox	2c0cfdf241	Fix build for real?	2016-11-18 14:39:30 -08:00
Zach Fox	5e8afb04c7	Potentially fix OSX and Linux build errors?	2016-11-18 14:39:30 -08:00
Zach Fox	fc21cae904	More stable than ever! Uses external GifCreator lib. Still frame timing issues.	2016-11-18 14:39:29 -08:00
Chris Collins	c81b0fc018	Merge pull request #9091 from kencooke/audio-multichannel ... Multichannel audio support	2016-11-18 13:32:59 -08:00
Atlante45	2f2da8ccd3	Do not read launchClientNowState if client disabled	2016-11-16 13:15:10 -08:00
Atlante45	9e0230980b	Enable Server Only install	2016-11-16 10:52:30 -08:00
Atlante45	d7d54dd82f	Only launch interface if selected	2016-11-16 10:44:59 -08:00
Ken Cooke	171cb14087	New WASAPI Qt plugins that implement multichannel formats using WAVEFORMATEXTENSIBLE. ... QAudioInput, QAudioOutput, and IsFormatSupported() now support channels > 2. dwChannelMapping is always set to 0xffffffff (1:1 passthru).	2016-11-16 10:38:51 -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
Ryan Huffman	3d160cca75	Merge pull request #8969 from huffman/feat/task-manager-app-name ... Add "High Fidelity" to sandbox and interface description in Windows Task Manager	2016-11-02 14:21:19 -07:00
Atlante45	46102d93c6	Launch interface on install after content loading	2016-11-01 18:15:27 -07:00
Ryan Huffman	5f8cee787f	Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename	2016-11-01 09:07:56 -07:00
Ryan Huffman	ea31a8e3b4	Add VersionInfo.rc.in	2016-11-01 08:59:56 -07:00
Seth Alves	4d55bc1b32	adjust build arguments used with asan on Linux	2016-10-27 10:09:29 -07:00
Brad Hefta-Gaub	03946748bc	Merge pull request #8928 from hyperlogic/bug-fix/more-openvr-crash-fixes ... Fix for crash in openvr on startup	2016-10-26 22:45:33 -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
Brad Davis	f4f1b04cf0	Use OpenVR to determine if async reprojection is enabled	2016-10-26 16:02:06 -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
Atlante45	36bd9ef4e6	Update new ACClientApp code	2016-10-12 14:02:05 -07:00
Atlante45	eaca3b672f	Switch to JSON for application settings	2016-10-12 10:20:19 -07:00
Chris Collins	328ac71f8b	Merge pull request #8739 from kencooke/audio-fixes3 ... Fix 16khz support and hot-unplugging audio devices	2016-10-06 09:46:51 -07:00
Ken Cooke	d6aa74c22d	Fix 16khz support and hot-unplugging audio devices	2016-10-05 11:49:09 -07:00
Brad Hefta-Gaub	6f86ce8d3b	Merge pull request #8683 from jherico/oglplus_b_gone2 ... Remove all usage of oglplus	2016-10-05 09:59:42 -07:00
Ken Cooke	6838dc0247	Inverted the CMAKE logic, to make the version comparison more clear	2016-10-04 09:01:43 -07:00
Ken Cooke	40393bd8ef	remove Installer debugging code	2016-10-03 22:31:43 -07:00
Ken Cooke	541f7ebb05	Select the correct plugin in the Installer, based on Windows version	2016-10-03 21:46:55 -07:00
Ken Cooke	eb5b03d008	Don't pre-delete qtaudio_windows.dll in Installer	2016-10-03 20:52:24 -07:00
Ken Cooke	372b631448	Post-build command to use qtaudio_windows.dll for Win7, qtaudio_wasapi.dll for Win8/10, or include both for Installer	2016-10-03 19:59:27 -07:00
Brad Davis	9bc0f24777	Fix GLEW linker warnings	2016-10-02 12:22:00 -07:00
Brad Davis	488d191428	Remove all oglplus usage and references	2016-10-02 11:44:34 -07:00
Ken Cooke	d925a22fd4	Use new filename for the external as a simple form of versioning	2016-09-29 14:09:38 -07:00
Ken Cooke	f42c0dbd7c	Fix cmake checksum, for updated qtaudio_wasapi.zip with release and debug plugins	2016-09-29 13:01:15 -07:00
Ken Cooke	468281f92d	Fix the Debug build of Interface on Windows	2016-09-29 06:58:14 -07:00
Brad Davis	49a91e3a04	Update Oculus SDK	2016-09-22 11:31:50 -07:00
Chris Collins	1c4fcb5112	Merge pull request #8620 from ZappoMan/detectMasterOrStable ... add basic support for master vs stable builds	2016-09-19 15:08:40 -07:00
Brad Hefta-Gaub	fd474f6319	add basic support for master vs stable builds	2016-09-19 14:14:32 -07:00
Marko Kudjerski	6ccf86e3e9	remove qtaudio_windows.dll on Windows before installing the new version	2016-09-13 11:10:36 -07:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07:00
Ken Cooke	9457d49103	Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio	2016-09-06 20:56:20 -07:00
Marko Kudjerski	da5f7912b5	fixed Info.plist setup for Components.app	2016-09-06 17:40:47 -07:00
SamGondelman	62edaf0ec9	commit for marko to look at later	2016-09-06 17:40:46 -07:00
Marko Kudjerski	930afad49c	comment fix	2016-09-06 17:40:45 -07:00
Marko Kudjerski	b8da976123	added Info.plist to Components.app so that macdeployqt from Qt 5.6 doesn't throw a segfault	2016-09-06 17:40:45 -07:00
SamGondelman	7f2476f0f8	put pack macdeployqt call, but still removed qtwebprocess	2016-09-06 17:36:58 -07:00
SamGondelman	2db02fdde1	remove QtWebProcess hack on OSX	2016-09-06 17:36:56 -07:00
Brad Hefta-Gaub	df9ac9fd6e	Merge pull request #8519 from birarda/installer-fixes ... add removal of resources folder before install	2016-09-02 09:06:20 -07:00
Stephen Birarda	8977f9ed92	fix else condition in hifiAudioCodec	2016-09-01 10:57:30 -07:00
Stephen Birarda	47f15f6ad8	use libc++ and clang toolchain	2016-08-31 16:16:40 -07:00
Stephen Birarda	aea60692de	update to latest android.toolchain.cmake	2016-08-31 15:39:46 -07:00
Stephen Birarda	d113105315	clarify SCRIBE_PATH error message	2016-08-31 14:08:59 -07:00
Stephen Birarda	fc8fad0753	check SCRIBE_PATH for scribe, add instructions	2016-08-31 13:56:02 -07:00
Stephen Birarda	f67f53a4fa	remove the mtc tool that is no longer used	2016-08-31 13:24:21 -07:00
Stephen Birarda	b56a596c29	put android build output in target folder	2016-08-31 13:23:19 -07:00
Stephen Birarda	c9e18e8d90	spacing repairs in autoscribe_shader_lib	2016-08-31 11:59:51 -07:00
Stephen Birarda	62504d457b	put the apk and apk-build folders in root of build	2016-08-31 11:50:39 -07:00
Stephen Birarda	3f1545008d	don't target any plugins for android	2016-08-31 11:19:01 -07:00
Stephen Birarda	7c2fea4598	remove glew/oglplus requirement for android interface	2016-08-31 11:03:53 -07:00
Stephen Birarda	f1ed7a2e78	initial changes needed for android interface cmake	2016-08-31 10:53:29 -07:00
Stephen Birarda	a8272712bb	move forced client selection to apply to all installs	2016-08-29 15:40:45 -07:00
Ken Cooke	678ea3ecbf	PR feedback	2016-08-29 13:22:48 -07:00
Stephen Birarda	20777bd19a	force default selection of client on install	2016-08-29 13:13:35 -07:00
Stephen Birarda	87ecc65dce	set component requirement in cpack add componeent command	2016-08-29 13:13:35 -07:00
Stephen Birarda	fab2568624	always remove the resources dir, make client required	2016-08-29 13:13:35 -07:00
Stephen Birarda	0e4fb51d09	force cleanup section to be first	2016-08-29 13:13:35 -07:00
Stephen Birarda	c4ec02c4bf	add removal of resources folder during install process	2016-08-29 13:13:35 -07:00
Ken Cooke	28a99a7a03	Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio	2016-08-29 12:38:17 -07:00
Ken Cooke	996bf0d763	Replace the Qt multimedia audio back-end on the Windows build. ... Adds an external project (wasapi) to download a low-latency audio plugin for Qt, as a precompiled DLL. Adds a post-build command to use this new plugin instead of the default Qt audio plugin.	2016-08-28 20:12:59 -07:00
elisa-lj11	4c434e875e	fixed merge conflicts in Application.cpp	2016-08-19 09:46:22 -07:00
Brad Davis	adcfd55cc0	Batch replay reprojection	2016-08-12 22:28:23 -07:00
elisa-lj11	c009834685	Fixes for linux build of quazip	2016-08-05 17:36:27 -07:00
elisa-lj11	cd7706e80b	Release now has quazip features	2016-08-04 17:01:19 -07:00
elisa-lj11	9833ba1987	No errors upon build	2016-08-04 16:51:14 -07:00
elisa-lj11	212e4f9cca	making quazip work	2016-08-04 16:48:14 -07:00
elisa-lj11	87cbb79d67	fixing up quazip	2016-08-04 16:46:56 -07:00
elisa-lj11	c9c965b1e8	added new files for quazip	2016-08-04 16:46:56 -07:00
SamGondelman	676f4bdfcf	misc fixes from particles branch	2016-07-29 15:36:32 -07:00
Seth Alves	5485b3ee13	when cmake is told SERVER_ONLY, still build server-side plugins	2016-07-20 11:34:44 -07:00
Leonardo Murillo	ce67d57279	Removing Debugs	2016-07-15 13:03:40 -06:00
Leonardo Murillo	b0c27a53e2	Linking to Linux only SDK	2016-07-15 13:01:21 -06:00
Leonardo Murillo	53d524eb2f	Checkpoint	2016-07-15 12:04:45 -06:00
Leonardo Murillo	f0db7b9d39	Checkpoint	2016-07-15 11:42:30 -06:00
Brad Hefta-Gaub	c2fd055f0f	more hacking	2016-07-14 08:20:07 -07:00
Brad Hefta-Gaub	b6ffabf500	attempt to get mac sandbox plugins to work	2016-07-13 14:58:27 -07:00
Brad Hefta-Gaub	2b719e12f7	attempt to make mac server plugins work	2016-07-12 10:54:45 -07:00
Brad Hefta-Gaub	3ddac73718	add mac lib to the external project	2016-07-11 18:24:22 -07:00
Brad Hefta-Gaub	f3f72f3c93	Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins	2016-07-11 13:15:27 -07:00
Brad Hefta-Gaub	f5b693cebb	added support for external hificodec and hifi codec plugin	2016-07-11 12:22:27 -07:00
Brad Davis	790f74da1d	Support geometry shaders	2016-07-07 13:36:47 -07:00
Brad Hefta-Gaub	38f0cd218b	make client server plugins properly copy into plugins directory	2016-07-07 10:31:12 -07:00
Marko Kudjerski	17ce80ed69	sign executables with SHA256	2016-06-24 19:28:31 -07:00
SamGondelman	645ae3c21e	remove tabs	2016-06-22 17:02:02 -07:00
SamGondelman	a9ed0b1c83	completely destroyed sixense on macs	2016-06-22 16:56:50 -07:00
Atlante45	89c50ab3df	Update neuron archive in cmakelists	2016-06-21 17:23:08 -07:00
Atlante45	925375fb7a	Move steamworks archive zip to dependencies	2016-06-14 16:29:50 -07:00
Atlante45	1a8d6ea614	Make steamworks an external dependency	2016-06-14 16:29:50 -07:00
Atlante45	96258a795a	Initial Steamworks integration	2016-06-14 16:29:50 -07:00
Ken Cooke	b60b9bb312	compiler fixes for GCC/clang	2016-06-06 14:54:15 -07:00
Brad Davis	3cc08cdcfc	Breaking up GL agnostic code from 4.1 specific code	2016-05-18 14:35:53 -07:00
Stephen Birarda	9fe9100cac	change produced installer names to beta	2016-04-27 15:57:32 -07:00
Brad Hefta-Gaub	c410242fb2	Merge pull request #7688 from jherico/texture_derez ... Reducing GPU texture memory footprint	2016-04-22 13:20:54 -07:00
Stephen Birarda	bc706191df	add_definitions from cmake for each release type	2016-04-21 17:28:11 -07:00
Brad Davis	6c30194916	Support lowering the minimum mip of a texture at runtime	2016-04-21 14:46:12 -07:00
Brad Davis	5007c9bd4c	Update glew version	2016-04-21 14:46:09 -07:00
Ryan Huffman	37469f16c8	Fix string interpolation in installer	2016-04-18 10:31:12 -07:00
Ryan Huffman	a4b7e54e4d	Update installer to use variables for display names	2016-04-18 10:16:06 -07:00
Ryan Huffman	f72a760151	Fix application names in installer prompt	2016-04-18 09:54:39 -07:00
Stephen Birarda	7e02b30227	rename .app on OS X to Interface	2016-04-14 13:01:47 -07:00
James B. Pollack	30c8a44411	Merge remote-tracking branch 'upstream/master' into homereset	2016-04-01 08:02:19 -07:00
James B. Pollack	140bb75542	lots	2016-03-31 09:21:08 -07:00
Brad Hefta-Gaub	f0cc8c0dd3	Merge pull request #7491 from jherico/oculus_release ... Update to latest Oculus SDK, add input device support	2016-03-30 17:42:32 -07:00
Stephen Birarda	f29647b519	use HF shortcuts for setup options	2016-03-30 13:56:57 -07:00
Stephen Birarda	7d042fc47d	keep server-console as sandbox folder in Program Files	2016-03-30 13:54:55 -07:00
Stephen Birarda	0a8072164d	be less redundant in prompt for running applications	2016-03-30 13:44:16 -07:00
Stephen Birarda	8be3931bbf	repair shortcut name for desktop interface	2016-03-30 13:20:31 -07:00
Stephen Birarda	02d93e2a11	cleanup fixes for old shortcuts in NSIS script	2016-03-30 13:09:36 -07:00
Stephen Birarda	bd3d08db3b	prepend Interface with High Fidelity in setup options	2016-03-30 13:00:23 -07:00
Stephen Birarda	a200e56f92	remove old startup menu item for Server Console	2016-03-30 12:52:11 -07:00
Stephen Birarda	05163367e1	delete old start menu items from before rename	2016-03-30 12:49:55 -07:00
Stephen Birarda	4940639e11	clear old desktop shortcuts from before rename	2016-03-30 12:48:11 -07:00
Stephen Birarda	2d1c4243f5	prepend desktop shortcuts with High Fidelity	2016-03-30 12:47:18 -07:00
Stephen Birarda	2ea0309955	change setup options and prompts to close running applications	2016-03-30 12:08:56 -07:00
Stephen Birarda	724c95fbd6	leave executable name for server-console	2016-03-30 12:05:17 -07:00
Stephen Birarda	6bdedeb5ce	change packaging parameters for Sandbox/Interface	2016-03-30 11:59:49 -07:00
Brad Davis	d056c41e25	Update to latest Oculus SDK, add input device support	2016-03-30 10:40:28 -07:00
Anthony J. Thibault	0d37515784	Merge branch 'master' into tony/vive-rendering-work	2016-03-23 15:59:59 -07:00
Brad Davis	2fdb92e8cd	Move oglplus dependency from sourceforge to s3	2016-03-22 22:19:10 -07:00
Anthony Thibault	63d6f888e6	Update openvr sdk to 0.9.19	2016-03-21 17:31:13 -07:00
Stephen Birarda	a9dd88d834	Merge pull request #7320 from zzmp/feat/shader-includes ... Compile shaders into separate dir for inclusion	2016-03-10 21:07:49 -08:00
Zach Pomerantz	243fbf8299	Specify and create shaders folder	2016-03-10 20:49:33 -08:00
Zach Pomerantz	11867aa71d	Compile shaders to their own folders	2016-03-10 20:10:54 -08:00
Stephen Birarda	0c45ed038c	attempt rename to change casing of Raleway font	2016-03-09 12:58:23 -08:00
Stephen Birarda	bdc2ac73f6	manually remove Raleway font that has incorrect casing	2016-03-09 12:30:09 -08:00
Stephen Birarda	3750d5d780	manually install OpenSSL DLLs for Qt	2016-03-03 17:57:34 -08:00
Stephen Birarda	72cbfe2dc7	add a comment for static libraries specifically	2016-03-01 13:04:37 -08:00
Stephen Birarda	248aa58d23	force statically linked OpenSSL on windows	2016-03-01 13:04:37 -08:00
Stephen Birarda	9f377a5ad5	separate reading of post install options from handling	2016-02-25 12:53:28 -08:00
Stephen Birarda	c1776e7f55	move button text changes out of onInit	2016-02-25 10:22:42 -08:00
Stephen Birarda	2d0d73116a	call handling of post install options once install complete	2016-02-25 10:20:07 -08:00
Stephen Birarda	30b1341dbb	change the close button text to finish	2016-02-25 10:15:59 -08:00
Stephen Birarda	c01ba7714c	title changes for setup options	2016-02-25 10:11:47 -08:00
Stephen Birarda	a44c34dd0b	change buttons in post install options for new placement	2016-02-25 10:02:12 -08:00
Stephen Birarda	2a2760b708	put the post install options before the actual install	2016-02-25 09:43:02 -08:00
Stephen Birarda	62e842bf2b	Merge pull request #7052 from huffman/bugsplat ... BugSplat integration	2016-02-11 10:10:44 -08:00
Ryan Huffman	71b72aceb8	Fix CHECKED_FOR_BUGSPLAT_ONCE	2016-02-11 09:46:12 -08:00
Ryan Huffman	813d5e5ba0	Add headers and proper bugsplat checking to cmake files	2016-02-11 08:17:05 -08:00
Anthony J. Thibault	b9a16cec25	Re-enable OpenVR plugin ... * Enabled preview window * rendering is only mono for some-reason.	2016-02-09 18:49:18 -08:00
Ryan Huffman	20cf7c0099	Clean up BugSplat cmake	2016-02-09 11:45:32 -08:00
Ryan Huffman	b1684eba9c	Add BugSplat cmake files	2016-02-09 10:48:16 -08:00
Ken Cooke	04798a45fc	Remove redundant patterns from CMake GLOB	2016-02-08 14:47:43 -08:00
Ken Cooke	08e299f724	CMAKE changes to support AVX instructions. Source files in src/avx are compiled with AVX enabled (VEX encoding) and require runtime dispatch to avoid crashing a machine without AVX hardware.	2016-02-06 10:53:56 -08:00
Brad Hefta-Gaub	5ea4cb6900	Merge pull request #6949 from birarda/installer-sixense ... pull missing Sixense DLLs from external project	2016-01-27 12:17:59 -08:00
Stephen Birarda	8ba0e3bc6e	give dev shortcuts a specific name too	2016-01-26 16:21:18 -08:00
Stephen Birarda	e6a8fd192c	use the VS2011 DLLs bundled with sixense for installer	2016-01-26 15:54:08 -08:00
Stephen Birarda	0a413904a0	use non PR-specific names for close prompt	2016-01-26 12:09:45 -08:00
Stephen Birarda	6daeefef68	remove the correct startup shortcut during uninstall	2016-01-26 12:08:26 -08:00
Stephen Birarda	4115d52d91	default shortcut options off for PR builds	2016-01-26 11:46:37 -08:00
Stephen Birarda	068de5203c	use specific shortcut names for PR builds	2016-01-26 11:40:50 -08:00
Stephen Birarda	79a2b7f213	make sure shell var context is correct for AppData	2016-01-26 11:17:54 -08:00
Stephen Birarda	e4110ea401	install for all users, EXCEPT the startup menu item	2016-01-25 17:22:39 -08:00
Stephen Birarda	f4ece26271	use install dir written to registry as potential default	2016-01-25 16:20:44 -08:00
Stephen Birarda	57f9d82efa	remove shortcuts from custom start menu location	2016-01-25 16:13:39 -08:00
Stephen Birarda	c7228ce020	ensure current user context for uninstaller	2016-01-25 15:59:17 -08:00
Stephen Birarda	9d4b529223	remove any old admin desktop/sm shortcuts	2016-01-25 15:57:42 -08:00
Stephen Birarda	eabafa800c	clarify application close behaviour	2016-01-25 15:51:47 -08:00
Stephen Birarda	aeb097664e	remove InstallOptionsPage from list of pages	2016-01-25 15:38:57 -08:00
Stephen Birarda	150a8d388c	allow user to close running exec and continue	2016-01-25 15:37:11 -08:00
Stephen Birarda	aa2d19a611	remove two unused utility functions	2016-01-25 15:32:23 -08:00
Stephen Birarda	f393c5eeda	remove CMake templated code for path changes	2016-01-25 15:28:44 -08:00
Stephen Birarda	6934594bb9	always use current context, ignore CPack InstallOptions	2016-01-25 15:20:51 -08:00
Stephen Birarda	83827b6d24	add startup shortcut in current users context	2016-01-25 14:57:39 -08:00
Stephen Birarda	85729ce4b6	fix for double slashes in desktop shortcut and startup shortcut	2016-01-25 11:30:18 -08:00
Leonardo Murillo	c812798314	Merge pull request #6913 from birarda/fixup-and-macdeploy ... fix reference to components install path on OS X	2016-01-22 19:35:25 -06:00
Stephen Birarda	78609ed634	fix reference to components install path on OS X	2016-01-22 17:07:05 -08:00
Stephen Birarda	95f9f7e6d6	remove old installer files while running new install	2016-01-22 16:51:52 -08:00
Stephen Birarda	801cbf3fac	make sure CONSOLE_INSTALL_APP_PATH is defined before use	2016-01-22 15:59:39 -08:00
Stephen Birarda	4e76f3ccc4	use RMDir for removal of old SC dirs	2016-01-22 15:55:58 -08:00
Stephen Birarda	6951f1aed7	tweak server console deletion requirements	2016-01-22 15:55:58 -08:00
Stephen Birarda	da1902ac72	use CMake InstallRequiredSystemLibraries for MSVC	2016-01-22 15:55:58 -08:00
Stephen Birarda	921d4dccd7	remove anything previously installed by old server-console	2016-01-22 15:55:58 -08:00
Stephen Birarda	971603bd57	make shortcuts to server-console point to right place	2016-01-22 15:55:58 -08:00
Stephen Birarda	53eee27086	use incredibly dumb win path to 64-bit dlls	2016-01-22 15:55:58 -08:00
Stephen Birarda	47a630f0ad	manually install msvc DLLs with Interface/DS/AC	2016-01-22 15:55:58 -08:00
Stephen Birarda	5743c8046c	install the server-console in a subdir on win32	2016-01-22 15:55:58 -08:00
Stephen Birarda	b099376193	fix a typo in message for macdeployqt	2016-01-22 14:47:25 -08:00
Stephen Birarda	e00481ddfb	use macdeployqt for fixup of components	2016-01-21 17:17:28 -08:00
Stephen Birarda	0d47e812c8	fix typo in NSIS variable	2016-01-20 18:20:13 -08:00
Stephen Birarda	6daa34f164	fix component variable in NSIS template	2016-01-20 18:11:22 -08:00
Stephen Birarda	13d6ec0b28	make the post install options read correct	2016-01-20 16:54:31 -08:00
Stephen Birarda	5f21b1f35c	cpack properties file must be setup after variables	2016-01-20 12:10:37 -08:00
Stephen Birarda	391313532a	remove hash from PR org name	2016-01-20 10:46:54 -08:00
Stephen Birarda	57639672cf	repairs to path finding and naming on OS X	2016-01-20 10:46:54 -08:00
Stephen Birarda	d1421137e5	add a folder with icon for DMG installer	2016-01-20 10:46:54 -08:00
Stephen Birarda	974a899328	clean unused vars and spacing	2016-01-19 16:04:42 -08:00
Stephen Birarda	4feb79cff4	fix message for no code signing on production	2016-01-19 16:04:42 -08:00
Stephen Birarda	8c400f1c5f	shorten up GenerateInstallers macro	2016-01-19 16:04:42 -08:00
Stephen Birarda	3e013833c8	fix redundant app display name in alert	2016-01-19 13:28:30 -08:00
Stephen Birarda	56f6ef434d	remove define of UniqueID	2016-01-19 13:16:55 -08:00
Stephen Birarda	a69b2fabd3	don't prompt to attempt process close	2016-01-19 13:13:43 -08:00
Stephen Birarda	e8525e4886	cleanup messages, clear errors before copy	2016-01-19 09:58:07 -08:00
Stephen Birarda	be6606cefd	fix for error check during PR copy	2016-01-19 09:49:13 -08:00
Stephen Birarda	7b1fc8d65c	repair call to strcpy for dir variable	2016-01-19 09:45:26 -08:00
Stephen Birarda	04a5dbed7d	set shell context to user prior to app data copy	2016-01-19 09:42:00 -08:00
Stephen Birarda	42a6f9daa1	hard code the matching app data path	2016-01-19 09:33:06 -08:00
Stephen Birarda	6ee0258251	add an error message for app data create	2016-01-19 08:57:33 -08:00
Stephen Birarda	d7c5036a42	fix release type check for prod copy	2016-01-18 18:26:15 -08:00
Stephen Birarda	1deaebd544	check the copy box by default	2016-01-18 18:25:02 -08:00
Stephen Birarda	2094a75294	use correct var from packaging properties for copy	2016-01-18 18:18:06 -08:00
Stephen Birarda	5e6910edbb	complete copy of production settings to PR	2016-01-18 18:14:48 -08:00
Stephen Birarda	fb5d26b282	add PR_BUILD to shared CPack properties	2016-01-18 18:02:27 -08:00
Stephen Birarda	7c3d8be80f	change wording to pr post install option	2016-01-18 17:59:14 -08:00
Stephen Birarda	21a0d7cd4b	add checkbox to post install options for PR copy	2016-01-18 17:58:27 -08:00
Stephen Birarda	03f2b5ec64	repair nsProcess unload macro call for uninstaller	2016-01-18 17:12:16 -08:00
Stephen Birarda	31805be6af	undefine the UniqueID label helper in macro	2016-01-18 17:06:31 -08:00
Stephen Birarda	84c2387c02	repairs for usage of MessageBox	2016-01-18 17:03:46 -08:00
Stephen Birarda	51c476f521	make message box for closing app multiline	2016-01-18 16:59:28 -08:00
Stephen Birarda	9b20d07886	prompt for closure of running applications	2016-01-18 16:54:09 -08:00
Stephen Birarda	7d8fc6f702	check for running apps during install	2016-01-18 16:26:53 -08:00
Stephen Birarda	96c3adaa19	use nsProcess to check if process is running	2016-01-18 16:17:48 -08:00
Stephen Birarda	e2ee3da9d1	fix comparison for FindProc call	2016-01-18 16:00:37 -08:00
Stephen Birarda	8e9b7bc37b	use variable for console display name	2016-01-18 15:56:44 -08:00
Stephen Birarda	c924be57fc	use FindProcDLL plug-in to check if running	2016-01-18 15:54:50 -08:00
Stephen Birarda	4fb5a142f7	check during uninstall for running applications	2016-01-18 15:50:44 -08:00
Stephen Birarda	a83c3a3385	write to registry when sections not selected	2016-01-18 15:23:51 -08:00
Stephen Birarda	b7998935b0	install a json file with build info beside console	2016-01-18 14:56:06 -08:00
Stephen Birarda	2311627599	set installer to be DPI aware	2016-01-18 14:20:33 -08:00
Stephen Birarda	83120594f5	make installer icon lowercase	2016-01-18 14:12:41 -08:00
Stephen Birarda	552b2d2bdc	add an installer ico with more sizes	2016-01-18 13:32:57 -08:00
Stephen Birarda	81426c05f4	add WinVer header for nsis dpi tests	2016-01-18 12:08:43 -08:00
Stephen Birarda	da1a72ed19	manually set installer/uninstaller dpi aware	2016-01-18 11:59:16 -08:00
Stephen Birarda	66a15e8f82	make the installer DPI aware	2016-01-18 11:49:56 -08:00
Stephen Birarda	88604a0110	make sure ADD_REMOVE_ICON_NAME set for nsis	2016-01-18 10:57:45 -08:00
Stephen Birarda	7d4a7983ed	update the installer icon and header	2016-01-18 10:38:38 -08:00
Stephen Birarda	ba6c4d90df	install the ssleay32 dll, not lib	2016-01-18 10:34:42 -08:00
Stephen Birarda	d4597f9e8b	Revert "comment out manual ssleay copying" ... This reverts commit 0355e816b0.	2016-01-18 10:11:36 -08:00
Stephen Birarda	0355e816b0	comment out manual ssleay copying	2016-01-15 16:02:24 -08:00
Stephen Birarda	6e8b54bc65	remove the branding tag in installer	2016-01-15 15:41:34 -08:00
Stephen Birarda	0876da7a7d	call manual install of ssleay from console install	2016-01-15 15:41:34 -08:00
Stephen Birarda	cf5b6198fd	use install command to manually place ssleay library	2016-01-15 15:41:34 -08:00
Stephen Birarda	29b5076da4	set a variable in template to boolean	2016-01-15 15:41:34 -08:00
Stephen Birarda	05e48528bd	make sure SSL_EAY_LIBRARY_* is set when used	2016-01-15 15:41:34 -08:00
Stephen Birarda	bb9f7856f4	use cmake generator expression to fixup correct ssleay	2016-01-15 15:41:34 -08:00
Stephen Birarda	e19b61bcbf	fixup the only used ssleay library	2016-01-15 15:41:34 -08:00