Andrzej Kapolka
|
650e9c4267
|
Silencio!
|
2013-09-03 18:15:51 -07:00 |
|
Andrzej Kapolka
|
6a3b2c7ad0
|
Get the blendshape names and read the blink amounts.
|
2013-09-03 16:44:06 -07:00 |
|
Andrzej Kapolka
|
b406dc7311
|
Log when attempting to connect and on failure. Wait a second before
attempting to reconnect.
|
2013-09-03 14:20:47 -07:00 |
|
Andrzej Kapolka
|
734cb83e81
|
Read Faceshift head translation/rotation.
|
2013-09-03 13:56:04 -07:00 |
|
Andrzej Kapolka
|
213a8fcd63
|
Working on Faceshift integration.
|
2013-09-03 11:52:32 -07:00 |
|
Andrzej Kapolka
|
7c3bb4ecc4
|
Merge branch 'master' of https://github.com/worklist/hifi into shifty
|
2013-09-03 11:00:29 -07:00 |
|
Andrzej Kapolka
|
843d5656bd
|
Fix for compile warnings on Linux: check return values on read/write.
|
2013-09-03 10:45:33 -07:00 |
|
atlante45
|
15a3a8d252
|
Some more code reformatting.
|
2013-09-03 10:32:38 -07:00 |
|
atlante45
|
26691118de
|
Some code reformatting.
|
2013-09-03 10:30:46 -07:00 |
|
Andrzej Kapolka
|
6f08df9e83
|
Link in Faceshift.
|
2013-09-03 10:03:15 -07:00 |
|
Andrzej Kapolka
|
cb3b7ca746
|
OS X build of Faceshift library.
|
2013-08-30 17:30:12 -07:00 |
|
Andrzej Kapolka
|
1f468a77f2
|
Added Faceshift-network library.
|
2013-08-30 17:19:41 -07:00 |
|
Andrzej Kapolka
|
c57118a64d
|
De-magicked a number.
|
2013-08-30 15:57:32 -07:00 |
|
Andrzej Kapolka
|
54f0a30290
|
Remove video stuff used in testing.
|
2013-08-30 15:56:16 -07:00 |
|
atlante45
|
77799fce54
|
Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports
|
2013-08-30 15:28:33 -07:00 |
|
atlante45
|
229821e211
|
Removed frustum display in preview mode
|
2013-08-30 15:28:10 -07:00 |
|
Andrzej Kapolka
|
86561b98cc
|
Merge branch 'master' of https://github.com/worklist/hifi into led
|
2013-08-30 15:16:22 -07:00 |
|
atlante45
|
f21a2798ff
|
Fixed _sharedVoxelSystemTree deleted twice
|
2013-08-30 10:37:55 -07:00 |
|
Stephen Birarda
|
b46bd1fd41
|
display the Avatar's hand in first person
|
2013-08-30 10:28:30 -07:00 |
|
atlante45
|
fc991bf1ac
|
Some code reformating
|
2013-08-29 18:11:16 -07:00 |
|
atlante45
|
1dc8d8dd0c
|
Added LOD to preview + Shared voxelSystem for reduced memory consumption
|
2013-08-29 17:59:36 -07:00 |
|
Andrzej Kapolka
|
fe47c6c387
|
Thresholding, more transform tweaks.
|
2013-08-29 16:44:56 -07:00 |
|
atlante45
|
7d9d36a66e
|
Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports
|
2013-08-29 11:23:06 -07:00 |
|
Andrzej Kapolka
|
c23eb92da9
|
Tweaking the transforms.
|
2013-08-29 10:45:55 -07:00 |
|
Andrzej Kapolka
|
28431b4c57
|
Testing transformation with video from FreeTrack project.
|
2013-08-28 15:02:33 -07:00 |
|
Andrzej Kapolka
|
b01f6df408
|
Tweaks for better LED tracking.
|
2013-08-27 17:53:36 -07:00 |
|
Andrzej Kapolka
|
e5e2f7ca00
|
Bump up the line width to make it easier to see the blobs.
|
2013-08-27 17:00:55 -07:00 |
|
Andrzej Kapolka
|
4d9954b2f4
|
More work on getting the transform.
|
2013-08-27 13:56:23 -07:00 |
|
Andrzej Kapolka
|
614f7cd28b
|
Merge branch 'master' of https://github.com/worklist/hifi into led
|
2013-08-27 13:12:54 -07:00 |
|
Andrzej Kapolka
|
18e91de7c6
|
Working on the code to get the transform from the blob locations.
|
2013-08-27 13:08:58 -07:00 |
|
Andrzej Kapolka
|
4720eac922
|
Use green rather than red for better blob visibility.
|
2013-08-26 17:01:04 -07:00 |
|
Andrzej Kapolka
|
799d2b487f
|
Initialization order fix.
|
2013-08-26 16:53:12 -07:00 |
|
Andrzej Kapolka
|
455565a9b9
|
Basic blob tracking for LEDs.
|
2013-08-26 16:49:20 -07:00 |
|
Andrzej Kapolka
|
8d8ba532e1
|
These initializers are in the wrong order.
|
2013-08-26 14:52:21 -07:00 |
|
Andrzej Kapolka
|
4ca8a10296
|
Starting on LED tracking.
|
2013-08-26 14:36:19 -07:00 |
|
ZappoMan
|
0df11124b3
|
tweak to how activateWindow() is called after dialog boxes
|
2013-08-26 14:24:42 -07:00 |
|
ZappoMan
|
943e1f9110
|
added Go To Domain, Go To Location, and tweaks to TREE_SCALE settings
|
2013-08-26 14:06:23 -07:00 |
|
ZappoMan
|
a9edf09f39
|
Merge pull request #889 from birarda/new-menu
implementing @problem's refactored menu setup
|
2013-08-23 16:30:44 -07:00 |
|
Stephen Birarda
|
818355dc1a
|
implementing @problem's proposed changes to menus
|
2013-08-23 15:18:06 -07:00 |
|
Andrzej Kapolka
|
28ffd8eca7
|
Render the ball heads with the voxeltar bodies.
|
2013-08-23 14:22:00 -07:00 |
|
Andrzej Kapolka
|
3682e32eb1
|
Yes, these should be consts.
|
2013-08-22 17:40:55 -07:00 |
|
Andrzej Kapolka
|
2cff4b6b3a
|
"Laser pointer" for transmitter.
|
2013-08-22 17:09:23 -07:00 |
|
atlante45
|
99321b3e09
|
Fixed VBOs not being deleted in VoxelSystem destructor
|
2013-08-22 15:43:58 -07:00 |
|
Andrzej Kapolka
|
3dfefefeae
|
Make the surrounding spheres glow when moving, too.
|
2013-08-22 14:00:50 -07:00 |
|
Andrzej Kapolka
|
2eaaee673f
|
Argh, forgot to return the result of the superclass implementation.
|
2013-08-22 13:52:10 -07:00 |
|
Andrzej Kapolka
|
7da9556815
|
Glow when moving.
|
2013-08-22 11:23:28 -07:00 |
|
Andrzej Kapolka
|
ff245427fd
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/avatar/Avatar.cpp
|
2013-08-22 10:40:15 -07:00 |
|
Andrzej Kapolka
|
165342bcc3
|
Have the local avatar glow when moving.
|
2013-08-22 10:35:21 -07:00 |
|
Stephen Birarda
|
6206d9e8db
|
fix for collisions when wearing Oculus
|
2013-08-21 17:42:13 -07:00 |
|
ZappoMan
|
69842ef82f
|
Merge pull request #878 from LionTurtle/master
Add MyAvatar class, subclass of Avatar class.
|
2013-08-21 16:55:24 -07:00 |
|