Commit graph

1119 commits

Author SHA1 Message Date
ZappoMan
002d35932e Merge pull request #21 from birarda/19170B
Leo's Avatar Mixer + birarda's AgentData updates
2013-04-11 10:43:02 -07:00
Stephen Birarda
2827a1a447 send empty packet from avatar mixer for keepalive 2013-04-11 10:17:11 -07:00
Stephen Birarda
bdde66fec8 have avatar mixer reply with bulk packet immediately on receive 2013-04-11 09:53:24 -07:00
ZappoMan
0fff73e225 fixed plainting with new head implementation 2013-04-11 01:36:52 -07:00
ZappoMan
24862ca535 fixing up render view frustum, now it's working 2013-04-11 01:02:04 -07:00
Jeffrey Ventrella
cd8c760959 cleaned up some code 2013-04-11 00:10:52 -07:00
Jeffrey Ventrella
dbbe7500ac removed negative z hack in avatar. Avatar getting less hacky 2013-04-10 21:52:18 -07:00
Jeffrey Ventrella
6b4486c8c9 removed Vector3D class and fixed bug in avatar springs 2013-04-10 21:34:54 -07:00
ZappoMan
712b14c364 hacking on frustum for camera 2013-04-10 21:27:29 -07:00
ZappoMan
0f17c148f4 adding camera vs head for frustum view, not working yet 2013-04-10 21:21:13 -07:00
Jeffrey Ventrella
0564aa1a1b Hi!
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-10 21:12:20 -07:00
Jeffrey Ventrella
f294cc8782 working on avatar orientation issues 2013-04-10 21:12:15 -07:00
Philip Rosedale
34e5b670a2 Tweaked location and color of agents display for menu, removed audio start playback log 2013-04-10 18:01:18 -07:00
Philip Rosedale
859903274d Tweaks to menu to have right position under Mac, always on, slightly smaller font 2013-04-10 17:48:09 -07:00
Philip Rosedale
8b54b528c3 Fixed Menu to hit very top of screen on Mac 2013-04-10 17:35:53 -07:00
Philip Rosedale
6a5f1ac73e Merge remote-tracking branch 'origin/master' 2013-04-10 17:00:30 -07:00
Philip Rosedale
8d5ee616ac Added a debug menu option 2013-04-10 16:58:53 -07:00
Stephen Birarda
56f4484720 Merge branch 'master' of github.com:worklist/hifi 2013-04-10 16:57:34 -07:00
Stephen Birarda
6270659cdc inline declaration and initialization for menu 2013-04-10 16:56:15 -07:00
Jeffrey Ventrella
8429db73fa Hi there!
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-10 16:52:55 -07:00
Jeffrey Ventrella
020c21d1d6 removed Vector3D class and fixed bug in avatar springs 2013-04-10 16:52:48 -07:00
Stephen Birarda
19b9a0f5f5 include cstring in MenuColumn for strlen and strcpy 2013-04-10 16:18:26 -07:00
Stephen Birarda
189bfdfb36 add header comments to Vincent's menu files 2013-04-10 16:16:36 -07:00
Stephen Birarda
6665e62341 include cstring for strlen and strcpy 2013-04-10 16:13:27 -07:00
Stephen Birarda
27ab895381 have MenuColumn constructor take const char* 2013-04-10 16:10:50 -07:00
Stephen Birarda
b152d43f77 refactor menu callbacks and row/column adding 2013-04-10 16:07:46 -07:00
birarda
88c2e9510d Merge pull request #22 from dominiquevincent/19171
Code Review for Job #19171
2013-04-10 15:49:23 -07:00
vincent
ebc5874441 #19171 Missing Code Review changes - part 2 2013-04-11 00:47:53 +02:00
Stephen Birarda
3823809497 repairs in voxel server 2013-04-10 15:37:27 -07:00
Stephen Birarda
7731ae886a remove some more MARKER_CAPTURE code 2013-04-10 15:30:33 -07:00
Stephen Birarda
010c7e028d switch from strchr to memchr for broadcastToAgents 2013-04-10 15:30:21 -07:00
Jeffrey Ventrella
a2a7640bd2 merge
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-10 15:27:10 -07:00
Jeffrey Ventrella
3871c220b2 improved hand movement - now transformed to av rotation 2013-04-10 15:27:04 -07:00
vincent
b43475a34e #19171 Missing Code Review changes 2013-04-11 00:23:41 +02:00
Stephen Birarda
c378241afb NULL terminate the broadcastReceivers char* 2013-04-10 15:20:35 -07:00
vincent
cd1aa99dfa #19171 merge with master 2013-04-11 00:20:05 +02:00
Stephen Birarda
9a4f73e3bd fix undeclared identifier myHead 2013-04-10 15:14:42 -07:00
Stephen Birarda
666517c50e Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-10 15:14:12 -07:00
vincent
4dbff46234 #19171 Code Review changes 2013-04-11 00:13:40 +02:00
ZappoMan
5d1f11e413 fixed bug in frustrum direction, added viewing offset mode 2013-04-10 15:02:31 -07:00
Jeffrey Ventrella
a523a24c23 fixed hand motion stuff 2013-04-10 15:00:28 -07:00
Stephen Birarda
7bc822669a some column width fixes in domain server 2013-04-10 14:40:53 -07:00
Stephen Birarda
acc97282c9 bracket styling changes, removed commented code 2013-04-10 14:35:45 -07:00
Jeffrey Ventrella
797cec4513 hello!
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-10 14:29:14 -07:00
Jeffrey Ventrella
7b4d0b5598 removed bone spam 2013-04-10 14:29:08 -07:00
Stephen Birarda
d56952cdc7 don't copy agent delete mutex 2013-04-10 13:39:31 -07:00
vincent
eb646ade84 #19171 split of menu.cpp in menuColumn.cpp and menuRow.cpp 2013-04-10 22:39:01 +02:00
ZappoMan
4b7b5437ac some cleanup of view frustum debugging code 2013-04-10 13:26:21 -07:00
ZappoMan
7cd70b1f47 use Jeffery's code for view frustum debugging 2013-04-10 13:12:47 -07:00
vincent
d6189694c8 #19171 move of usleep function to SharedUtil.cpp 2013-04-10 21:55:29 +02:00