Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 22:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2075 commits 71 branches 56 tags 1.2 GiB
Commit graph

2075 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
64fcdfff8a Merge pull request #204 from birarda/invensense 
close the serial interface in SerialInterface destructor
 2013-05-06 13:32:48 -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
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
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
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
Stephen Birarda
928beac8e0 Merge branch 'master' of github.com:worklist/hifi into invensense 2013-05-06 10:38:53 -07:00
Andrzej Kapolka
4d33c462fe Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/voxels/src/VoxelTree.h
 2013-05-06 09:45:57 -07:00
Philip Rosedale
d92b648bf4 Merge pull request #197 from ZappoMan/render_voxels_optimization 
Voxel Persistence in server, voxel-edit tool for creating voxel files, new VoxelTree features
 2013-05-05 21:33:17 -07:00
ZappoMan
34982227e4 removed color reaveraging from readNodeData() because server will already send averages 2013-05-04 21:58:16 -07:00
ZappoMan
0a488e3585 whitespace fixes 2013-05-04 09:48:11 -07:00
ZappoMan
17fbc2347b removed signal handlers, since we weren't using them and they were segfaulting 2013-05-04 09:46:03 -07:00
ZappoMan
eb56810ef2 make default server behavior be voxel persistance 2013-05-04 09:41:45 -07:00
ZappoMan
6a32424fb2 make readFromFileV2() return bool for file exists 2013-05-04 09:41:10 -07:00
ZappoMan
89eefe461d persist voxels in main loop 2013-05-04 09:20:22 -07:00
ZappoMan
c1847a7511 set dirty bit on tree in a couple new places 2013-05-04 09:19:46 -07:00
ZappoMan
3ed19ccb91 fixed comment 2013-05-04 08:28:00 -07:00
ZappoMan
24dee12d67 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-04 08:25:35 -07:00
ZappoMan
2dbf6f85cf Merge pull request #199 from ZappoMan/master 
fixed bug in case of bogus avatar position file
 2013-05-04 08:24:04 -07:00
ZappoMan
7d1e271c39 fix bug in bogus avatar data file 2013-05-04 08:23:06 -07:00
Andrzej Kapolka
aff465b17b Missed a spot with the conversion from pointers to references. 2013-05-04 07:59:45 -07:00
Andrzej Kapolka
34565a4956 Pointers to references for in/out parameters, renamed line parameter to more 
descriptive "distance."
 2013-05-04 07:56:30 -07:00
ZappoMan
5253485261 added TREE_SCALE to default camera farClip 2013-05-04 07:46:42 -07:00
Andrzej Kapolka
ff4e21e504 Remaining pick bits. 2013-05-03 20:12:46 -07:00
ZappoMan
1967526675 adding command options 2013-05-03 19:36:40 -07:00
ZappoMan
286c6e0e39 fixed local domain 2013-05-03 19:36:30 -07:00
ZappoMan
48a597a9b9 added --wantVoxelPersist command line to server 2013-05-03 19:29:25 -07:00