Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 17:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
48308 commits 71 branches 56 tags 1.2 GiB
Commit graph

1258 commits

Author SHA1 Message Date
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
Stephen Birarda
c1a9a7f4c1 add ssleay copy for win AC/DS/Interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
e474a60971 include InstallOptions for MUI2 2016-01-15 15:41:34 -08:00
Stephen Birarda
ccf459454d fix install options setup for MUI2 2016-01-15 15:41:34 -08:00
Stephen Birarda
34da13c148 test of next version of nsis modern ui 2016-01-15 15:41:34 -08:00
Stephen Birarda
59b4c2545f remove DDE as component of installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
5730772f6b disable install button with neither component selected 2016-01-15 15:41:34 -08:00
Stephen Birarda
0098fe27df don't uninstall a previously installed section from the installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
124e0fb61f remove the add/remove icon during uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
0533438b8f use backslashes in add remove icon path 2016-01-15 15:41:34 -08:00
Stephen Birarda
95acd2cfc3 drop in add remove icon during core install 2016-01-15 15:41:34 -08:00
Stephen Birarda
d57bd887b1 install the add/remove icon 2016-01-15 15:41:34 -08:00
Stephen Birarda
fc65053eb5 add an icon for item in add/remove 2016-01-15 15:41:34 -08:00
Stephen Birarda
9ce0f6a0b1 add a header image for uninstaller 2016-01-15 15:41:34 -08:00
Stephen Birarda
92c221620c use backslashes for header image path on win 2016-01-15 15:41:34 -08:00
Stephen Birarda
d34c3bdc1c add custom header image for installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
537f8deeec update to new license in root and installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
81493f9b4e only sign production build executables 2016-01-15 15:41:34 -08:00
Stephen Birarda
99ad79d833 add an icon for nsis installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
c0c627a226 explicitly set install directory to match display name 2016-01-15 15:41:34 -08:00
Stephen Birarda
aa9319001e use BUILD_ORGANIZATION for installer display name 2016-01-15 15:41:34 -08:00
Stephen Birarda
7d2684f01e use alpha for packaged installer name 2016-01-15 15:41:34 -08:00
Stephen Birarda
0a15f0400c fix env variable referencing in SetPackagingParameters 2016-01-15 15:41:34 -08:00
Stephen Birarda
ffd79a5df4 pretty up the packaged installer name 2016-01-15 15:41:34 -08:00
Stephen Birarda
926b75782f use build version for cpack package version 2016-01-15 15:41:34 -08:00
Stephen Birarda
3e9f124209 update packaging parameters for suggested jenkins setup 2016-01-15 15:41:34 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Stephen Birarda
e9ce0318a2 add the custom installer license 2016-01-15 15:41:34 -08:00
Stephen Birarda
69ceb9fa98 use string comparison for cleaner registry checking 2016-01-15 15:41:34 -08:00
Stephen Birarda
fef0c31fad fix handling of not-present post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
7a6c37aa2f read checkbox states from registry 2016-01-15 15:41:34 -08:00
Stephen Birarda
3c3ef094bb use macro to write post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
a1a92cf3a9 change registry location for post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
8e3f18b628 require append of @CPACK_PACKAGE_INSTALL_REGISTRY_KEY@ to root 2016-01-15 15:41:34 -08:00
Stephen Birarda
a0647756b5 delete the post-install options info from registry on uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
a47cf35b32 write post install option choices to registry 2016-01-15 15:41:34 -08:00
Stephen Birarda
f4817032ec make uninstaller name a cmake/cpack variable 2016-01-15 15:41:34 -08:00
Stephen Birarda
2619c351e8 constantize the uninstaller name 2016-01-15 15:41:34 -08:00
Stephen Birarda
24ef51c40b use EXEDIR to check if uninstaller is in temp 2016-01-15 15:41:34 -08:00
Stephen Birarda
24903ad161 add the StrContains macro 2016-01-15 15:41:34 -08:00
Stephen Birarda
c002332f9c copy uninstaller to temp directory for correct naming 2016-01-15 15:41:34 -08:00
Stephen Birarda
4e03a06ff9 set package name prior to uninstaller creation 2016-01-15 15:41:34 -08:00
Stephen Birarda
7f92312d06 reference new elevated uninstaller for file command 2016-01-15 15:41:34 -08:00
Stephen Birarda
e6b106e152 move UAC include outside inner defines 2016-01-15 15:41:34 -08:00
Stephen Birarda
6bccdc81b4 use the UAC plugin to elevate uninstaller 2016-01-15 15:41:34 -08:00
Stephen Birarda
0a0b152f97 attempt to specify user only level for temp installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
265879cacf request admin elevation for uninstaller as well 2016-01-15 15:41:34 -08:00
Stephen Birarda
75a8ab56bc attempt to sign in inner invocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
ed56dd7303 call makensis with RunAsInvoker 2016-01-15 15:41:34 -08:00
Stephen Birarda
9972e2b096 attempt to use RunAsInvoker for inner/outer uninstaller 2016-01-15 15:41:34 -08:00
Stephen Birarda
c064a31b77 use ExecWait so it is performed as admin 2016-01-15 15:41:34 -08:00
Stephen Birarda
c0095e57d9 run elevated prior to running temp installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
e1ebb5ae5d use execute in place of system 2016-01-15 15:41:34 -08:00
Stephen Birarda
fceb916787 request admin prior to system call 2016-01-15 15:41:34 -08:00
Stephen Birarda
d8a0b28655 allow execution of command to use env 2016-01-15 15:41:34 -08:00
Stephen Birarda
35211049a0 fix for env variable referencing for signtool 2016-01-15 15:41:34 -08:00
Stephen Birarda
89e8cd16d3 use quotes in nsis template for signtool path 2016-01-15 15:41:34 -08:00
Stephen Birarda
b9ccef6c2c use string replace to escape signtool path 2016-01-15 15:41:34 -08:00
Stephen Birarda
0d2b8f183e use fully escaped path for nsis compatibility 2016-01-15 15:41:34 -08:00
Stephen Birarda
256347f6ef use direct comparison instead of define check 2016-01-15 15:41:34 -08:00
Stephen Birarda
a17ac026cc use compile time command for conditional signing 2016-01-15 15:41:34 -08:00
Stephen Birarda
f8ca9e64a9 pass the signtool executable to nsis 2016-01-15 15:41:34 -08:00
Stephen Birarda
7f08d77b36 move uninstaller signing to onInit 2016-01-15 15:41:34 -08:00
Stephen Birarda
cc4f7a9ad8 add message if executable signing enabled 2016-01-15 15:41:34 -08:00
Stephen Birarda
6b796a26b0 replace name of script for inner invocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
3cc8457a98 only call signtool on uninstaller for production build 2016-01-15 15:41:34 -08:00
Stephen Birarda
d6f50b66d6 add the inner/outer paradigm for signed uninstaller 2016-01-15 15:41:34 -08:00
Stephen Birarda
3b12eef79b use full path and not simply name for target 2016-01-15 15:41:34 -08:00
Stephen Birarda
14196ba370 fix for target file name interpolation 2016-01-15 15:41:34 -08:00
Stephen Birarda
44e1cdfe00 make executable signing a post build step 2016-01-15 15:41:34 -08:00
Stephen Birarda
e036531796 attempt to sign executable as a post build step 2016-01-15 15:41:34 -08:00
Stephen Birarda
547d2043e8 fix for execute_process call with signtool command 2016-01-15 15:41:34 -08:00
Stephen Birarda
e50e28468c add a status message for executable signing 2016-01-15 15:41:34 -08:00
Stephen Birarda
798d234d63 remove package bundle copying of ssleay dll 2016-01-15 15:41:34 -08:00
Stephen Birarda
d14c8cf9cc add signing of DS and AC executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
9aa5d017d6 add optional signing of interface executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
3a9ac7d4ac remove macro to consolidate installer components 2016-01-15 15:41:34 -08:00
Stephen Birarda
fec7b77577 leave the disabled cancel button for spacing 2016-01-15 15:41:34 -08:00
Stephen Birarda
ef0d3b11e9 use explicit text for finish button 2016-01-15 15:41:34 -08:00
Stephen Birarda
47dbd9d850 hide back and cancel buttons on finish page 2016-01-15 15:41:34 -08:00
Stephen Birarda
7ce36a69a0 change close button text before nsDialog create 2016-01-15 15:41:34 -08:00
Stephen Birarda
db5935c275 try to change button text at very end 2016-01-15 15:41:34 -08:00
Stephen Birarda
f830c9ce25 launch interface or console post-install if requested 2016-01-15 15:41:34 -08:00
Stephen Birarda
fa71136880 drop post install options label size to 10 2016-01-15 15:41:34 -08:00
Stephen Birarda
fe220ca658 attempted fix for finish button text change 2016-01-15 15:41:34 -08:00
Stephen Birarda
399cc5c4d4 tweak options label font and close button text 2016-01-15 15:41:34 -08:00
Stephen Birarda
8d8c3426d2 delete startup shortcut for server console during uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
a5ea0777c2 make the options label bold 2016-01-15 15:41:34 -08:00
Stephen Birarda
98284862f0 explicitly set text for post install dialog button 2016-01-15 15:41:34 -08:00
Stephen Birarda
b1b99479cc add missing SERVER_STARTUP_STATE variable 2016-01-15 15:41:34 -08:00
Stephen Birarda
26933573c2 handle desktop shortcut for console, startup item 2016-01-15 15:41:34 -08:00
Stephen Birarda
92d4cc6fc1 add a label above post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
ca2b3c323d create interface desktop shortcut if required 2016-01-15 15:41:34 -08:00
Stephen Birarda
fd3b665add make the confirmation page the finish page 2016-01-15 15:41:34 -08:00
Stephen Birarda
f041479f42 default some checkboxes to checked 2016-01-15 15:41:34 -08:00
Stephen Birarda
269937fe7f add conditional options to post install dialog 2016-01-15 15:41:34 -08:00
Stephen Birarda
a6c8c62d36 make sure nsDialog file is included 2016-01-15 15:41:34 -08:00
Stephen Birarda
288b044a0f use nsDialogs for custom post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
dd0f541759 move call to ReserveFile to right spot 2016-01-15 15:41:34 -08:00
Stephen Birarda
c9ecf35d82 rename template file used for post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
58cc86bc5b add a file for NSIS post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
cfcda488c4 use corect interpolation of display name option 2016-01-15 15:41:34 -08:00
Stephen Birarda
798760f175 change cpack names for generated installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
9f2fbc37bb only remove protocol handler if installed 2016-01-15 15:41:34 -08:00
Stephen Birarda
929976e781 use new console exec name var from properties 2016-01-15 15:41:34 -08:00
Stephen Birarda
53eb66418a fix for falsity of build types 2016-01-15 15:41:34 -08:00
Stephen Birarda
a2904cdc7b use a CPackProperties file for custom installer variables 2016-01-15 15:41:34 -08:00
Stephen Birarda
b4002d5f42 conditional reg entries for prod build only 2016-01-15 15:41:34 -08:00
Stephen Birarda
0cdc78bdbe remove High Fidelity protocol during uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
f844573566 name hifi:// links the High Fidelity Protocol 2016-01-15 15:41:34 -08:00
Stephen Birarda
7739749220 add URL handler registration for Interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
b8966de85e simplified shortcut creation for nsis installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
7f1c66f529 replace interface icon name with icon index 2016-01-15 15:41:34 -08:00
Stephen Birarda
25d9a1869a handle skipped parameters in CreateShortcut call 2016-01-15 15:41:34 -08:00
Stephen Birarda
ae67da4bcb use absolute path to interface icon 2016-01-15 15:41:34 -08:00
Stephen Birarda
301124ba3c fix reference to rc template and icon prefix 2016-01-15 15:41:34 -08:00
Stephen Birarda
f8f0b99a46 add icon to interface exec, icons in start menu 2016-01-15 15:41:34 -08:00
Stephen Birarda
6f7663fbae add conditional handling for server-console shortcut 2016-01-15 15:41:34 -08:00
Stephen Birarda
70077591df correct intepolation for defines in NSIS 2016-01-15 15:41:34 -08:00
Stephen Birarda
9c8a05fad9 use string variables for interface shortcut setup 2016-01-15 15:41:34 -08:00
Stephen Birarda
a6006af7be use variables in NSIS script for names 2016-01-15 15:41:34 -08:00
Stephen Birarda
9621773082 add back the NSIS.template.in file 2016-01-15 15:41:34 -08:00
Stephen Birarda
59b6d8fde8 set CPACK_MODULE_PATH so custom template is used 2016-01-15 15:41:34 -08:00
Stephen Birarda
d2f35adc11 add space back to package name and vendor 2016-01-15 15:41:34 -08:00
Stephen Birarda
63a88815bc add NSIS template for custom installer options 2016-01-15 15:41:34 -08:00
Stephen Birarda
87e55543ce repairs to component group for client/dde 2016-01-15 15:41:34 -08:00
Stephen Birarda
fcd9d9b810 setup optional dde archive for windows 2016-01-15 15:41:34 -08:00
Stephen Birarda
8842c66109 include trailing slash in windows file copy 2016-01-15 15:41:34 -08:00
Stephen Birarda
1faa78fe72 install fixed up DS and AC beside console 2016-01-15 15:41:34 -08:00
Stephen Birarda
718e994050 fix for faceshift library name on OS X 2016-01-15 15:41:34 -08:00
Stephen Birarda
1a10d2eb72 switch to a DragNDrop installer for OS X 2016-01-15 15:41:34 -08:00
Stephen Birarda
dedb7e2778 bury components in a shell application inside the server-console 2016-01-15 15:41:34 -08:00
Stephen Birarda
86facc15d1 remove debug message in fixup_interface macro 2016-01-15 15:41:34 -08:00
Stephen Birarda
55886d43f5 add DDE component as downloadable optional 2016-01-15 15:41:34 -08:00
Stephen Birarda
4f00982724 remove extraneous add dependency for FIXUP_LIB 2016-01-15 15:41:34 -08:00
Stephen Birarda
817d651c47 add initial fixup install commands for interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
3906a4fe38 drop the resources folder for DS beside executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
71307c1280 remove extra debug from shell application copy 2016-01-15 15:41:34 -08:00
Stephen Birarda
b7154cacd2 use shell application to avoid fixup on Electron 2016-01-15 15:41:34 -08:00
Stephen Birarda
cbc0c4e31d rename console packaging target 2016-01-15 15:41:34 -08:00
Stephen Birarda
e3ef18ae6e customize Interface output name for PR/dev/prod 2016-01-15 15:41:34 -08:00
Stephen Birarda
f87d8885f4 rename interface bundle for production and pr build 2016-01-15 15:41:34 -08:00
Stephen Birarda
d491a7f0e5 work around OS X package installer relocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
6eb96c27e5 use standard PlugIns path, fix for makefiles build 2016-01-15 15:41:34 -08:00
Stephen Birarda
e421624e99 put AC and DS binaries beside server-console 2016-01-15 15:41:34 -08:00
Stephen Birarda
92064fe507 generate a componentized server/client installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
0463e008cf base cpack configuaration using install commands 2016-01-15 15:41:34 -08:00
Stephen Birarda
4f6595ed08 fix makefiles build on OS X 2016-01-15 15:41:34 -08:00
Ryan Huffman
196161fe93 Merge pull request #66 from birarda/console-dev 
some initial packaging work and console fixes
 2016-01-14 10:17:24 -08:00
