Commit graph

2149 commits

Author SHA1 Message Date
Stephen Birarda
cfd4a4a44a smarter wake microstamp update for solo agents in DS 2013-05-06 14:46:01 -07:00
birarda
c793f3385c Merge pull request #209 from birarda/master
ignore packets that DS receives that have the wrong headers
2013-05-06 13:49:59 -07:00
Stephen Birarda
9f320568e1 have the DS ignore packets it receives with incorrect headers 2013-05-06 13:49:06 -07:00
ZappoMan
4f7adf7a05 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-06 13:47:13 -07:00
birarda
a77d056fc1 Merge pull request #208 from birarda/master
fix incorrect pointer push breaking DS packets
2013-05-06 13:44:58 -07:00
Stephen Birarda
a4c525e308 don't commit birarda's local IP to AgentList 2013-05-06 13:44:40 -07:00
Stephen Birarda
f9edfd3b83 don't incorrectly push the broadcast packet pointer 2013-05-06 13:43:21 -07:00
Philip Rosedale
3b3e6ae075 Merge remote-tracking branch 'upstream/master' 2013-05-06 13:42:23 -07:00
birarda
188db4b6de Merge pull request #207 from birarda/master
add conditional closing of serial interface
2013-05-06 13:37:30 -07:00
Stephen Birarda
784fa5882a closing of serial interface should be conditional on __APPLE__ 2013-05-06 13:36:58 -07:00
ZappoMan
043a284d4d Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-06 13:36:31 -07:00
birarda
2563d6a093 Merge pull request #206 from birarda/master
fix eve's reference to Agent timestamp variables
2013-05-06 13:33:39 -07:00
Stephen Birarda
ab6a9285ad have eve reference new Agent timestamp variables 2013-05-06 13:33:15 -07:00
ZappoMan
64fcdfff8a Merge pull request #204 from birarda/invensense
close the serial interface in SerialInterface destructor
2013-05-06 13:32:48 -07:00
ZappoMan
7ba9d4aa86 First cut are removing out of view voxels and switch to using PerformanceWarnings 2013-05-06 13:32:09 -07:00
Stephen Birarda
250df35bc1 resolve conflicts on merge with upstream master 2013-05-06 13:31:50 -07:00
birarda
7508d594d1 Merge pull request #205 from birarda/domain-rfd
remove an extra character breaking build
2013-05-06 13:30:42 -07:00
Stephen Birarda
969bf7645a remove an accidentally added g 2013-05-06 13:30:10 -07:00
Philip Rosedale
eedbb98c32 Merge remote-tracking branch 'upstream/master' 2013-05-06 13:29:34 -07:00
Philip Rosedale
f39fa3549b invensense horizontal lines for RT indicator 2013-05-06 13:29:02 -07:00
ZappoMan
915d6e5024 Merge pull request #203 from birarda/domain-rfd
distinction between RFD packets and keepalive packets when talking to domain server
2013-05-06 13:28:18 -07:00
Stephen Birarda
6666229d83 close the serial file descriptor in destructor 2013-05-06 13:25:49 -07:00
Stephen Birarda
49042046de remove duplicated constructor after merge 2013-05-06 13:20:13 -07:00
Stephen Birarda
6d91e4721e Merge remote-tracking branch 'upstream/master' into domain-rfd 2013-05-06 13:18:34 -07:00
Stephen Birarda
ee4c55afe7 move SerialInterface constructor to header file 2013-05-06 13:18:06 -07:00
Stephen Birarda
2a240f6474 type star squish in domain server 2013-05-06 13:14:58 -07:00
Stephen Birarda
e8babd6d1e type star squish in domain server 2013-05-06 13:14:28 -07:00
Stephen Birarda
499899c6e0 if there are no active agents in list begin() iterator should be end() 2013-05-06 13:11:40 -07:00
birarda
3676da8cb2 Merge pull request #202 from birarda/master
bail on opening serial after two failed attempts
2013-05-06 13:09:55 -07:00
Stephen Birarda
0b810fa4c2 if we fail to open SerialInterface twice then don't keep trying 2013-05-06 13:09:15 -07:00
Stephen Birarda
f3a9dcf777 if we fail to open SerialInterface twice then don't keep trying 2013-05-06 13:08:45 -07:00
Philip Rosedale
e85e44456b Tweaking level indicators for new Invensense 2013-05-06 13:05:45 -07:00
Stephen Birarda
9e5f446ba2 update wake microstamp when receiving an RFD from an agent already in list 2013-05-06 12:51:43 -07:00
Jeffrey Ventrella
69734f41fc Merge pull request #201 from Ventrella/master
gravity fixes
2013-05-06 12:42:18 -07:00
Stephen Birarda
beca9cac8d update timestamp variables in Agent, use new packet headers for DS 2013-05-06 12:40:52 -07:00
Jeffrey Ventrella
d77a86fc6f Merge remote-tracking branch 'upstream/master' 2013-05-06 12:36:14 -07:00
Jeffrey Ventrella
2a1bbcc168 improved avatar gravity code and moved source of gravity vector to main.cpp 2013-05-06 12:35:52 -07:00
birarda
461c1a6b04 Merge pull request #200 from birarda/master
add missing new line to CMakeLists
2013-05-06 12:02:07 -07:00
Stephen Birarda
7c04244f53 add missing newline to root CMakeLists 2013-05-06 12:01:39 -07:00
birarda
2076dcc67f Merge pull request #196 from Ventrella/master
fixed physics bug and added avatar shadow
2013-05-06 11:39:12 -07:00
Jeffrey Ventrella
fcf37352d4 thingy 2013-05-06 11:32:04 -07:00
Jeffrey Ventrella
40213dfedd Merge remote-tracking branch 'upstream/master' 2013-05-06 11:31:33 -07:00
Jeffrey Ventrella
5c7fd0fe7d a few small formatting and glitch fixes 2013-05-06 11:29:18 -07:00
ZappoMan
e0d040a73b added removeChildAtIndex() which removes a node, but doesn't delete it 2013-05-06 11:02:28 -07:00
ZappoMan
17b137cc53 changed VoxelNodeBag to just compare pointers, since we don't really care about ordering the bag 2013-05-06 11:01:29 -07:00
ZappoMan
16b93f8c92 added PerformanceWarning class 2013-05-06 11:00:01 -07:00
ZappoMan
17e26b2d42 add matches() 2013-05-06 10:59:09 -07:00
ZappoMan
83c8ac6111 Merge pull request #198 from ey6es/master
Support for generating pick rays and finding intersections between rays and voxel nodes.
2013-05-06 10:55:15 -07:00
ZappoMan
ab7b2f4188 Merge pull request #195 from birarda/invensense
a basic setup to connect to invensense gyros
2013-05-06 10:41:20 -07:00
Stephen Birarda
37f1360542 fix spacing for gravity vector 2013-05-06 10:39:36 -07:00