Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 16:57:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80673 commits 25 branches 0 tags 1.1 GiB
Commit graph

1764 commits

Author SHA1 Message Date
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
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
Leonardo Murillo
5822386702 Checkpoint 2015-11-30 08:56:30 -06:00
Leonardo Murillo
6a53140720 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-30 08:38:13 -06:00
Anthony Thibault
63cef9c367 Configure fix for quazip 
23>  CMake Warning (dev) at C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip-stamp/quazip-configure-Debug.cmake:3 (set):
    23>    Syntax error in cmake code at
    23>
    23>      C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip-stamp/quazip-configure-Debug.cmake:3
    23>
    23>    when parsing string
    23>
    23>      C:/Program Files (x86)/CMake/bin/cmake.exe;-DCMAKE_INSTALL_PREFIX:PATH=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project;-DCMAKE_PREFIX_PATH=C:\Qt\Qt5.5.1\5.5\msvc2013\lib\cmake;-DCMAKE_INSTALL_NAME_DIR:PATH=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/lib;-DZLIB_ROOT=C:/msys64/home/Anthony/code/hifi/build/ext/vc12/zlib/project;-GVisual Studio 12 2013;C:/msys64/home/Anthony/code/hifi/build/ext/vc12/quazip/project/src/quazip
    23>
    23>    Invalid escape sequence \Q
    23>
    23>    Policy CMP0010 is not set: Bad variable reference syntax is an error.  Run
    23>    "cmake --help-policy CMP0010" for policy details.  Use the cmake_policy
    23>    command to set the policy and suppress this warning.
    23>  This warning is for project developers.  Use -Wno-dev to suppress it.

By converting backslashes to slashes before using the QT_CMAKE_PREFIX_PATH environment variable on the command line.
 2015-11-27 20:57:35 -08:00
Anthony Thibault
a9e25c51e5 Fix for linker warning LNK4075 on Windows 
Specifcally, this warning:

    LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification

The fix is to set /OPT:NOREF and /OPT:NOICF on debug builds.
 2015-11-27 20:56:57 -08:00
Leonardo Murillo
6ab8821725 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-27 14:04:42 -06:00
Leonardo Murillo
766f0dbd32 Have stack manager use bundled stack 2015-11-27 14:04:33 -06:00
Andrew Meadows
527408c7c1 Merge pull request #6292 from huffman/physics-continuous-collision-detection 
Physics continuous collision detection
 2015-11-25 15:45:18 -08:00
Leonardo Murillo
b7cdca75b7 Checkpoint towards integrated delivery 2015-11-24 16:12:04 -06:00
Leonardo Murillo
55649717c5 Using http for quazip external 2015-11-23 20:10:32 -06:00
Leonardo Murillo
f759fa2cfa Ubuntu fixes 2015-11-23 18:30:40 -06:00
Leonardo Murillo
d58b11f0a2 Ubuntu fix - case sensitivity¨ 2015-11-23 18:13:41 -06:00
Leonardo Murillo
66803ce356 Ubuntu fix - case sensitivity¨ 2015-11-23 18:04:36 -06:00
Leonardo Murillo
fee50a56e5 Ubuntu fix - case sensitivity 2015-11-23 18:02:20 -06:00
Leonardo Murillo
8b573cebfb Successfull windows build given any build type checkpoint 2015-11-23 15:16:48 -06:00
Leonardo Murillo
8e12e32dd2 Checkpoint - Windows specifics 2015-11-23 14:21:06 -06:00
Ryan Huffman
d1e9e28522 Update bullet tgz md5sum 2015-11-20 16:11:12 -08:00
Ryan Huffman
3aa271d688 Update bullet tgz md5sum 2015-11-20 15:21:53 -08:00
Ryan Huffman
67d0792173 Update bullet tgz md5sum 2015-11-20 15:09:06 -08:00
Ryan Huffman
7e87ad5114 Update bullet tgz md5sum 2015-11-20 14:50:31 -08:00
Ryan Huffman
784df60a97 Update bullet archive to include CCD+Compound improvements 2015-11-20 13:56:20 -08:00
Leonardo Murillo
e17d0b2af3 Bundling and consolidating deployment package 2015-11-20 15:10:56 -06:00
Leonardo Murillo
6105191a3f OS X Bundling 2015-11-20 14:45:25 -06:00
Leonardo Murillo
6f3d818121 Checkpoint - fixing ID in dylib 2015-11-20 10:56:47 -06:00
Leonardo Murillo
c56a3b6d22 Checkpoint - turning quazip into external 2015-11-20 09:56:10 -06:00
Leonardo Murillo
f981fb9f46 Initial stack manager commit 2015-11-19 18:27:58 -06:00
Brad Davis
ec918a1cf5 Fix OpenSSL 64 bit search logic 2015-11-17 19:10:16 -08:00
Brad Davis
68c6718d1c Fixes for windows 64 bit builds 2015-11-17 18:22:00 -08:00
Brad Davis
0c60538952 Ensure that dependencies of runtime plugins are included in the DLL copy 2015-11-06 16:57:30 -08:00
Brad Davis
017cb2cb6c Getting rid of HTTPS external dependencies 2015-11-04 11:53:42 -08:00
Brad Davis
edf3e5b17a Try using the VS2010 builds from the new Sixense SDKs 2015-11-02 11:15:51 -08:00
Brad Davis
017e42bbc2 Update sixense SDK 2015-11-02 09:15:54 -08:00
Brad Hefta-Gaub
fe4a6fa2bf Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings 2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub
9c23f2551d Merge pull request #6207 from jherico/pluginSupport 
Support for runtime plugins (DLLs)
 2015-11-01 14:57:13 -08:00
