Stephen Birarda
405e79fe6d
allow command line specification that an external be required
2014-08-11 09:51:36 -07:00
Stephen Birarda
a370156720
add a note for OS X users to use homebrew
2014-07-18 15:39:21 -07:00
Stephen Birarda
e060693856
remove faceshift from repository, make external dependency
2014-07-18 13:54:44 -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
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
d56ab21192
Clean file formating
...
- Clean the classes declaration and body for
DeviceTracker
MotionTracker
ControllerScriptingInterface / InputController
Leapmotion
- final bug remaining in the LeapOfFaith..js
THe orientation assigned to the skeleton joints doesn't work even though
all looks good.
2014-07-07 09:24:23 -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
f1e2ba1267
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-03 09:25:03 -07:00
barnold1953
af30dc2722
Updated oculus readme.txt for windows users
2014-07-01 12:33:54 -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
3ce455aba4
Support for LeapMotion and worklist 19734
...
- Introduce the DeviceTracker class to abstract all the possible
devices
- Introduce the MotionTracker ( a DeviceTracker ) that contains a
transform tree of joints
- Add Leapmotion class as a MotionTracker and the support for the
Leapmotion sdk in external
- Add InputController as the abstraction of a MotionTracker/Joint for
Javascript
2014-07-01 03:15:26 -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
5a2d2bba8f
Updated readme.txt
2014-06-30 12:42:43 -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
Andrzej Kapolka
4a0b4de178
Better instructions.
2014-05-12 17:55:07 -07:00
Andrzej Kapolka
e0486b2654
Starting on PrioVR integration.
2014-05-12 15:25:25 -07:00
Andrzej Kapolka
4deb052d5d
More work on Faceplus integration.
2014-04-09 11:54:55 -07:00
Andrzej Kapolka
98011da1ef
Starting on Faceplus integration.
2014-04-08 17:07:45 -07:00
Brad Hefta-Gaub
4a6cc99be6
slightly different approach to windows warning fix
2014-03-15 21:30:45 -07:00
Brad Hefta-Gaub
2766860b52
fix some windows warnings in fsbinarystream.cpp
2014-03-14 18:11:22 -07:00
Andrzej Kapolka
2005b8dd9d
Slight tweak to Visage instructions (in order not to overwrite our custom
...
configuration).
2014-03-10 15:16:48 -07:00
Stephen Birarda
a72cac8c9c
default to using Release LibOVR, include instructions for OS X rebuild
2014-03-07 14:31:59 -08:00
Stephen Birarda
e96e88b3b3
remove a warning that no longer needs to be heeded
2014-03-07 14:19:45 -08:00
Stephen Birarda
1bd3529395
more module fixes and sixense readme change for OS X dylib
2014-03-07 13:59:50 -08:00
Stephen Birarda
cabbfb9a9e
fix typos in updated sixense and oculus READMEs
2014-03-07 10:36:19 -08:00
Stephen Birarda
68c5d72a0f
update sixense and oculus readme to suggest use of HIFI_LIB_DIR
2014-03-07 10:30:43 -08:00
Stephen Birarda
3b06bbd88d
move sixense directory to lowercase, have find module look in env dir
2014-03-07 09:59:24 -08:00
Stephen Birarda
a364655f63
Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals
2014-03-07 09:40:50 -08:00
Stephen Birarda
0f5fbb5fab
pull out glew and freeglut so they can be external dependencies
2014-03-06 17:09:59 -08:00
Stephen Birarda
816a631b05
tweak the oculus find module to take copied-in folders
2014-03-06 14:16:38 -08:00
Stephen Birarda
628f91cd73
complete quoting of varous Cmake commands, closes #1999
2014-03-03 12:15:05 -08:00
Andrzej Kapolka
b3fba320fc
We need the dependencies, too.
2014-02-11 17:03:24 -08:00
Andrzej Kapolka
25066f8b4f
Starting on Visage integration.
2014-02-11 16:44:25 -08:00
Andrzej Kapolka
78e15e0212
Starting on Visage support.
2014-02-11 16:03:23 -08:00
Brad Hefta-Gaub
ef98a74ec8
Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build
2014-01-16 14:33:44 -08:00
Brad Hefta-Gaub
87bb4e691c
remove glut and clean up windows build cmake
2014-01-16 14:27:08 -08:00
Stephen Birarda
e8b6f8a7e4
remove docs from glew and freeglut
2014-01-16 14:24:04 -08:00
Stephen Birarda
323aa18c0e
remove MotionDriver and pthread libraries
2014-01-16 14:16:38 -08:00
Andrzej Kapolka
865b495e6c
Merge branch 'master' of https://github.com/worklist/hifi into debone
...
Conflicts:
interface/src/Audio.cpp
interface/src/Menu.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Webcam.cpp
interface/src/devices/Webcam.h
interface/src/renderer/FBXReader.cpp
2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
25af277f65
adding glew external for windows build
2014-01-14 19:16:15 -08:00
Brad Hefta-Gaub
35016c7d69
make faceshift compile sources on windows to address linker error
2014-01-14 10:20:27 -08:00
Brad Hefta-Gaub
73aae6ef02
adding more opencv libraries and fix cmake for opencv and faceshift for windows
2014-01-13 20:12:11 -08:00
Brad Hefta-Gaub
a24dbfce0b
opencv windows libs
2014-01-13 17:04:20 -08:00
Brad Hefta-Gaub
e60446a632
more windows build work
2014-01-13 15:57:31 -08:00
