Stephen Birarda
2796f71419
library cleanup to suppress warnings on cmake 3.0
2014-07-30 15:06:15 -07:00
Stephen Birarda
5bc42b9d1c
add back the lost QXMPP_STATIC definition
2014-07-24 17:02:30 -07:00
Stephen Birarda
5cbd1492f2
more Cmake cleanup to grab externals
2014-07-24 15:09:41 -07:00
Stephen Birarda
1d78427e6a
only override root dir for interface externals if they don't exist
2014-07-24 14:09:49 -07:00
Stephen Birarda
4cf27a0099
check in sixense not Sixense
2014-07-23 17:44:38 -07:00
Stephen Birarda
5c955ca656
fix faceshift definition
2014-07-22 14:48:51 -07:00
Stephen Birarda
e060693856
remove faceshift from repository, make external dependency
2014-07-18 13:54:44 -07:00
Stephen Birarda
9e83040fb4
more find module standardization and cleanup
2014-07-18 10:20:12 -07:00
Stephen Birarda
e619393ac0
link to GLEW_LIBRARIES instead of GLEW_LIBRARY in interface CMakeLists
2014-07-18 10:12:52 -07:00
Stephen Birarda
b0864b01de
cleanup the FindPrioVR module and fix GLUT include
2014-07-18 10:05:58 -07:00
Stephen Birarda
cb384ac01b
final repairs to LibOVR for multiple include folders
2014-07-17 17:24:47 -07:00
Stephen Birarda
3fad0e6ac8
cleanup qxmpp find module, use select_library_confgurations
2014-07-17 16:49:17 -07:00
Stephen Birarda
68f9334628
cleanup Faceplus and Faceshift find modules, fix for OVR stitched include
2014-07-17 16:37:10 -07:00
Stephen Birarda
ffb0ea30f8
Merge branch 'master' of https://github.com/highfidelity/hifi into select-library
2014-07-17 16:12:24 -07:00
Stephen Birarda
e7269e809e
allow use of debug/release leapmotion library with select_library_configurations
2014-07-17 15:41:47 -07:00
Stephen Birarda
03a052d89c
add debug/release linking to sixense via select_library_configurations
2014-07-17 15:27:55 -07:00
Stephen Birarda
074d7f40bb
add dynamic selection of debug or release for oculus libraries
2014-07-17 15:10:32 -07:00
Stephen Birarda
cebd379b68
don't pass OpenSSL libraries as string
2014-07-17 14:47:45 -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
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
samcake
f179b0e9ca
Merge remote-tracking branch 'origin/master' into 19734
...
Conflicts:
cmake/modules/FindLeapMotion.cmake
interface/CMakeLists.txt
interface/src/devices/Leapmotion.h
2014-07-08 12:43:32 -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
29407d5858
Revert "Add LeapMotion SDK support"
...
This reverts commit 291c446c28
2014-06-11 00:10:26 -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
a9c2e3fe71
put back ssize_t definition
2014-05-20 11:56:06 -07:00
Stephen Birarda
0e7615391c
don't look for GnuTLS from cmake
2014-05-20 10:35:04 -07:00
Stephen Birarda
e6fa1c55db
assume we are using a Qt build without bearer management
2014-05-16 17:06:17 -07:00
Andrzej Kapolka
6dd08ca1bf
Working on joystick support using SDL.
2014-05-15 17:09:28 -07:00
Philip Rosedale
186f7766fc
Merge pull request #2856 from ZappoMan/modelserver
...
Animation Support in Models
2014-05-14 15:03:49 -07:00
Andrzej Kapolka
e0486b2654
Starting on PrioVR integration.
2014-05-12 15:25:25 -07:00
ZappoMan
106c8bffd8
first cut at animations in models
2014-05-09 16:08:06 -07:00
ZappoMan
0182a6d895
models working end to end
2014-04-30 11:12:49 -07:00
ZappoMan
aac42058ac
first cut at modelserver
2014-04-30 09:25:52 -07:00
Andrzej Kapolka
a2dc58f7f9
Moved FBX code to its own library so that we can use it for bots.
2014-04-14 17:15:58 -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
Atlante45
100c3f8da4
Modify UIs that were using the qrc
2014-04-11 11:59:23 -07:00
Stephen Birarda
54647f0f08
make sure gnutls define for ssize_t comes before gnutls include
2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac
add ssize_t definition for gnutls.h include on Windows
2014-04-10 10:19:45 -07:00
Stephen Birarda
68c445e718
link GnuTLS to targets linking the networking library
2014-04-10 10:00:10 -07:00
Stephen Birarda
d5d52f804f
add a networking library and link from appropriate targets
2014-04-10 09:32:17 -07:00
