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

6745 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
4bbb59be72 fix use of htonl in constant outside function 2013-10-17 14:45:38 -07:00
Stephen Birarda
90e189b425 remove accidentally double saved NodeList.cpp 2013-10-17 14:42:07 -07:00
Stephen Birarda
3b4231208a remove firstDomainCheckIn bool that is no longer required 2013-10-17 14:41:13 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Philip Rosedale
c48856df52 Merge pull request #1075 from ZappoMan/voxelnode_memory_savings 
VoxelNode memory savings
 2013-10-17 14:26:40 -07:00
Stephen Birarda
d7d8d76b07 fix ping of VS from agent 2013-10-17 13:58:00 -07:00
ZappoMan
8d7874b01b add guards to prevent runaway reaverageVoxels(), added stats to see if 4 children could be packed internally 2013-10-17 13:47:18 -07:00
Stephen Birarda
74e66dfd35 push various PACKET_TYPES, repairs to Agent for UUID setup 2013-10-17 13:35:53 -07:00
Stephen Birarda
0ae825d761 temporary activation of node public socket in VS 2013-10-17 13:01:03 -07:00
ZappoMan
9bd2499317 Merge pull request #1074 from PhilipRosedale/master 
Fixed audio mute not working, visualize gaze direction when showing head mouse
 2013-10-17 12:36:30 -07:00
ZappoMan
d566026026 Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings 2013-10-17 12:31:31 -07:00
ZappoMan
6688b450c5 cleaned up some printf's to qDebug's 2013-10-17 12:31:18 -07:00
ZappoMan
8448e47df8 cleanup dead code 2013-10-17 12:27:23 -07:00
ZappoMan
515dc657fb cleanup dead code 2013-10-17 12:26:01 -07:00
ZappoMan
fbf1a75d07 cleanup dead code 2013-10-17 12:24:53 -07:00
ZappoMan
095b716366 make population stats use public getters and private member variables 2013-10-17 12:16:03 -07:00
Stephen Birarda
628a3ba489 fixes to AvatarMixer for new UUID setup 2013-10-17 12:10:27 -07:00
Stephen Birarda
1c70e09178 repairs to audio exchange for new UUID setup 2013-10-17 11:58:52 -07:00
ZappoMan
c5deed36b0 added ifdefs for HAS_AUDIT_CHILDREN and added more memory tracking stats 2013-10-17 11:56:18 -07:00
Stephen Birarda
a5c837b197 fix domain-server check in from assigned clients 2013-10-17 11:51:42 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
Andrzej Kapolka
e63923774f Merge pull request #1073 from ey6es/master 
These should actually start at two pi (that's the maximum distance).
 2013-10-17 11:07:48 -07:00
PhilipRosedale
f6efccea06 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-17 11:07:45 -07:00
Andrzej Kapolka
36d4be4e3b These should actually start at two pi (that's the maximum distance). 2013-10-17 11:05:52 -07:00
PhilipRosedale
9643c1262c Fix mute button, visualize gaze direction when showing headMouse 2013-10-17 11:03:12 -07:00
Andrzej Kapolka
537f325447 Merge pull request #1072 from ey6es/master 
Another slight fix for circling.
 2013-10-17 11:01:40 -07:00
Andrzej Kapolka
e9a3eb2edd Merge branch 'master' of https://github.com/worklist/hifi 2013-10-17 11:00:59 -07:00
Andrzej Kapolka
b25020b84a Need to halve the target angle, because both participants will be moving. 
Use randomness to resolve cases where two participants are on top of one
another.
 2013-10-17 10:58:33 -07:00
ZappoMan
296f18a844 make offset bounds match 20 bit storage 2013-10-17 09:58:28 -07:00
Stephen Birarda
6805b0e2c6 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 09:23:25 -07:00
ZappoMan
e8ce60d275 implement support for three children encoding 2013-10-16 21:42:55 -07:00
ZappoMan
d2bab77c88 implement support for three children encoding 2013-10-16 21:42:47 -07:00
Stephen Birarda
012fccc72e send ping to AvM and VS for socket activation 2013-10-16 18:01:15 -07:00
Andrzej Kapolka
9e68c5dfba Merge pull request #1071 from ey6es/master 
Fixed glow flickering, tweak circling again.
 2013-10-16 17:53:30 -07:00
Stephen Birarda
7de88898e1 activate appropriate socket after receiving ping reply 2013-10-16 17:51:32 -07:00
Andrzej Kapolka
121a7f8270 Widen the circle influence, increase the approach rate. 2013-10-16 17:48:28 -07:00
Andrzej Kapolka
a5a81a585e Fix for glow flickering. 2013-10-16 17:47:39 -07:00
Stephen Birarda
a4be44c2c5 remove the injector target 2013-10-16 17:28:42 -07:00
Stephen Birarda
849e5817ec remove a couple of spaces 2013-10-16 17:27:16 -07:00
Andrzej Kapolka
8472775674 Merge pull request #1070 from ey6es/master 
Decrease the distance between members, increase the influence of the cir...
 2013-10-16 17:22:17 -07:00
Andrzej Kapolka
89d6c7905b Decrease the distance between members, increase the influence of the circle, 
don't rotate members.
 2013-10-16 17:21:09 -07:00
Stephen Birarda
330e78920a use Qt to query interfaces for correct local address 2013-10-16 17:06:39 -07:00
Stephen Birarda
e40ab5d13f add debug of Node's local address 2013-10-16 16:52:05 -07:00
Philip Rosedale
d7b98dbc05 Merge pull request #1069 from PhilipRosedale/master 
Move to 'european' comfort distance for chat circle
 2013-10-16 16:50:35 -07:00
Philip Rosedale
c324933b8a Move to 'european' comfort distance for chat circle 2013-10-16 16:49:33 -07:00
Stephen Birarda
747175311f handle stun response in assigned clients 2013-10-16 16:37:24 -07:00
Philip Rosedale
f9992dd704 Merge pull request #1068 from ey6es/encircle 
First stab at chat circling behavior.
 2013-10-16 16:30:16 -07:00
Stephen Birarda
224b0d9671 domain server accepts custom public address from node 2013-10-16 16:27:13 -07:00
Stephen Birarda
f581d4d976 handle STUN request and response in NodeList 2013-10-16 16:01:23 -07:00