Brad Hefta-Gaub
13e805ac15 replace copy_resolved_item_into_bundle with a version that doesn't report warnings for a status case 2015-11-01 13:18:53 -08:00
Brad Davis
e0ac48fe27 PR comments 2015-11-01 12:19:19 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Davis
99d8554cc8 Make zlib a true external on windows (linux and OSX should rely on system libraries) 2015-11-01 01:36:59 -07:00
Brad Davis
7fa6fb1308 Remove GLEW spam in cmake 2015-11-01 01:36:12 -07:00
Brad Davis
aee03e79f3 Fix win32 and linux Sixense config 2015-10-30 22:37:00 -07:00
Bradley Austin Davis
9b9e35d396 Limit sixense to mavericks and below 2015-10-30 22:02:20 -07:00
Bradley Austin Davis
46d87dda5a Fixing paths for SDL2 and Sixense libs 2015-10-30 19:00:26 -07:00
Brad Davis
2518ada26f Merge pull request #6220 from sethalves/new-smi-runtime 
update cmake to work with newer smi runtime
 2015-10-30 10:40:04 -07:00
Brad Hefta-Gaub
fb3bf16391 improvement to cmake to explicitly use local external dependency 2015-10-30 09:01:42 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Seth Alves
f01b4dcd90 update cmake to work with newer smi runtime 2015-10-29 09:23:19 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Ken Cooke
de8848f7bc Fix to only pass --release to windeployqt on release builds 2015-09-30 08:11:16 -07:00
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
Stephen Birarda
06ca4dfbde fix polyvox double name change command 2015-09-28 14:26:53 -04:00
Ken Cooke
629ee7b0c1 Completely remove SOXR from cmake 2015-09-24 15:12:10 -07:00
Brad Davis
d7a850d7be Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix 
Hifi 3 d connexion cmake fix
 2015-09-14 18:53:39 -07:00
MarcelEdward
c1ddf5fc32 Update Find3DConnexionClient.cmake 2015-09-15 03:22:44 +02:00
MarcelEdward
8a71b31af0 Update Find3DConnexionClient.cmake 2015-09-15 03:06:07 +02:00
MarcelEdward
c3ecbd15f8 Update Find3DConnexionClient.cmake 2015-09-15 00:30:49 +02:00
Stephen Birarda
710e369b70 don't have polyvox build bindings 2015-09-10 08:52:24 -07:00
Stephen Birarda
255f896f7b remove extra cmake debug 2015-09-08 15:21:34 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
Andrew Meadows
802b3a88c3 more corret cmake file for sixense 2015-09-01 09:45:14 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Seiji Emery
d29a368688 removed debug 2015-08-25 16:50:09 -07:00
Seiji Emery
140edd0589 try removing quotes... 2015-08-25 16:21:38 -07:00
Seiji Emery
248d0729a6 test 2015-08-25 15:29:36 -07:00
Seiji Emery
62dc83fa32 test 2015-08-25 15:00:21 -07:00
Seiji Emery
3d59f8d7e8 changed setup_project to only use the generated shader source files 2015-08-25 14:40:52 -07:00
Seiji Emery
316ddd68ef force cmake autoscribe to use full paths 2015-08-25 13:46:50 -07:00
Seiji Emery
4d9f45475e Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-24 14:38:26 -07:00
Seiji Emery
bd18951be8 fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/ 2015-08-24 13:13:24 -07:00
MarcelEdward
3ab63ba613 Update Find3DConnexionClient.cmake 
The space navigator stopped working, this hopefully will fix it.

