Andrzej Kapolka
|
8fec78d82a
|
Disable random saccades for own eyes.
|
2013-09-09 13:48:46 -07:00 |
|
Andrzej Kapolka
|
03ead34642
|
Code review cleanup.
|
2013-09-05 10:34:43 -07:00 |
|
Andrzej Kapolka
|
834b671f5a
|
Merge branch 'master' of https://github.com/worklist/hifi into shifty
|
2013-09-04 15:32:15 -07:00 |
|
atlante45
|
b8c18bee2d
|
merge
|
2013-09-04 15:31:12 -07:00 |
|
atlante45
|
5da525fc3e
|
memory wastes and code cleaning PR comments
|
2013-09-04 15:12:24 -07:00 |
|
Andrzej Kapolka
|
0a9db6a5ee
|
Moved device-related files to "devices" folder.
|
2013-09-04 12:15:36 -07:00 |
|
Andrzej Kapolka
|
5e23c79192
|
Tweaked feature scales, send recalibrate request on reset.
|
2013-09-04 11:55:55 -07:00 |
|
Andrzej Kapolka
|
679926ce42
|
Working on brow/mouth mapping.
|
2013-09-04 11:40:53 -07:00 |
|
Andrzej Kapolka
|
f84d6f4f37
|
Fix for eye pitch, track blinking locally.
|
2013-09-04 10:59:53 -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
|
86561b98cc
|
Merge branch 'master' of https://github.com/worklist/hifi into led
|
2013-08-30 15:16:22 -07:00 |
|
Stephen Birarda
|
b46bd1fd41
|
display the Avatar's hand in first person
|
2013-08-30 10:28:30 -07:00 |
|
Andrzej Kapolka
|
799d2b487f
|
Initialization order fix.
|
2013-08-26 16:53:12 -07:00 |
|
Andrzej Kapolka
|
8d8ba532e1
|
These initializers are in the wrong order.
|
2013-08-26 14:52:21 -07:00 |
|
Andrzej Kapolka
|
28ffd8eca7
|
Render the ball heads with the voxeltar bodies.
|
2013-08-23 14:22:00 -07:00 |
|
Andrzej Kapolka
|
2cff4b6b3a
|
"Laser pointer" for transmitter.
|
2013-08-22 17:09:23 -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 |
|
LionTurtle
|
3eb0a1a190
|
Magic number removal...
|
2013-08-21 16:35:16 -07:00 |
|
LionTurtle
|
e252d3b2ac
|
Style and spacing changes in MyAvatar/Avatar classes.
|
2013-08-21 16:32:06 -07:00 |
|
LionTurtle
|
a6109d411b
|
Remove unnecessary comments and spaces.
|
2013-08-21 13:47:19 -07:00 |
|
LionTurtle
|
bb9af3103c
|
Remove unused setNoise() function in MyAvatar.h that was causing
build error.
|
2013-08-21 13:44:01 -07:00 |
|
LionTurtle
|
de9bd9e1b8
|
Add MyAvatar and resolve merge conflicts.
|
2013-08-21 13:38:23 -07:00 |
|
LionTurtle
|
1300bf7de2
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
|
2013-08-21 13:36:28 -07:00 |
|
LionTurtle
|
f4109b3fb4
|
Add MyAvatar subclass. For functions such as render() and simulate(),
they have been edited so that there are MyAvatar and Avatar specific
versions in their respective classes. isMyAvatar() has been removed.
|
2013-08-21 13:24:54 -07:00 |
|
Andrzej Kapolka
|
f39050ae28
|
Enable lookat vectors by default and make them glow.
|
2013-08-21 11:37:57 -07:00 |
|
Andrzej Kapolka
|
222e026662
|
Use a small default lean scale.
|
2013-08-19 13:18:20 -07:00 |
|
Andrzej Kapolka
|
8d65323345
|
Restore the gyro-only lean behavior based on linear accelerometer data.
|
2013-08-19 13:14:35 -07:00 |
|
Stephen Birarda
|
d4951b0223
|
fix getter for Hand and Head
|
2013-08-15 16:09:44 -07:00 |
|
Stephen Birarda
|
9816e1d9a8
|
some spacing cleanup in Head
|
2013-08-15 16:09:00 -07:00 |
|
Stephen Birarda
|
6cbe0ca3d0
|
some spacing cleanup in Avatar header
|
2013-08-15 16:04:42 -07:00 |
|
Stephen Birarda
|
811fc87294
|
move avatar size changes to Avatar slots
|
2013-08-15 12:18:19 -07:00 |
|
Stephen Birarda
|
bbe239694e
|
move Avatar goHome to Avatar slot
|
2013-08-15 11:36:12 -07:00 |
|
Stephen Birarda
|
f5079374f3
|
fix hooks for skeleton tracking and collisions
|
2013-08-15 11:29:10 -07:00 |
|
Stephen Birarda
|
10109fff10
|
inlined spacing cleanup in Head, remove noise
|
2013-08-15 11:04:18 -07:00 |
|
Stephen Birarda
|
46b064b7d6
|
initial decoupling of menu from Application
|
2013-08-15 10:46:51 -07:00 |
|
atlante45
|
521eb19625
|
PR comments + Changed MIN and MAX scale
|
2013-08-08 16:22:26 -07:00 |
|
atlante45
|
f5fe965093
|
Position based follow mode whith head movement
|
2013-08-08 15:49:35 -07:00 |
|
Eric Johnston
|
a20668951a
|
Merge branch 'master' of git://github.com/worklist/hifi into dev4
|
2013-08-07 17:06:43 -07:00 |
|
Stephen Birarda
|
655a27b257
|
Merge pull request #825 from Atlante45/master
Fix other avatar not rendered in first person
|
2013-08-07 16:44:23 -07:00 |
|
atlante45
|
4449b46466
|
Fix other avatar not rendered in first person
|
2013-08-07 16:38:02 -07:00 |
|
Eric Johnston
|
524e5dd130
|
Fixed fencepost error to make trails slightly cleaner
|
2013-08-07 16:33:38 -07:00 |
|
Eric Johnston
|
a01b36c7a5
|
Merge branch 'master' of git://github.com/worklist/hifi into dev4
|
2013-08-07 16:22:21 -07:00 |
|