Commit graph

452 commits

Author SHA1 Message Date
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -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
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -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
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
Seth Alves
0d9aa8182e have cmake find fbx library on Linux 2017-06-21 17:10:19 -04: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
Brad Davis
5e1bc0d908 Remove faceshift 2017-04-28 16:34:54 -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
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
ZappoMan
876dd4c850 add the default environment variable name for the kinect plugin to the search hints 2017-03-27 15:02:00 -07: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
4278d7b20d download and link oculus platform for oculus plugin 2017-01-05 11:20:44 -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
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
Brad Davis
488d191428 Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00
Brad Davis
ecfe56085d GLM update and GLI integration 2016-09-09 10:18:15 -07:00
elisa-lj11
212e4f9cca making quazip work 2016-08-04 16:48:14 -07:00
elisa-lj11
c9c965b1e8 added new files for quazip 2016-08-04 16:46:56 -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
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
Ryan Huffman
813d5e5ba0 Add headers and proper bugsplat checking to cmake files 2016-02-11 08:17:05 -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
Stephen Birarda
798d234d63 remove package bundle copying of ssleay dll 2016-01-15 15:41:34 -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
Leonardo Murillo
ea6850c423 Changes per convo with Philip 2015-12-29 10:16:27 -06:00
Leonardo Murillo
baf095f4af Lots and lots of changes to installer 2015-12-23 14:16:49 -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
Stephen Birarda
20886748af resolve conflicts on merge with upstream/master 2015-12-16 10:21:24 -08:00
Andrew Meadows
cb65a6f640 fix cmake to build bullet-2.83 2015-12-11 09:40:15 -08:00