The framework is 3DconnexionClient.framework for osx, not sure why connexion named it that way. It is a library in /Library/Frameworks, the library name is in stone.

for apple, this works in cmake/modules/Find3DConnexionClient.cmake

find_library(3DConnexionClient 3DconnexionClient)

And for windows it has to find the I3dMouseParams.h file in interface/external/3dconnexionclient/includes.
So for windows the line in Find3DConnexionClient.cmake has to be:

hifi_library_search_hints("3dconnexionclient")
 2015-08-22 22:48:51 +02:00
Brad Davis
7fb491e48c Cleanup plugin interface, break up oculus plugins 2015-08-21 00:29:25 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Brad Davis
aba7bebf6e Revert "Updating to the new version of the sixense library" 2015-08-19 09:44:51 -07:00
Brad Davis
7f09df1d0b Fixing external 2015-08-18 18:56:01 -07:00
Brad Davis
86e21c91ba Case issues again 2015-08-18 18:56:00 -07:00
Brad Davis
eba446e7f6 Updating to the new version of the sixense library 2015-08-18 18:55:59 -07:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
David Rowe
d7b42e264e Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-08-05 16:49:06 -07:00
Stephen Birarda
653e0d29c7 resolve conflicts on merge with upstream/core 2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
Bradley Austin Davis
252677e1c2 Fix MD5 of glew dep 2015-08-05 14:02:14 -07:00
Brad Davis
754bf5c6f7 Merge pull request #5509 from birarda/core 
get GLEW for all platforms as external project
 2015-08-05 13:41:48 -07:00
Sam Gondelman
513c652ab3 merge from master and attempt to fix connexion conflicts 2015-08-05 12:42:39 -07:00
Stephen Birarda
34e188fe6e log more of the steps for glew external project 2015-08-05 12:35:37 -07:00
Stephen Birarda
cc909507f4 get GLEW for all platforms as external project 2015-08-05 12:34:11 -07:00
Bradley Austin Davis
04d579be7a Removing integrated glew 2015-08-05 11:21:59 -07:00
David Rowe
1201073709 Add DLLs needed for Interface to run without iViewHMD installed 2015-08-04 13:15:26 -07:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Bradley Austin Davis
ed5f70039f Merge branch 'master' into core 2015-08-03 22:18:38 -07:00
David Rowe
86ad490bde Fix to build on build PC without iViewHMD software installed 2015-08-03 20:52:11 -07:00
Sam Gondelman
95232920f1 trying to fix mac linking errors 2015-08-03 16:35:34 -07:00
Sam Gondelman
c9780338ae merge from master 2015-08-03 16:27:45 -07:00
David Rowe
7749b912ea Merge branch 'master' into 20639 2015-08-03 09:55:35 -07:00
David Rowe
e300eb27c0 Fix libs directory path 2015-08-03 09:55:14 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Sam Gondelman
647bb2b9ce removing unnecessary weak link 2015-08-01 11:41:29 -07:00
Sam Gondelman
8d77afaa94 more work on cleaning up connexion 2015-08-01 11:41:29 -07:00
Sam Gondelman
01c4e17236 trying to fix connexion linker errors, general style fixes, renamed some files 2015-08-01 11:41:29 -07:00
SamGondelman
e8daee013e windows finds framework 2015-07-31 16:27:10 -07:00
Brad Davis
155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
 2015-07-31 10:28:06 -07:00
SamGondelman
25e75bcc79 WIP: trying to fix windows not finding framework 2015-07-30 18:11:24 -07:00
Sam Gondelman
a01a4f929f removing unnecessary weak link 2015-07-30 15:14:51 -07:00
Sam Gondelman
b8f7d4b8c8 more work on cleaning up connexion 2015-07-30 13:19:05 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Sam Gondelman
b19376ef6e trying to fix connexion linker errors, general style fixes, renamed some files 2015-07-30 12:17:36 -07:00
David Rowe
02ae008c9c Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-07-29 16:24:30 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
David Rowe
70d155048f Add SMI iViewHMD eye tracking as an optional library 2015-07-27 14:43:32 -07:00
Marcel Verhagen
32d0513962 The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 
For now without a merge conflict.

