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

4472 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
9834c10610 movement to use AudioInjector classes in Operative code 2013-07-11 17:47:35 -07:00
Stephen Birarda
4ebc381e40 update dummy operative code for change to packet type 2013-07-11 14:43:41 -07:00
Stephen Birarda
d6601ad333 resolve conflicts on merge with upstream master 2013-07-11 14:33:50 -07:00
Andrzej Kapolka
c3242598f5 Merge pull request #655 from ZappoMan/occlusion_culling 
Make Delta Sending Default, Added option for "Low Res" mode while moving
 2013-07-11 14:08:22 -07:00
ZappoMan
f878d549c0 Merge pull request #652 from ey6es/master 
Improved compass fusion for gyros.
 2013-07-11 13:55:40 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
ZappoMan
7175186e54 Merge pull request #654 from birarda/master 
fix environment packet sending
 2013-07-11 13:43:59 -07:00
Stephen Birarda
4cf0b7ea66 switch back to statics for domain server check in, fix environment packets 2013-07-11 13:40:29 -07:00
Stephen Birarda
e96ed2bcbd fix environment packet header length 2013-07-11 13:35:39 -07:00
Andrzej Kapolka
08d2c70db5 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 13:19:07 -07:00
ZappoMan
241bd7ce37 added support for lower LOD when moving with low res moving 2013-07-11 13:16:52 -07:00
ZappoMan
cb59df4b9e Merge pull request #653 from birarda/master 
refactor sendDomainServerCheckIn to avoid static variable threading issue
 2013-07-11 13:08:15 -07:00
Stephen Birarda
66a998e752 correct use of member variables for DS check in 2013-07-11 13:05:15 -07:00
Stephen Birarda
a0226b2548 avoid static variable thread issue by switching to member variables 2013-07-11 13:02:25 -07:00
ZappoMan
57ce20d3ce add support for Low Res sending while moving 2013-07-11 12:43:43 -07:00
Stephen Birarda
b201d13e31 refactor ping packet sending to push past version byte 2013-07-11 12:42:45 -07:00
Stephen Birarda
94b25a18aa add a missing letter, use else-if in voxel-server 2013-07-11 12:39:33 -07:00
Stephen Birarda
a1747725d3 sensible default for checkInPacketSize 2013-07-11 12:28:29 -07:00
Stephen Birarda
769205253f remove extra plus in AvatarData parseData 2013-07-11 12:27:48 -07:00
Andrzej Kapolka
ee77f59f48 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 12:25:51 -07:00
Philip Rosedale
489742f1e1 Merge pull request #650 from ey6es/kinected 
Bugfix: Turn the camera off when disabled.
 2013-07-11 12:15:17 -07:00
Andrzej Kapolka
4e524d7125 Compass tweaks: better initial extents, scale extents to compensate for 
anisotropy, converge more quickly on compass heading.
 2013-07-11 12:10:15 -07:00
Stephen Birarda
4eb25be14c fix node ID return from domain server 2013-07-11 12:09:42 -07:00
Stephen Birarda
3ec81b1867 Merge pull request #651 from birarda/master 
fix node type parsing in domain sever
 2013-07-11 11:30:43 -07:00
Stephen Birarda
c80b5b6be4 parse the nodeType from the correct location in packet 2013-07-11 11:30:19 -07:00
Andrzej Kapolka
aa3f4c6f2c Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 11:21:59 -07:00
ZappoMan
532b0b31f8 Merge pull request #628 from birarda/packet-versions 
add a version number to each transmitted packet
 2013-07-11 11:20:41 -07:00
Andrzej Kapolka
baca4353a8 Removed stray block. 2013-07-11 11:19:28 -07:00
Andrzej Kapolka
c6d01e0acc Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 11:16:09 -07:00
Stephen Birarda
544f9c2e7a type squish and magic number removal 2013-07-11 11:15:02 -07:00
Stephen Birarda
6804ab8a33 type squish in NodeList 2013-07-11 11:12:14 -07:00
Stephen Birarda
38a33e0283 couple more type squishes 2013-07-11 11:11:39 -07:00
Andrzej Kapolka
b23875a952 Make sure we shutdown before quitting. 2013-07-11 11:10:14 -07:00
Stephen Birarda
430f255730 type squish in Audio class 2013-07-11 11:10:03 -07:00
Stephen Birarda
cc10afb8c4 send brodcastPacket instead of pointer to broadcastPacket 2013-07-11 11:07:27 -07:00
Stephen Birarda
64887f2a36 Merge branch 'master' of github.com:worklist/hifi into packet-versions 2013-07-11 11:02:49 -07:00
ZappoMan
2f38f9ae87 Merge pull request #649 from LionTurtle/master 
Add const var to represent magic num in eyecontact code when gyros are on.
 2013-07-11 11:01:19 -07:00
Stephen Birarda
e1081abc06 Merge branch 'master' of github.com:worklist/hifi into packet-versions 2013-07-11 10:59:06 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
ZappoMan
d72f257d5d Merge pull request #648 from birarda/master 
some refactoring for sample addition in audio mixer
 2013-07-11 10:56:13 -07:00
Andrzej Kapolka
cf7408505f Shut down the webcam when it's turned off, but don't delete the grabber (since 
it has expensive-to-init state like the face cascade).
 2013-07-11 10:53:51 -07:00
Mark Peng
9749e5edd6 Add const var to represent magic num in eyecontact code when gyros 
are on.
 2013-07-11 10:53:38 -07:00
Stephen Birarda
5527d4b50f use glm clamp instead of pleateauAdditionOfSamples in audio mixer 2013-07-11 10:51:56 -07:00
ZappoMan
a1eed4e597 Merge pull request #642 from LionTurtle/master 
Make lookAtVectors lock on other avatar's eyes if the mouse is over the other avatar's head.
 2013-07-11 10:51:26 -07:00
ZappoMan
04cd340f0b add back in correct isViewChanging() 2013-07-11 10:50:17 -07:00
Mark Peng
24d32bcdc8 Fix style mistakes according to code review for eyecontact code. 2013-07-11 10:40:57 -07:00
ZappoMan
9aed3d3cc6 enable delta sending by default 2013-07-11 10:37:28 -07:00
Mark Peng
29d1e08f48 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:33:21 -07:00
Andrzej Kapolka
d4abceba2b Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-11 10:28:26 -07:00
Andrzej Kapolka
b62d2d85c3 Let's try actually releasing the camera when we turn it off. 2013-07-11 10:28:09 -07:00