Philip Rosedale
bf842f01ba
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-18 14:37:49 -07:00
Philip Rosedale
e43758a115
Faceshift fail to connect only notifies log once
2013-10-18 14:36:57 -07:00
Andrzej Kapolka
8c85c5cb5e
Merge pull request #1089 from ey6es/master
...
Added support for RotationOffset, which the Lulu model uses.
2013-10-18 14:27:38 -07:00
Andrzej Kapolka
58b4139dbc
Added support for RotationOffset, which the Lulu model uses.
2013-10-18 14:26:42 -07:00
Leonardo Murillo
8d8278daef
Merge pull request #1088 from birarda/assignment
...
add a DELETE method to civetweb to delete assignment by UUID
2013-10-18 10:52:33 -07:00
Stephen Birarda
7ca0a26c18
rename method to add assignments back to queue
2013-10-18 10:44:39 -07:00
Stephen Birarda
0d69349ba9
fix prefixed constants
2013-10-18 10:39:23 -07:00
Stephen Birarda
f6c9c57585
cleanup checking of request method, clarify that node is being deleted
2013-10-18 10:33:22 -07:00
Stephen Birarda
d85c0bb88a
add a DELETE method to civetweb to delete assignment by UUID
2013-10-18 10:25:35 -07:00
ZappoMan
10b7110218
Merge pull request #1087 from birarda/assignment
...
fix a crash in AudioMixer with active socket but no linked data
2013-10-18 10:09:38 -07:00
Stephen Birarda
fc36e38d1c
fix a crash in AudioMixer with active socket but no linked data
2013-10-18 10:03:02 -07:00
Stephen Birarda
766430c618
Merge pull request #1086 from birarda/assignment
...
trivial change to Agent to trigger re-deploy
2013-10-18 09:53:40 -07:00
Stephen Birarda
9c950d4c23
trivial change to Agent to trigger re-deploy
2013-10-18 09:53:23 -07:00
Stephen Birarda
c59e0f336d
Merge pull request #1085 from birarda/master
...
fix UNIX build buster for starfield, audio-mixer crash
2013-10-18 09:40:46 -07:00
Stephen Birarda
acbd664cab
fix audio send to wrong socket
2013-10-18 09:34:38 -07:00
Stephen Birarda
2fcdd708cb
fix for audio-mixer crash with node from DS
2013-10-18 09:28:36 -07:00
Stephen Birarda
1965ff286b
fix unix build buster for starfield
2013-10-18 09:16:55 -07:00
Philip Rosedale
cdcd4f9915
Merge pull request #1084 from birarda/master
...
fix missing link to starfield implementation files
2013-10-18 09:02:44 -07:00
Stephen Birarda
1ddc52252a
fix missing link to starfield implementation files
2013-10-18 09:01:44 -07:00
Philip Rosedale
53ffff2718
Merge pull request #1083 from lordwaym/mod-starfield
...
Starfield modification to randomly generate stars
2013-10-18 07:01:12 -07:00
Lord Waymaster
25d5b38f5f
Starfield modification to randomly generate stars
...
Starfield now generates stars at startup rather than load them from the
server - approx. 50msec to load 50,000 stars.
STAR_COLORIZATION const in Generator.cpp is used to defined how
colorful the stars should be.
STARFIELD_NUM_STARS and STARFIELD_SEED sets the number of stars and the
random number seed used to generate the starfield.
2013-10-17 23:24:03 -07:00
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
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
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
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
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
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
