Stephen Birarda
e9ab8899b2
some updates to the BUILD guide for OpenSSL
2014-07-17 11:49:37 -07:00
Stephen Birarda
0c8c4a2cf9
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 11:08:35 -07:00
Stephen Birarda
29504325d0
add a tweaked FindOpenSSL module and link and include it in interface
2014-07-16 10:52:53 -07:00
Andrew Meadows
8ffc3aa73d
merge upstream/master into andrew/thermonuclear (AKA samcake/19734)
...
Conflicts:
interface/src/Application.cpp
2014-07-14 09:10:27 -07:00
samcake
d6104e5d48
Final cleaning, ready to publish
...
- Removed the LEapmotion sdk from the external folder and validated that
it can be installed in the "HIFI_LIB_DIRS", fixed the
FIndLeapmotion.cmake for that
- Cleared the HandTracker class not needed
Ready for publish !
2014-07-09 01:02:56 -07:00
samcake
3ecaaa5a85
After HIfi visit, Fix skinning from javascript
...
- Understood the skinning mechanism from an absolute transform in model
space that need to use a call to
//JointState::setRotationFromBindFrame(rotation, priority);
- This is not available from the javascript MyAvatar interface yet
- now require LeapMOtion SDK2.0.3 to support arms
2014-07-08 23:57:37 -07:00
Stephen Birarda
d1afe127c3
updates to RtMidi find module to look for static or dynamic lib
2014-07-08 12:06:43 -07:00
samcake
f5c690cc8d
Add Leapmotion support for Apple build
...
- Add LEapmotion support in the CMake files
- fix a template syntax in DeviceHEader not compiling on mac
- add a missing #ifdef protection in Leapmotion
2014-07-07 09:32:46 -07:00
samcake
abacefa723
Merge remote-tracking branch 'upstream/master' into 19734
...
Conflicts:
interface/CMakeLists.txt
interface/src/avatar/SkeletonModel.cpp
2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13
Merge branch 'master' of https://github.com/highfidelity/hifi into 19734
2014-07-05 18:10:59 -07:00
Stephen Birarda
f389e3a6da
resolve conflicts on merge with upstream master
2014-07-01 11:02:25 -07:00
Stephen Birarda
5ba4a4dbb5
initial pass of MIDI implementation that bubbles events to JS
2014-07-01 09:53:18 -07:00
samcake
fe03743163
Revert "Revert "Add LeapMotion SDK support""
...
This reverts commit 8ce145085b3783782fafd051becbb0e339d5dfa1.
2014-07-01 03:15:23 -07:00
samcake
6b549a5269
Revert "Add LeapMotion SDK support"
...
This reverts commit 291c446c28
2014-07-01 03:15:21 -07:00
barnold1953
67c5281205
Fixed CMake for oculus. Gave Oculus its own camera for minimum latency.
2014-06-26 17:10:53 -07:00
samcake
291c446c28
Add LeapMotion SDK support
...
- Add the leapmotion folder in interface/external
- Add the "FindLeapMotion.cmake" file in cmake
- Add the first iteration of the class LeapMotionManager.h and .cpp in
the interface/devices folder
- Tested only on windows 7 so far
2014-06-10 16:40:04 -07:00
Stephen Birarda
0e7615391c
don't look for GnuTLS from cmake
2014-05-20 10:35:04 -07:00
Leonardo Murillo
ee8722bc9f
CMake find LibOVR
2014-05-18 20:59:41 -06:00
Leonardo Murillo
5a7a876697
CMake find LibOVR
2014-05-18 18:43:16 -06:00
Andrzej Kapolka
f2ba2a48f2
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
2014-05-13 11:38:51 -07:00
Leonardo Murillo
c7e103e989
Not working with path_suffixes, testing something else
2014-05-12 19:43:56 -06:00
Andrzej Kapolka
52a3c70bf5
Updates to PrioVR interface.
2014-05-12 17:11:02 -07:00
Leonardo Murillo
1869248351
Moving stuff around
2014-05-12 16:46:24 -06:00
Leonardo Murillo
415bc64ce9
Moving stuff around
2014-05-12 16:44:15 -06:00
Leonardo Murillo
8b15873488
Change to Oculus find path in Windows
2014-05-12 16:37:52 -06:00
Andrzej Kapolka
e0486b2654
Starting on PrioVR integration.
2014-05-12 15:25:25 -07:00
Stephen Birarda
5904d19603
Merge pull request #2637 from birarda/authentication
...
add optional DTLS option for domain-server to node communication
2014-04-14 10:24:17 -07:00
Stephen Birarda
9fcb656027
add a newline to FindGnuTLS and fix filename in header
2014-04-11 09:26:45 -07:00
Stephen Birarda
f51b7a78c6
look only in lib for GnuTLS library
2014-04-10 09:32:44 -07:00
Stephen Birarda
31382b7e12
add a message for Win32 users to generate the MSVC GnuTLS import library
2014-04-09 17:41:18 -07:00
Stephen Birarda
17d2e14f0f
find correct parent include folder for gnutls
2014-04-09 17:33:41 -07:00
Stephen Birarda
8b23addc47
prepend the gnutls library with lib for windows find
2014-04-09 17:31:11 -07:00
Stephen Birarda
35519e07dc
quote dashed library name to potentially fix find on windows
2014-04-09 17:27:37 -07:00
Stephen Birarda
d54c21cdf1
fix path suffixes for gnutls headers
2014-04-09 17:23:13 -07:00
Stephen Birarda
03bb2573d1
look in bin folder to find GnuTLS on windows
2014-04-09 17:18:34 -07:00
Stephen Birarda
1c861fbecb
resolve conflicts on merge with upstream master
2014-04-09 15:36:15 -07:00
Andrzej Kapolka
f707719f4e
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
2014-04-09 15:34:29 -07:00
Andrzej Kapolka
ef8eb00778
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
2014-04-09 15:23:11 -07:00
Stephen Birarda
c208af2246
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 15:10:48 -07:00
Stephen Birarda
3f84f36d60
add proper boilerplate to GnuTLS find module
2014-04-09 15:00:57 -07:00
Stephen Birarda
d4f2c9e631
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-04-09 14:40:14 -07:00
Stephen Birarda
6ce5a24460
missed copyright cleanups in apache header
2014-04-09 09:44:38 -07:00
Stephen Birarda
ff9fd2d8e9
tweak headers in cmake find modules
2014-04-08 17:49:30 -07:00
Andrzej Kapolka
98011da1ef
Starting on Faceplus integration.
2014-04-08 17:07:45 -07:00
Jeroen Baert
d2800ccd55
For some GLEW distributions, it's just lib
2014-04-03 11:52:13 +01:00
Stephen Birarda
6c08e2a407
add option for domain-server to enforce DTLS
2014-03-31 15:06:58 -07:00
Stephen Birarda
dc38b27485
using GnuTLS read self-signed key and cert on DS load
2014-03-31 12:31:34 -07:00
Stephen Birarda
9ae06913a0
remove QCA which only supports DTLS v1
2014-03-31 09:45:19 -07:00
Stephen Birarda
89aeb034d1
add find module for QCA and link to interface and DS
2014-03-28 15:22:44 -07:00
Dimitar Dobrev
f427f524bf
Patched the Qt CMake function for auto-translations so that *.ts files
...
are not deleted on clean.
2014-03-12 01:24:31 +02:00
