Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 21:20:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
7d7f2d35d0 Merge pull request #1082 from birarda/assignment 
ping/reply from servers for hole punching
 2013-10-17 18:44:02 -07:00
Stephen Birarda
fad82a48d5 remove the debug in Application.cpp 2013-10-17 17:56:06 -07:00
Stephen Birarda
11a05481e1 remove an infamous birarda extra g 2013-10-17 17:54:52 -07:00
Stephen Birarda
ded7735572 remove crazy debug from testing 2013-10-17 17:54:25 -07:00
Stephen Birarda
79451f974a add debug to AvatarMixer, not AudioMixer 2013-10-17 17:44:32 -07:00
Stephen Birarda
ce934b0684 add packet receive debug 2013-10-17 17:43:44 -07:00
Stephen Birarda
a4798acb22 bring ping interval back to 1 second 2013-10-17 17:35:24 -07:00
Stephen Birarda
b25487cda3 increase the ping interval 2013-10-17 17:33:34 -07:00
Andrzej Kapolka
778e432cc4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-17 17:33:03 -07:00
Andrzej Kapolka
c8b2ed0213 More progress on reading skeletons. 2013-10-17 17:30:34 -07:00
Stephen Birarda
65e0670eba Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 17:25:21 -07:00
Stephen Birarda
19e6f668d2 add debug to test hole punching 2013-10-17 17:25:14 -07:00
ZappoMan
2cf762d752 Merge pull request #1081 from birarda/master 
fix pinging of agents in broadcast to nodes, audio injection crash
 2013-10-17 17:15:30 -07:00
ZappoMan
001418649f show total memory usage for voxels 2013-10-17 17:08:46 -07:00
Stephen Birarda
bd806241fd don't attempt to send in UDPSocket with NULL destAddress 2013-10-17 17:01:15 -07:00
Stephen Birarda
14e258c357 don't send audio to nodes who don't have an active socket 2013-10-17 16:57:59 -07:00
Stephen Birarda
b4ef3dbd8a add ping/reply to assignment-client servers 2013-10-17 16:56:52 -07:00
ZappoMan
befa26186c Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-17 16:55:50 -07:00
Stephen Birarda
7d48c9b3bd don't attempt to inject if audio mixer has no active socket 2013-10-17 16:49:05 -07:00
Stephen Birarda
75d8934961 fix pinging of agents in broadcast to nodes 2013-10-17 16:46:49 -07:00
Stephen Birarda
964200cdab Merge pull request #1080 from ZappoMan/voxelnode_memory_savings 
fix voxel nodes to work with new UUID format
 2013-10-17 16:35:40 -07:00
ZappoMan
a6664e442c fixed comment 2013-10-17 16:21:22 -07:00
ZappoMan
43d13406ae Merge pull request #1079 from birarda/assignment 
add local node information to assignments JSON
 2013-10-17 16:18:26 -07:00
ZappoMan
370defdc4a fixed comment 2013-10-17 16:16:20 -07:00
ZappoMan
9b0cc14552 fix voxel nodes to work with new UUID format 2013-10-17 16:14:06 -07:00
Stephen Birarda
b6f3253b95 add local node information to assignments JSON 2013-10-17 16:07:24 -07:00
Andrzej Kapolka
9ba3c3719f Working on skeleton loading, added support for FBX text format (exported by 
Blender).
 2013-10-17 15:45:57 -07:00
ZappoMan
c80ae942c2 Merge pull request #1078 from birarda/graceful-stun-fail 
fallback for STUN communication error/failure
 2013-10-17 15:35:50 -07:00
Stephen Birarda
52b3982492 Merge branch 'master' of github.com:worklist/hifi into graceful-stun-fail 2013-10-17 15:28:25 -07:00
ZappoMan
3c9518d779 Merge pull request #1076 from birarda/assignment 
major NodeList communication changes
 2013-10-17 15:23:54 -07:00
stojce
6d8182ac2c Merge branch 'master' of https://github.com/worklist/hifi into 19433 2013-10-18 00:22:34 +02:00
stojce
63533e66c1 render mirror box 2013-10-18 00:22:25 +02:00
Stephen Birarda
80d2df6a49 fix audio ternary indentations 2013-10-17 15:12:34 -07:00
Stephen Birarda
87d6c0085f add a fallback if STUN to outside server isn't possible 2013-10-17 15:11:02 -07:00
Stephen Birarda
42de553e32 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 14:51:20 -07:00
ZappoMan
62db6b82be Merge pull request #1077 from ZappoMan/voxelnode_memory_savings 
fix small stats bug
 2013-10-17 14:49:29 -07:00
Stephen Birarda
4bbb59be72 fix use of htonl in constant outside function 2013-10-17 14:45:38 -07:00
ZappoMan
a11b6858d3 fix small stats bug 2013-10-17 14:43:19 -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