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