Commit graph

265 commits

Author SHA1 Message Date
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
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
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
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
Stephen Birarda
718e994050 fix for faceshift library name on OS X 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
Stephen Birarda
404fb2f781 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-07 16:02:32 -08:00
Stephen Birarda
139abf704d use an s3 link for dependencies 2016-01-05 09:58:59 -08:00
Stephen Birarda
02069bfcd2 Merge remote-tracking branch 'leo/master' into console 2016-01-04 09:57:55 -08:00
Stephen Birarda
abea65fa84 resolve conflicts on merge with upstream/master 2015-12-29 17:54:45 -08: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
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
de9e03a379 remove qxmpp external 2015-12-18 10:54:04 -08:00
Stephen Birarda
20886748af resolve conflicts on merge with upstream/master 2015-12-16 10:21:24 -08: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
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
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
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
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
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
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
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
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
Brad Davis
68c6718d1c Fixes for windows 64 bit builds 2015-11-17 18:22:00 -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