Stephen Birarda
404fb2f781 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-07 16:02:32 -08:00
Stephen Birarda
5832884b58 handle beta icon usage while packaging console 2016-01-05 10:27:46 -08:00
Stephen Birarda
139abf704d use an s3 link for dependencies 2016-01-05 09:58:59 -08:00
Stephen Birarda
9c2eebfaeb don't attempt to find nsight multiple times per run 2016-01-04 16:52:39 -08:00
Stephen Birarda
c4fdd86a56 use current source dir for console icon copy 2016-01-04 16:36:30 -08:00
Stephen Birarda
5e762a4b95 specify console folder to copy per-platform 2016-01-04 16:29:00 -08:00
Stephen Birarda
c9c536ff00 remove FIND_NSIGHT_CALLED variable 2016-01-04 16:00:42 -08:00
Stephen Birarda
7892808b28 cleanup TargetNsight, remove extra debug 2016-01-04 15:58:13 -08:00
Stephen Birarda
1e2ae87dee make application version a private include 2016-01-04 15:20:17 -08:00
Stephen Birarda
9e252f0b08 exclude targets from all build, include app version 2016-01-04 15:18:57 -08:00
Stephen Birarda
fcc0c92ff1 put console/build-package in installer folder 2016-01-04 15:13:29 -08:00
Stephen Birarda
bf5f783e67 copy console icon for installer 2016-01-04 13:58:33 -08:00
Stephen Birarda
817bbb09d2 rename console target to High Fidelity Console 2016-01-04 10:54:51 -08:00
Stephen Birarda
90cf69b9b5 add console handling to installer component consolidation 2016-01-04 10:47:25 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Stephen Birarda
02069bfcd2 Merge remote-tracking branch 'leo/master' into console 2016-01-04 09:57:55 -08:00
Leonardo Murillo
379cdf1d5d Merge branch 'master' of github.com:highfidelity/hifi 2015-12-31 09:06:44 -06:00
Stephen Birarda
abea65fa84 resolve conflicts on merge with upstream/master 2015-12-29 17:54:45 -08:00
Anthony J. Thibault
c35995b8e3 Build fix for linux? 2015-12-29 08:51:44 -08:00
Leonardo Murillo
ea6850c423 Changes per convo with Philip 2015-12-29 10:16:27 -06:00
Anthony J. Thibault
7e514d2f4d Mac build fix 2015-12-28 18:42:03 -08:00
Anthony Thibault
878fe80040 Merge branch 'master' into tony/neuron-plugin 2015-12-25 10:24:55 -08:00
Leonardo Murillo
baf095f4af Lots and lots of changes to installer 2015-12-23 14:16:49 -06:00
Leonardo Murillo
ec6f572d68 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-23 08:26:24 -06:00
Anthony J. Thibault
0459479c2b NeuronPlugin: Added external project for Neuron SDK 
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
 2015-12-21 18:30:15 -08:00
