Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 07:11:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6019 commits 75 branches 59 tags 1.2 GiB
Commit graph

6019 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
d224d95314 Merge branch 'master' of https://github.com/worklist/hifi into led 2013-08-28 11:18:23 -07:00
ZappoMan
d2de76d5c3 Merge pull request #892 from birarda/master 
require Qt5Script for avatars library
 2013-08-28 11:12:10 -07:00
Stephen Birarda
24a43c050c require Qt5Script for avatars library 2013-08-28 10:55:38 -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
e124c164c1 Merge pull request #891 from ZappoMan/large_tree_scale 
Add "Go To Domain" and "Go To Location" to file menu
 2013-08-27 12:51:14 -07:00
ZappoMan
a3bf373ffa revert TREE_SCALE and VOXEL_SCALE_SIZE for now 2013-08-27 11:41:22 -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