Commit graph

6028 commits

Author SHA1 Message Date
Stephen Birarda
36c2f42b5c correct copying of assignment pool across targets 2013-09-04 11:50:39 -07:00
Andrzej Kapolka
679926ce42 Working on brow/mouth mapping. 2013-09-04 11:40:53 -07:00
Stephen Birarda
ebc7de3a90 add methods for packing and unpacking of Assignments 2013-09-04 11:37:11 -07:00
Stephen Birarda
9260bee653 add assignment pool passing to DS, cleanup in AS 2013-09-04 11:13:37 -07:00
Stephen Birarda
bc5ad37395 allow passing of pool to assignment-client via cl param 2013-09-04 11:00:59 -07:00
Andrzej Kapolka
f84d6f4f37 Fix for eye pitch, track blinking locally. 2013-09-04 10:59:53 -07:00
Andrzej Kapolka
2c2f2fad5a Lookat adjustment. 2013-09-04 10:53:07 -07:00
Andrzej Kapolka
0d593c4a3f When Faceshift is active, use its eye directions rather than the mouse ray. 2013-09-04 10:46:11 -07:00
Stephen Birarda
29e5eda358 add notion of pool and direction to Assignment class 2013-09-04 10:43:16 -07:00
atlante45
1781abe937 Added Menu instance deletion in Application destructor. 2013-09-04 10:40:42 -07:00
atlante45
a1e433e189 Updated Application destructor 2013-09-04 10:24:10 -07:00
Stephen Birarda
f485814a42 keep more than one assignment in the queue 2013-09-04 10:14:53 -07:00
Stephen Birarda
94740eed60 remove the audio-mixer target 2013-09-04 10:11:26 -07:00
Stephen Birarda
b64e3dd82f Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-04 10:07:02 -07:00
Andrzej Kapolka
697484d0bb Another coordinate tweak. 2013-09-03 18:29:46 -07:00
Andrzej Kapolka
3423053612 Coordinate system tweaks. 2013-09-03 18:23:02 -07:00
Andrzej Kapolka
650e9c4267 Silencio! 2013-09-03 18:15:51 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
Andrzej Kapolka
6a3b2c7ad0 Get the blendshape names and read the blink amounts. 2013-09-03 16:44:06 -07:00
atlante45
06119990e8 Fixed ui related files memory wastes 2013-09-03 14:47:50 -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
atlante45
7688dc4779 Fixed renderer related files memory wastes 2013-09-03 13:50:01 -07:00
atlante45
688bc17954 Fixed avatar related files memory wastes 2013-09-03 13:37:25 -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
f0bb42a988 Merge pull request #899 from ey6es/master
Fix for compile warnings on Linux: check return values on read/write.
2013-09-03 10:47:36 -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
Andrzej Kapolka
2aaff63b32 Merge pull request #896 from Atlante45/some_more_work_on_imports
Some more work on imports
2013-09-03 10:37:30 -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
atlante45
38133ac6f2 Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-09-03 10:16:44 -07:00
Andrzej Kapolka
6f08df9e83 Link in Faceshift. 2013-09-03 10:03:15 -07:00
Andrzej Kapolka
4d8a540116 Merge pull request #898 from Atlante45/master
Fixed png bug
2013-08-30 17:38:10 -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
atlante45
66425763b8 Revert "Fixed glBuffers not deleted in VoxelSystem"
This reverts commit 9224bca88b.
2013-08-30 16:01:18 -07:00
Andrzej Kapolka
c57118a64d De-magicked a number. 2013-08-30 15:57:32 -07:00
atlante45
0068b838b2 Fixed importer crashing on non ARGB32 png. 2013-08-30 15:56:28 -07:00
Andrzej Kapolka
54f0a30290 Remove video stuff used in testing. 2013-08-30 15:56:16 -07:00
atlante45
1bc1998023 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-30 15:55:04 -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
37e6b32741 Merge pull request #895 from birarda/master
display the hand in first person
2013-08-30 10:29:16 -07:00
Stephen Birarda
b46bd1fd41 display the Avatar's hand in first person 2013-08-30 10:28:30 -07:00
LionTurtle
62b29d26d2 Nudge function added. Testing nudge. 2013-08-29 18:17:06 -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