Brad Hefta-Gaub
ce426f0144 Merge pull request #6695 from birarda/qxmpp-deletion 
remove an unused qxmpp external
 2015-12-21 16:49:04 -08:00
Leonardo Murillo
aca60e23c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-19 18:44:21 -06:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
Brad Hefta-Gaub
868d10651a Merge pull request #6651 from jherico/webengine 
Migrate QML based web views to Qt WebEngine
 2015-12-18 14:56:35 -08:00
Stephen Birarda
de9e03a379 remove qxmpp external 2015-12-18 10:54:04 -08:00
Leonardo Murillo
736977a4c2 Using correct Icons for PR vs Relesae 2015-12-18 08:16:39 -06:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Leonardo Murillo
bbe444ffc1 Forgot to add file 2015-12-16 16:40:51 -06:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Stephen Birarda
20886748af resolve conflicts on merge with upstream/master 2015-12-16 10:21:24 -08:00
Leonardo Murillo
3e6316f089 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-16 11:34:58 -06:00
Andrew Meadows
51ff8f096e correct input plugin load path on linux 2015-12-15 08:43:04 -08:00
Leonardo Murillo
0136e5fe97 Merge branch 'master' of https://github.com/murillodigital/hifi 2015-12-14 20:20:36 -06:00
Andrew Meadows
6d7597e9fc remove comments and remove dangling whitespace 2015-12-11 09:40:15 -08:00
Andrew Meadows
9231692d23 fix asset URL and windows cmake command for bullet 2015-12-11 09:40:15 -08:00
Andrew Meadows
cb65a6f640 fix cmake to build bullet-2.83 2015-12-11 09:40:15 -08:00
Leonardo Murillo
bce808cdbe Merge branch 'master' of https://github.com/murillodigital/hifi 2015-12-11 08:42:40 -08:00
Philip Rosedale
4a1d0e5a26 Merge pull request #6623 from ZappoMan/switchToJulySixenseSDK 
switch to july sixense SDK
 2015-12-10 21:21:01 -08:00
