Commit graph

71 commits

Author SHA1 Message Date
Jeffrey Ventrella
228f76c789 Thingy!
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-10 12:54:57 -07:00
Jeffrey Ventrella
be5044c560 flipped y direction of up-down avatar navigation 2013-04-10 12:54:52 -07:00
Philip Rosedale
d57a4428d9 deleted unused stuff that caused conflict with myAvatar change 2013-04-10 12:47:40 -07:00
Jeffrey Ventrella
089271f615 whatever you say, git.
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-10 12:13:03 -07:00
Jeffrey Ventrella
ab8140e0ef fixed a bug in avatar head lookat direction 2013-04-10 12:12:57 -07:00
vincent
1e2e505301 Another merge and fix ... 2013-04-10 20:41:46 +02:00
Jeffrey Ventrella
8f969f9ca9 adding ground plane grid (again???) 2013-04-10 01:03:35 -07:00
Jeffrey Ventrella
81b311f753 added a method to ask the avatar for it's head lookat vector 2013-04-09 18:41:01 -07:00
Jeffrey Ventrella
3dae70e665 removed glm::dvec3 and replaced with glm::vec3 in most of avatar code, except for velocity 2013-04-09 15:23:59 -07:00
Jeffrey Ventrella
09af8d153f added camera modes and also set initial avatar yaw to 90 2013-04-09 15:05:37 -07:00
Jeffrey Ventrella
7d42b93489 condensed avatar bone line code 2013-04-09 14:45:19 -07:00
Jeffrey Ventrella
ff53b1573c fixed bug in avatar arm IK prototype 2013-04-09 14:35:29 -07:00
Jeffrey Ventrella
e90dd52da4 resolve merge conflicts with origin/master 2013-04-09 13:30:26 -07:00
Jeffrey Ventrella
87c26a39fb adding more changes and small improvements to camera, and head... 2013-04-09 12:54:59 -07:00
vincent
56aac7077c changes after merge 2013-04-09 19:12:49 +02:00
Philip Rosedale
60dc43041f added rendering lines between avatar bones 2013-04-08 22:42:45 -07:00
Philip Rosedale
87fd0f7a91 Fixed avatar lighting, head scaling, removed some extra log messages 2013-04-08 21:13:20 -07:00
Jeffrey Ventrella
e6a4647852 added a fix for other av rotation 2013-04-08 18:56:31 -07:00
Jeffrey Ventrella
cd1533dc7c Lots of small changes in the head (evolving into "avatar") to include skeleton. Also, added camera behaviors for navigation 2013-04-08 18:46:00 -07:00
Jeffrey Ventrella
a0f09b597a got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:19:23 -07:00
Jeffrey Ventrella
d3f6c19e83 adding Camera and some utility classes and start of prototype avatar 2013-04-04 18:04:32 -07:00
vincent
622053b38c #19197 Create basic visual studio 2013-03-29 20:20:52 +01:00
Stephen Birarda
a41b003582 perform proper verification for creation of new sphere 2013-03-28 11:47:23 -07:00
Stephen Birarda
084b77be50 NULL sphere pointer on Head copy 2013-03-28 11:37:49 -07:00
Stephen Birarda
d2a8da890f don't make the eye sphere a global object 2013-03-28 11:36:41 -07:00
Philip Rosedale
0b044d01d5 always be making random left/right/mouth eye contact 2013-03-27 16:00:40 -07:00
Philip Rosedale
c0cb88e21b Added keyboard controls for smooth rotation, more junk removed from main.cpp 2013-03-27 15:54:54 -07:00
Philip Rosedale
642b64dfd6 First commit to improve avatar movement 2013-03-26 17:32:54 -07:00
Philip Rosedale
e0ee6c269a Added thrust and velocity to avatar head, first part of movement improvements 2013-03-26 11:53:57 -07:00
Stephen Birarda
95926cb7fc conditional chdir for OS X resources, revert windows Head changes 2013-03-21 17:02:41 -07:00
Stephen Birarda
e2a28b48db revert Head.cpp to earlier commit to confirm source of direction changes 2013-03-21 16:51:45 -07:00
Kees van Prooijen
d70da7f215 some more warning removal, temporarily excluding portaudio for windows 2013-03-19 11:49:36 -07:00
Stephen Birarda
d51f52c307 add back fred's flange, with some tuning 2013-03-12 13:59:19 -07:00
Stephen Birarda
0739d39568 add missing copy constructors for Head and Hand 2013-03-12 10:42:41 -07:00
stojce
8e6c98661b merge conflicts 2013-03-12 18:12:58 +01:00
Philip Rosedale
9f21c76380 Merge remote-tracking branch 'origin/master' 2013-03-11 16:22:16 -07:00
Philip Rosedale
674bd8d798 transmitter full movement, and audio jitter buffer tweaks/debugging data 2013-03-11 16:19:55 -07:00
Stephen Birarda
5d02d563b3 remove the flange until it's ready for primetime
This reverts commit 5652d0dcd3.
2013-03-10 15:04:23 -07:00
Stephen Birarda
5652d0dcd3 add a flange effect when turning head with gyros 2013-03-08 17:18:28 -08:00
stojce
2a4a7b4ab8 call gluDeleteQuadric only if sphare is initialised 2013-03-06 08:16:40 +01:00
stojce
3b3ab9f68f set texture binding of first render call only 2013-03-06 08:08:18 +01:00
Stephen Birarda
4648ce033e remove the flanger that isn't working as expected
This reverts commit a7deca0ced.
2013-03-04 10:37:55 -08:00
Stephen Birarda
a7deca0ced add a broken flanger 2013-03-04 10:37:48 -08:00
Philip Rosedale
1dd3a9970d Eyebrows driven by audio, mouth doesn't turn red. 2013-02-26 18:44:42 -08:00
stojce
7bda2c0581 #19069 Add iris textures to avatar head, change lighting 2013-02-27 01:53:07 +01:00
Stephen Birarda
f55782b968 refactor mixer to use AgentList, AudioRingBuffer as AgentData 2013-02-27 01:52:56 +01:00
Stephen Birarda
abfd3a0168 refactor mixer to use AgentList, AudioRingBuffer as AgentData 2013-02-25 17:07:32 -08:00
Philip Rosedale
d272a7de31 Head: Added roll to lean decoupling constants, appropriate physical limits on angles for head, reduced sensitivity. 2013-02-22 22:37:11 -08:00
Stephen Birarda
04186664a3 the proper way to temporarily disable hand render 2013-02-22 16:44:29 -08:00
Stephen Birarda
a20a162502 don't move user view with their gyro, temporarily hide hand 2013-02-22 16:43:41 -08:00