Updated the menu name.

Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
 2015-07-27 19:04:49 +02:00
Bradley Austin Davis
6d8adbf2b5 Make OpenVR windows only for now 2015-07-27 09:13:04 -04:00
Bradley Austin Davis
671bda8883 Working on linux build 2015-07-25 20:58:13 -04:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
Bradley Austin Davis
c3f77a1c24 Merge branch 'master' into maggie 2015-07-21 19:21:45 -04:00
Anthony J. Thibault
e8da4b9586 merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
Brad Davis
ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationCompositor.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-16 16:37:55 -07:00
Seth Alves
4db66e7894 build separate debug and release versions of polyvox library 2015-07-15 14:38:44 -07:00
Seth Alves
930e570b48 build separate debug and release versions of polyvox library 2015-07-15 13:54:57 -07:00
Seth Alves
f1c10f5119 build separate debug and release versions of polyvox library 2015-07-15 13:38:12 -07:00
Seth Alves
3bc182730a build separate debug and release versions of polyvox library 2015-07-15 10:52:38 -07:00
Seth Alves
a71c5cae5f build separate debug and release versions of polyvox library 2015-07-15 10:33:22 -07:00
Seth Alves
443cfc8970 build separate debug and release versions of polyvox library 2015-07-15 10:31:21 -07:00
Seth Alves
fd84893c61 build separate debug and release versions of polyvox library 2015-07-15 09:42:26 -07:00
Seth Alves
316c322118 build separate debug and release versions of polyvox library 2015-07-15 09:36:51 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Brad Davis
9eb15d3d55 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/GLCanvas.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	libraries/render-utils/src/DeferredLightingEffect.cpp
 2015-07-13 12:54:19 -07:00
Brad Davis
0c50cb670a Moving boostconfig folder in IDEs 2015-07-13 12:40:26 -07:00
Brad Davis
0a389a9daa Updating oglplus version and switching to url based dist 2015-07-07 11:11:52 -07:00
Sam Gondelman
f69b755166 merge with hifi/plugins 2015-07-06 17:41:45 -07:00
Brad Davis
2a1776303d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-07-03 06:17:35 -07:00
Seiji Emery
16e7af1848 Reverted macro naming convention 2015-07-02 17:41:38 -07:00
Sam Gondelman
a6cbc09eac reverted to openvr 0.9.1 2015-07-02 12:32:35 -07:00
Sam Gondelman
81efd99ae4 merge with hifi/plugins 2015-07-02 10:13:28 -07:00
Bradley Austin Davis
54bbc841e2 Working on mac compilability 2015-07-01 23:03:33 -07:00
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -07:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00
Brad Davis
e7f31ec811 Move to latest Oculus SDK 2015-06-27 00:27:22 -07:00
Seiji Emery
e81b0a3c3a Fixed tests for ALL_BUILD 
Fixed physics tests, disabled out-of-date octree tests, and renamed /
added QTestExtensions to the tests folder (IDE view).

ALL_BUILD will now succeed.
 2015-06-26 13:31:31 -07:00
Seiji Emery
6e87f44ec7 Merge remote-tracking branch 'upstream/master' 2015-06-24 15:12:57 -07:00
Seiji Emery
0ee0c92f2f Re-added stuff 2015-06-24 14:54:54 -07:00
Brad Davis
a5428ae24a Merge remote-tracking branch 'upstream/master' into plugins 2015-06-24 10:39:31 -07:00
Andrew Meadows
1ceed98ca2 Merge pull request #5166 from jherico/64bit 
Enable Windows 64 bit builds
 2015-06-23 17:03:42 -07:00
Brad Davis
9f98547390 Merge branch 'master' into plugins 2015-06-22 13:35:40 -07:00
Seiji Emery
0cc940d433 Modified the build files for external targets so that they longer show up project view in IDEs (which clutters up the view, etc). 
Said files are now buried under hidden/externals; the (phony) build targets still exist and are visible in the target dropdown, but this is filterable (in Xcode, dunno about Visual Studio (just start typing and a filter/search box comes up))
 2015-06-19 21:58:16 -07:00
