Commit graph

84280 commits

Author SHA1 Message Date
Stephen Birarda
11a317da96 remove comments in processAgentData 2013-04-09 17:15:40 -07:00
Stephen Birarda
f2377ea541 some refactoring in updateDataForAllAgents 2013-04-09 17:14:27 -07:00
Philip Rosedale
5a98ebfff2 Merge remote-tracking branch 'origin' 2013-04-09 17:13:01 -07:00
Philip Rosedale
760aafef8e Changed to render a small box of a fixed pixel width at screen center, useful for testing LOD Changes. 2013-04-09 17:12:43 -07:00
Stephen Birarda
48077b62c8 remove unnecessary cast and other lines 2013-04-09 17:10:04 -07:00
Stephen Birarda
9f10be749e Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-09 17:04:20 -07:00
Stephen Birarda
7742d3114e add avatar mixer to agent type names, remove head 2013-04-09 17:03:10 -07:00
Stephen Birarda
ae7f3e71d8 broadcast to VS and avatar mixer on position change 2013-04-09 16:56:19 -07:00
Stephen Birarda
a0f3f161b1 move AvatarData class to AvatarAgentData subclass of AgentData 2013-04-09 16:39:57 -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
Leonardo Murillo
3f64c29bc9 Debugging 2013-04-09 15:54:16 -06:00
Leonardo Murillo
f07714ce5c Debugging 2013-04-09 15:51:08 -06:00
Jeffrey Ventrella
7d42b93489 condensed avatar bone line code 2013-04-09 14:45:19 -07:00
Jeffrey Ventrella
d05cf13870 Ya Ya Too Cool Too Cool
dsfdsf

Merge branch 'master' of https://github.com/worklist/hifi
2013-04-09 14:35:39 -07:00
Jeffrey Ventrella
ff53b1573c fixed bug in avatar arm IK prototype 2013-04-09 14:35:29 -07:00
Leonardo Murillo
1cf75b37f3 Changes to interface side of code 2013-04-09 15:30:30 -06:00
ZappoMan
42e1355f1e add back voxels.render() call 2013-04-09 14:11:55 -07:00
Leonardo Murillo
6bff444f15 Removing unnecessary header file 2013-04-09 14:58:27 -06:00
Leonardo Murillo
35a8207769 Deleting silent agents 2013-04-09 14:56:11 -06:00
Jeffrey Ventrella
d217481300 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-09 13:41:27 -07:00
Jeffrey Ventrella
e90dd52da4 resolve merge conflicts with origin/master 2013-04-09 13:30:26 -07:00
ZappoMan
f5634a66aa Got rid of AGENT_TYPE_HEAD and fixed voxel server to use AGENT_TYPE_INTERFACE 2013-04-09 13:27:15 -07:00
vincent
4f41aab89a last merge without Curl 2013-04-09 22:17:59 +02:00
Leonardo Murillo
64e563ef7c Sending packets to agents 2013-04-09 14:01:57 -06:00
Leonardo Murillo
e0c31d68d1 Merge branch 'master' of github.com:/worklist/hifi into 19170B 2013-04-09 14:01:38 -06:00
ZappoMan
712997451b Adding friendly names to AgentType display. 2013-04-09 13:00:20 -07:00
Jeffrey Ventrella
87c26a39fb adding more changes and small improvements to camera, and head... 2013-04-09 12:54:59 -07:00
Leonardo Murillo
f3a8e363dc pushing new agents into list and changes to private properties 2013-04-09 13:23:11 -06:00
ZappoMan
2ec3f6b210 Adding new AgentTypes.h and moving over to new constants 2013-04-09 10:37:07 -07:00
vincent
56aac7077c changes after merge 2013-04-09 19:12:49 +02:00
Leonardo Murillo
cb5d1b9214 Second take on Avatar Mixer 2013-04-09 09:22:34 -06:00
Leonardo Murillo
8c4c51a2e9 Merge branch 'master' of github.com:/worklist/hifi into 19170B 2013-04-09 09:19:37 -06: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
Philip Rosedale
492ea68741 Merge remote-tracking branch 'origin/master' 2013-04-08 20:12:00 -07:00
Philip Rosedale
b9b57b8cc0 Packet reply changed to constant in packetHeaders.h 2013-04-08 20:10:19 -07:00
Leonardo Murillo
577d0d8e1d Merge branch 'master' of github.com:/worklist/hifi into 19170B 2013-04-08 21:06:50 -06:00
ZappoMan
6eb503f6d0 hopefully fix build buster 2013-04-08 20:04:24 -07:00
ZappoMan
6079ec2d91 hopefully fix build buster 2013-04-08 20:02:10 -07:00
ZappoMan
ec9bd5efb3 hopefully fix build buster 2013-04-08 19:59:58 -07:00
ZappoMan
17f4c5d184 cleanup of packet header constants 2013-04-08 19:56:42 -07:00
ZappoMan
7480283dd4 cleanup of packet header constants 2013-04-08 19:54:14 -07:00
Philip Rosedale
032fff9d57 Merge remote-tracking branch 'origin' 2013-04-08 19:04:10 -07:00
Philip Rosedale
06a5e4d8a9 Adding more packet headers 2013-04-08 19:03:49 -07:00
Jeffrey Ventrella
e6a4647852 added a fix for other av rotation 2013-04-08 18:56:31 -07:00
Jeffrey Ventrella
191ee71dbb Merge remote-tracking branch 'origin' 2013-04-08 18:46:28 -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
Stephen Birarda
6f8808e565 add the ping reply header 2013-04-08 18:25:21 -07:00
Stephen Birarda
f018d8e323 replace ping header char in processAgentData switch case 2013-04-08 18:24:47 -07:00