Bradley Austin Davis
5e5bdec88d
Merge branch 'master' into oculus_old_renderer
2015-03-30 16:36:00 -07:00
David Rowe
7dbe92f56f
Building with Sixense build requires four of the SDK libraries
2015-03-21 14:22:09 -07:00
Brad Davis
d838b78df9
Merging from upstream
2015-03-04 21:53:31 -08:00
Stephen Birarda
38f77190eb
remove PrioVR from build files
2015-02-26 17:20:45 -08:00
Brad Davis
5ec0ad14c1
Merge branch 'master' into oculus
2015-02-23 20:21:43 -08:00
David Rowe
3a95614ca4
Update Faceshift readme.txt with Windows instructions
2015-02-20 11:29:51 -08:00
Brad Davis
16feaceab5
Working on oculus build
2015-02-20 09:32:25 -08:00
Stephen Birarda
763994da5a
handle gverb move to audio-client
2015-01-29 12:44:03 -08:00
Thijs Wenker
80a81043ed
Merge branch 'master' of https://github.com/highfidelity/hifi into 20216
...
Conflicts:
interface/src/Menu.cpp
2015-01-15 02:28:31 +01:00
David Rowe
968a34f966
Add instructions for building with SDL2
2015-01-11 11:44:16 -08:00
Chris Collins
0a1a64b7e6
Script updates and fixes to highfidelity-public
...
Script updates and fixes to highfidelity-public
2015-01-06 17:04:42 -08:00
Thijs Wenker
f67df35f03
rssdk instructions
2014-12-19 16:36:06 +01:00
Andrew Meadows
419e00cbdc
fix typo from overwrite of gverb/readme.txt
2014-11-26 10:41:23 -08:00
Andrew Meadows
3262c9a8bd
don't lookup entity when deleting script
2014-11-26 10:27:03 -08:00
Atlante45
1ae1d28e7b
typo
2014-10-23 14:07:42 -07:00
Atlante45
93a0eb18bd
Added readme
2014-10-22 16:50:02 -07:00
Atlante45
ccc8e0d876
Statically link gverb
2014-10-22 12:56:44 -07:00
Atlante45
1739cf019d
Gverb library CMakeLists
2014-10-22 11:35:51 -07:00
Atlante45
d81158f941
Remove Gverb source code
2014-10-21 17:45:21 -07:00
Atlante45
5d146a00e7
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
...
Conflicts:
interface/CMakeLists.txt
2014-10-16 15:21:34 -07:00
Stephen Birarda
fcd73858b8
remove Faceplus as a face tracker option
2014-10-15 15:13:52 -07:00
NextPrior
a0a5530641
Initial reverb implementation
...
Conflicts:
interface/CMakeLists.txt
interface/src/Audio.cpp
interface/src/Audio.h
libraries/script-engine/src/ScriptEngine.cpp
2014-10-13 18:13:51 -07:00
David Rowe
cd81d6fc07
Bring libovr build instructions up to date
2014-08-21 19:24:09 -07:00
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