Brad Hefta-Gaub
e5a5c05e84 switch to july sixense SDK 2015-12-10 17:56:31 -08:00
Brad Davis
98263f0c0d Moving sdl2 to external plugin 2015-12-10 14:56:41 -08:00
Bradley Austin Davis
1644bda908 Migrate to latest Oculus SDK (0.8) 2015-12-09 17:32:11 -08:00
Brad Davis
978d39b7f4 Moving OpenVR to external plugin and updating to latest version 2015-12-09 16:20:24 -08:00
Leonardo Murillo
d811660ed6 DO NOT MERGE - Testing PR environment 2015-12-09 11:07:10 -08:00
Leonardo Murillo
dda99bfea6 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-08 14:07:50 -08:00
Brad Hefta-Gaub
ab63f19b6a Merge pull request #6546 from kencooke/audio-reverb 
Reverb
 2015-12-04 10:19:56 -08:00
Ken Cooke
aad4743bf0 Completely remove Gverb from cmake 2015-12-03 18:06:50 -08:00
Stephen Birarda
bddb8d5b68 remove Quazip files used by CMake 2015-12-03 14:08:10 -08:00
Brad Davis
2cea593fbd Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
Brad Davis
55799403c9 64 bit support for Leap Motion on windows 2015-12-02 21:52:06 -08:00
Leonardo Murillo
c786789c4c Changes for SSL and icons 2015-12-02 12:43:25 -06:00
Leonardo Murillo
ca8cd13c48 Checkpoint 2015-12-01 12:32:31 -06:00
Leonardo Murillo
418b9c8fea Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-01 11:57:38 -06:00
Anthony J. Thibault
79b06c3c8a cmake: Fix quazip configure on linux/mac if QT_CMAKE_PREFIX_PATH is undefined. 2015-11-30 11:14:35 -08:00
Leonardo Murillo
4e18640922 Some fixes 2015-11-30 10:07:11 -06:00