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
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