Brad Davis
d65e5882aa Working on 64 bit builds 2015-06-18 21:44:12 -07:00
Brad Davis
a8d3dc7218 Updating oglplus version 2015-06-17 23:50:38 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Brad Davis
15d214f335 Initial pass at OpenVR 2015-06-12 17:29:05 -07:00
Brad Davis
7955eeda28 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-06-12 15:49:35 -07:00
Stephen Birarda
128b086e82 don't build the polyvox examples 2015-06-12 10:25:34 -07:00
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -07:00
Brad Davis
e9587d90c4 Trying to fix linux build 2015-06-09 01:50:32 -07:00
Brad Davis
43bddf23b4 Grabbing correct oglplus commit 2015-06-09 01:03:14 -07:00
Brad Davis
5a1b713160 Fixing texture include error in oglplus 2015-06-09 00:59:17 -07:00
Brad Davis
11bc838be9 Switching to Git for oglplus 2015-06-09 00:48:42 -07:00
Brad Davis
119f37a178 Working on SDK 0.6 2015-06-07 14:34:40 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6 
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
 2015-06-07 01:40:44 -07:00
Brad Davis
f22682fe39 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-06-01 22:59:10 -07:00
Brad Davis
a483dd27ba Trying to get widgets / windows working 2015-06-01 17:31:18 -07:00
Stephen Birarda
94131908fb update polyvox for xcode C++11 build 2015-06-01 14:53:11 -07:00
Brad Davis
912c003d58 Making (most) plugins into a library 2015-05-29 16:49:11 -07:00
Brad Davis
8bad80324f Merge branch 'master' into plugins_pt3 2015-05-29 09:05:01 -07:00
Brad Davis
1c49dde6f8 Merge branch 'master' into plugins 
Conflicts:
	CMakeLists.txt
 2015-05-28 14:30:19 -07:00
Seth Alves
aefd34f8d6 trying again to get polyvox to build on osx 2015-05-28 06:43:31 -07:00
Seth Alves
24bb17f7b2 trying again to get polyvox to build on osx 2015-05-28 06:36:31 -07:00
Seth Alves
b024bd0ff2 trying again to get polyvox to build on osx 2015-05-27 22:00:20 -07:00
Seth Alves
6a1ea820e7 trying again to get polyvox to build on osx 2015-05-27 21:50:35 -07:00
Seth Alves
1026da18b2 trying again to get polyvox to build on osx 2015-05-27 21:32:20 -07:00
Seth Alves
5b62714ba4 trying again to get polyvox to build on osx 2015-05-27 21:09:48 -07:00
Seth Alves
5e79b03faf trying to get polyvox to build on osx 2015-05-27 20:55:16 -07:00
Seth Alves
f4b7a41006 trying to get polyvox to build on osx 2015-05-27 20:46:50 -07:00
Seth Alves
6711c64cc6 trying to get polyvox to build on osx 2015-05-27 20:20:37 -07:00
Seth Alves
00296faa51 trying to get polyvox to build on osx 2015-05-27 20:00:37 -07:00
Seth Alves
aff82a90ce try, try again 2015-05-27 19:16:50 -07:00
Seth Alves
05cd7fb8c4 update polyvox external source 2015-05-27 18:39:13 -07:00
Seth Alves
25df777132 fix polyfox url 2015-05-27 16:15:58 -07:00
Seth Alves
c933c42b18 move polyvox external source to s3 2015-05-27 15:02:20 -07:00
Seth Alves
1109444c3d attempt to make sure the ray that picks against polyvox entities is long enough 2015-05-27 14:57:12 -07:00
Brad Davis
810db39233 Working on oculus rendering 2015-05-27 12:42:05 -07:00
Seth Alves
7c4b89d917 get polyvox to build on osx 2015-05-27 11:56:57 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Brad Davis
e69362dadc Working on stereo rendering 2015-05-22 17:51:59 -07:00
Brad Davis
ac93d2c721 Working on display plugins 2015-05-21 18:50:11 -07:00
Seth Alves
6a3203475a Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-21 11:57:54 -07:00
Seth Alves
0c1ad258f3 update polyvox 2015-05-21 11:57:37 -07:00
Seth Alves
bd94d28075 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-21 11:55:17 -07:00
Seth Alves
8e76887101 working on windows build of polyvox 2015-05-21 11:55:13 -07:00
Seth Alves
b74262f2ce update polyvox 2015-05-21 11:53:56 -07:00
Seth Alves
c02b87ad1c update polyvox 2015-05-21 11:09:44 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Bradley Austin Davis
5f12af75bd Tweaking to match master 2015-05-08 11:11:46 -07:00
Bradley Austin Davis
5e821b4447 Updating plugins 2015-05-07 22:32:28 -07:00
Bradley Austin Davis
77a9f7fa2a Merge branch 'plugins_pt1' into plugins 2015-05-06 14:22:13 -07:00