Stephen Birarda
|
292fb51b43
|
use performance throttling instead of distance to decide when to send
|
2014-03-25 15:05:17 -07:00 |
|
Stephen Birarda
|
269615bc40
|
thread broadcast of avatar data in AvatarMixer
|
2014-03-25 14:02:24 -07:00 |
|
Stephen Birarda
|
0407c6d324
|
use QTimer to clock broadcastAvatarData method
|
2014-03-25 13:50:22 -07:00 |
|
Stephen Birarda
|
4e77afb4b2
|
block and wait for bytes to be written during broadcastAvatarData loop
|
2014-03-25 13:38:02 -07:00 |
|
Stephen Birarda
|
9d6dac6a76
|
suppress sleep time debug in favour of stats in AvatarMixer
|
2014-03-25 12:18:28 -07:00 |
|
Stephen Birarda
|
1fe01f3e61
|
increment framesSinceCutoffEvent in mixers to enable recovery
|
2014-03-25 12:16:07 -07:00 |
|
Stephen Birarda
|
ff788a340b
|
add stat for average billboard and identity packets per frame
|
2014-03-25 11:38:00 -07:00 |
|
Stephen Birarda
|
786d9ce404
|
force sending of identity and billboard packets changed in last frame
|
2014-03-25 10:56:06 -07:00 |
|
Stephen Birarda
|
e6b83ac52d
|
send mesh and billboard on receiver's first connect
|
2014-03-25 10:34:38 -07:00 |
|
Stephen Birarda
|
e8b9594758
|
spread out billboard and identity fallbacks
|
2014-03-25 09:39:43 -07:00 |
|
Stephen Birarda
|
ce214bc439
|
use the performance tuning ratio in avatar mixer to send less
|
2014-03-24 16:48:23 -07:00 |
|
Stephen Birarda
|
b01b2a3311
|
use explicit float casts where appropriate
|
2014-03-24 16:35:36 -07:00 |
|
Stephen Birarda
|
ba338cb7bc
|
at minimum send packet rate stats for ThreadedAssignment subclasses
|
2014-03-24 16:06:25 -07:00 |
|
Stephen Birarda
|
3db8386743
|
suppress trailing sleep ratio debug
|
2014-03-24 15:46:02 -07:00 |
|
Stephen Birarda
|
e7f9acd945
|
add trailing sleep and performance throttling logic to AvatarMixer
|
2014-03-24 15:42:57 -07:00 |
|
Stephen Birarda
|
638e9eae48
|
add some basic stat collection to avatar-mixer
|
2014-03-24 15:38:01 -07:00 |
|
Stephen Birarda
|
8dbe4dfdde
|
collect packet rate stats in NodeList
|
2014-03-24 15:06:53 -07:00 |
|
Stephen Birarda
|
40fa4bfbd2
|
fix octree server HTTPRequestHandler for url handling
|
2014-03-24 14:15:38 -07:00 |
|
Stephen Birarda
|
f8279c1f5b
|
handle query params in HTTPManager, display stats table from DS
|
2014-03-24 14:14:26 -07:00 |
|
Stephen Birarda
|
1fffda674a
|
send extra stats from audio-mixer to domain-server
|
2014-03-24 13:14:22 -07:00 |
|
Stephen Birarda
|
5f93e44ff7
|
abstract stats packet sending to NodeList
|
2014-03-24 12:33:00 -07:00 |
|
Stephen Birarda
|
8f403609e7
|
hook JSON stats sending from domain-server
|
2014-03-24 11:56:16 -07:00 |
|
Stephen Birarda
|
c0da215a60
|
correctly output trailing sleep time
|
2014-03-24 10:39:10 -07:00 |
|
Stephen Birarda
|
d0fbf4953a
|
change back off strategy, output trailing sleep
|
2014-03-24 10:27:46 -07:00 |
|
Stephen Birarda
|
5567d9acb9
|
change audio-mixer struggle behaviour
|
2014-03-24 09:24:13 -07:00 |
|
ZappoMan
|
d63acfc46f
|
revert
|
2014-03-23 18:12:02 -07:00 |
|
ZappoMan
|
d962387c75
|
revert
|
2014-03-23 18:11:40 -07:00 |
|
ZappoMan
|
9c7ffffbae
|
fix some windows issues
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
|
2014-03-23 18:10:22 -07:00 |
|
Stephen Birarda
|
c5b0288c12
|
remove numClientsMixedInFrame since it is no longer used
|
2014-03-21 18:49:46 -07:00 |
|
Stephen Birarda
|
af4fb26031
|
floats are important
|
2014-03-21 18:44:59 -07:00 |
|
Stephen Birarda
|
abd6c8a747
|
fix trailing average on ring buffer, remove unused constant
|
2014-03-21 18:28:12 -07:00 |
|
Stephen Birarda
|
88348b12d2
|
fix a divide by zero and output number of clients mixed in last frame
|
2014-03-21 18:16:47 -07:00 |
|
Stephen Birarda
|
42de3047ab
|
Merge pull request #2442 from birarda/master
change delta to 2%, don't hit 1 for cutoff
|
2014-03-21 17:17:47 -07:00 |
|
Stephen Birarda
|
88b91b9eb7
|
change an int to a float
|
2014-03-21 17:17:11 -07:00 |
|
Stephen Birarda
|
8ecd9aa0c0
|
change audibility delta to 2%, don't hit 1.0
|
2014-03-21 17:16:54 -07:00 |
|
Stephen Birarda
|
e3b65f4949
|
Merge pull request #2441 from birarda/master
linear change to audability ratio
|
2014-03-21 16:48:01 -07:00 |
|
Stephen Birarda
|
34f9075980
|
use a linear change to audability ratio
|
2014-03-21 16:47:41 -07:00 |
|
Stephen Birarda
|
949aefac62
|
Merge pull request #2439 from birarda/master
check for an audio cutoff change only every TRAILING_AVERAGE_FRAMES
|
2014-03-21 16:21:26 -07:00 |
|
Stephen Birarda
|
dc2d050187
|
remove sleep time debug now that the audio-mixer reports struggle
|
2014-03-21 15:47:21 -07:00 |
|
ZappoMan
|
438e5bd235
|
fix crash on domain restart in Agent, also have Agent properly shutdown on call to Script.stop()
|
2014-03-21 15:46:06 -07:00 |
|
Stephen Birarda
|
50007d7f4b
|
fix a debug message for audability threshold
|
2014-03-21 15:43:39 -07:00 |
|
Stephen Birarda
|
75bc640104
|
fix some indentation is audio mixer cutoff code
|
2014-03-21 15:42:58 -07:00 |
|
Stephen Birarda
|
4661553acb
|
check for cutoff change only every TRAILING_AVERAGE_FRAMES
|
2014-03-21 15:40:08 -07:00 |
|
Stephen Birarda
|
4bde0e6844
|
Merge pull request #2436 from ZappoMan/vscrashfix
fixes to voxel server crashes on client shutdown
|
2014-03-21 15:24:45 -07:00 |
|
Stephen Birarda
|
c99f5a4ae6
|
int to float conversion in the constructor
|
2014-03-21 14:38:01 -07:00 |
|
Stephen Birarda
|
98f014d13d
|
add another check to avoid any mixing for a silent frame
|
2014-03-21 14:37:31 -07:00 |
|
Stephen Birarda
|
3d9aa6cc9f
|
fix a spelling mistake and convert some ints to floats
|
2014-03-21 14:36:44 -07:00 |
|
Stephen Birarda
|
18e5637976
|
remove some extra spaces
|
2014-03-21 14:33:11 -07:00 |
|
Stephen Birarda
|
2575b33662
|
reinstate a cutoff when the audio-mixer is struggling
|
2014-03-21 14:29:57 -07:00 |
|
ZappoMan
|
3cb3cb81c4
|
fixes to voxel server crashes on client shutdown
|
2014-03-21 14:15:02 -07:00 |
|
Stephen Birarda
|
c1cbc79807
|
move debug for no reply domain checkins to ThreadedAssignment
|
2014-03-21 10:26:09 -07:00 |
|
Stephen Birarda
|
0105029d9c
|
output number of no reply domain checkins when finished
|
2014-03-21 10:10:25 -07:00 |
|
Stephen Birarda
|
24e9446814
|
remove mixer cutoff strategy for testing
|
2014-03-21 09:52:07 -07:00 |
|
Stephen Birarda
|
5ae63c5b0f
|
use a trailing average for sleep time, move loudness to RB
|
2014-03-20 17:10:24 -07:00 |
|
Stephen Birarda
|
5515141792
|
use a trailing average for _nextOutputLoudness
|
2014-03-20 16:50:20 -07:00 |
|
Stephen Birarda
|
7f96c71793
|
actually require minRequiredLoudness for a stream to be mixed in
|
2014-03-20 16:17:09 -07:00 |
|
Philip Rosedale
|
a30af08062
|
Merge pull request #2407 from ZappoMan/voxel_server_crash_fixes
fix voxel server crash/pure virtual call on shutdown of client
|
2014-03-20 15:33:59 -07:00 |
|
ZappoMan
|
b4f5a6d1ce
|
add _isShuttingDown to OctreeQueryNode and bail as fast as possible when shutting down
|
2014-03-20 14:44:47 -07:00 |
|
Stephen Birarda
|
64f946b640
|
require that buffers be above min loudness to be mixed in
|
2014-03-20 13:01:52 -07:00 |
|
Stephen Birarda
|
a8ef64e0ce
|
calculate a cutoff loudness for mixer recovery
|
2014-03-20 12:52:17 -07:00 |
|
Stephen Birarda
|
fb73b6e1ce
|
collect min and max loudness for each frame
|
2014-03-19 17:57:01 -07:00 |
|
Philip Rosedale
|
22048aaba5
|
Merge pull request #2392 from birarda/audio-scaling
allow Agents to send microphone audio using Sound objects
|
2014-03-19 17:00:46 -07:00 |
|
Philip Rosedale
|
e14069c9e3
|
Merge pull request #2376 from ZappoMan/experimental_scaling
Voxel Server Performance Improvements
|
2014-03-19 16:24:47 -07:00 |
|
Stephen Birarda
|
8c4fad443f
|
allow Agents to microphone audio from Sound objects
|
2014-03-19 16:14:58 -07:00 |
|
ZappoMan
|
cd6e0f1698
|
switch to deleteLater to prevent deadlock
|
2014-03-19 01:02:49 -07:00 |
|
ZappoMan
|
b3f60a068d
|
remove isScheduledForDelete from OctreeQueryNode
|
2014-03-19 00:17:14 -07:00 |
|
ZappoMan
|
450a9c03a7
|
revert changes
|
2014-03-18 23:54:23 -07:00 |
|
ZappoMan
|
499c4bd500
|
fix octree server crashes on various shutdown corner cases
|
2014-03-18 17:44:53 -07:00 |
|
ZappoMan
|
220232312d
|
remove unused variables
|
2014-03-18 16:06:20 -07:00 |
|
Andrzej Kapolka
|
500f9d1485
|
Merge pull request #2338 from AndrewMeadows/cleanup
Don't send redundant avatar hand/head data, and cleanup.
|
2014-03-18 13:57:30 -07:00 |
|
Stephen Birarda
|
b6a41eeaaa
|
resolve conflicts on merge with upstream master
|
2014-03-18 10:37:04 -07:00 |
|
Andrew Meadows
|
de67a828cc
|
Merge upstream/master into cleanup project
|
2014-03-18 09:41:41 -07:00 |
|
Andrew Meadows
|
272cb879f8
|
change wording of comment
|
2014-03-18 09:38:49 -07:00 |
|
ZappoMan
|
dfb07e717d
|
removed old debugging code
|
2014-03-18 09:34:24 -07:00 |
|
ZappoMan
|
86c2b5baa7
|
removed some debugging, added some comments, more work on optimizaiton
|
2014-03-18 01:51:30 -07:00 |
|
ZappoMan
|
329d3b37e0
|
add last know root timestamp property to query node
|
2014-03-18 01:07:45 -07:00 |
|
ZappoMan
|
beffb6deae
|
clean up stats
|
2014-03-18 01:04:52 -07:00 |
|
ZappoMan
|
34b2ccb9d7
|
adding not sent to stats
|
2014-03-18 00:02:47 -07:00 |
|
ZappoMan
|
fc50cc0604
|
improving server stats
|
2014-03-17 23:40:07 -07:00 |
|
Stephen Birarda
|
1fc9ac1815
|
make the client mix buffer only as large as it needs to be
|
2014-03-17 17:55:47 -07:00 |
|
Stephen Birarda
|
f3910f8c1a
|
scope clientMixBuffer only to AudioMixer run
|
2014-03-17 17:54:27 -07:00 |
|
ZappoMan
|
62dabd9c1c
|
formatting of stats
|
2014-03-17 17:49:50 -07:00 |
|
Philip Rosedale
|
a7f0e41232
|
Merge pull request #2342 from birarda/master
switch data for mix samples in AudioMixer
|
2014-03-17 17:30:14 -07:00 |
|
Stephen Birarda
|
07a71d8796
|
use char instead of QByteArray for mix samples in AudioMixer
|
2014-03-17 17:22:16 -07:00 |
|
Stephen Birarda
|
447f23a1c9
|
repair _clientSamples copying into _clientMix
|
2014-03-17 16:56:29 -07:00 |
|
Stephen Birarda
|
d652cec766
|
some potential fixes to QByteArray crash
|
2014-03-17 16:30:58 -07:00 |
|
Stephen Birarda
|
61594b9a1e
|
fixes to silent audio frame sending
|
2014-03-17 16:27:49 -07:00 |
|
ZappoMan
|
e9684c0ee5
|
added more stats to octree server stats page
|
2014-03-17 16:11:00 -07:00 |
|
Andrew Meadows
|
679d09610c
|
Merge upstream/master into "no hands" project.
|
2014-03-17 14:59:14 -07:00 |
|
Stephen Birarda
|
c7e12824a8
|
clarify check for audio loudness in AudioMixer
|
2014-03-17 14:35:26 -07:00 |
|
Stephen Birarda
|
bc9deb5db7
|
handle trivial case of not mixing silent audio streams
|
2014-03-17 14:29:53 -07:00 |
|
Andrew Meadows
|
ed3cf36045
|
cleanup: AvatarData doesn't derive from NodeData
Cleaner Interface since the AvatarData is already not the NodeList.
Reduces overhead/confusing code when parsing packets from AvatarMixer.
|
2014-03-17 14:10:42 -07:00 |
|
ZappoMan
|
07adfed6b4
|
call setLastHeardFromMicrostamp() when we get packets from nodes so NodeList doesn't drop them
|
2014-03-17 13:47:05 -07:00 |
|
Stephen Birarda
|
288272f051
|
fix a reversed MMX add
|
2014-03-17 11:26:35 -07:00 |
|
ZappoMan
|
949678f74a
|
Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling
|
2014-03-17 11:03:15 -07:00 |
|
Brad Hefta-Gaub
|
927006df91
|
Merge pull request #2331 from birarda/audio-scaling
AudioMixer optimizations with MMX intrinsics
|
2014-03-17 11:02:44 -07:00 |
|
ZappoMan
|
aab2ca826f
|
Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling
|
2014-03-17 11:01:25 -07:00 |
|
ZappoMan
|
981ab7374a
|
fix crash in client shutdown, clean up some debugging, clean up Q_OBJECT
|
2014-03-17 11:01:09 -07:00 |
|
Stephen Birarda
|
cc1d309c15
|
some really trivial magic number replacements
|
2014-03-17 10:13:29 -07:00 |
|
Stephen Birarda
|
05d6522279
|
more MMX optimizations to AudioMixer for delayed samples
|
2014-03-17 10:02:00 -07:00 |
|
ZappoMan
|
bd6b70ee32
|
use unsigned int vs size_t, since that just seems more correct
|
2014-03-16 11:07:24 -07:00 |
|
ZappoMan
|
7d7e1ff28a
|
one more crack at this signedness comparisons on unix
|
2014-03-15 23:37:52 -07:00 |
|
ZappoMan
|
5709a8893e
|
more unix signedness warnings
|
2014-03-15 23:19:16 -07:00 |
|
ZappoMan
|
08d89a4565
|
arg windows signedness warnings
|
2014-03-15 23:17:03 -07:00 |
|
ZappoMan
|
6f85cfdb2f
|
more warnings fixes
|
2014-03-15 23:00:03 -07:00 |
|
ZappoMan
|
adb6ffe7c4
|
more warnings fixes
|
2014-03-15 22:00:44 -07:00 |
|
Stephen Birarda
|
72449fdb6a
|
initial optimizations to AudioMixer with mmx additions
|
2014-03-14 17:50:57 -07:00 |
|
ZappoMan
|
21458036cc
|
clean up formatting of sending stats
|
2014-03-14 10:37:41 -07:00 |
|
ZappoMan
|
4c39a891be
|
add more packet sending statistics to server
|
2014-03-14 10:23:07 -07:00 |
|
ZappoMan
|
8006719fda
|
add new stats to OctreeServer
|
2014-03-14 00:42:23 -07:00 |
|
Stephen Birarda
|
54d73d4a64
|
use floor since round is missing on windows
|
2014-03-12 17:50:58 -07:00 |
|
Stephen Birarda
|
060d8be9f4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into agent-audio
|
2014-03-12 17:07:21 -07:00 |
|
Stephen Birarda
|
3b653ca542
|
add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291
|
2014-03-12 17:00:12 -07:00 |
|
AndrewMeadows
|
bed8617846
|
Merge pull request #2277 from ZappoMan/server_scale_testing
Voxel/Particle Server Scaling Work
|
2014-03-12 15:24:29 -07:00 |
|
Andrzej Kapolka
|
e249b29b45
|
Merge pull request #2268 from AndrewMeadows/radians
prefer radians over degrees
|
2014-03-12 12:10:29 -07:00 |
|
ZappoMan
|
6173a4d2a7
|
fix isFullScene correctly
|
2014-03-12 10:19:21 -07:00 |
|
ZappoMan
|
7e6beba4d2
|
removed redundant calc of isFullScene
|
2014-03-12 01:29:41 -07:00 |
|
ZappoMan
|
4d0b762de3
|
some hacking on full scene debuggin
|
2014-03-11 20:33:53 -07:00 |
|
Andrew Meadows
|
793a760272
|
merge upstream master into "radians" project
|
2014-03-11 17:28:36 -07:00 |
|
Andrew Meadows
|
aa8c2fc8cb
|
use radians instead of degrees (almost) everywhere
|
2014-03-11 17:26:58 -07:00 |
|
Andrzej Kapolka
|
81e3197751
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-11 10:03:30 -07:00 |
|
Andrzej Kapolka
|
9e5aae4a39
|
Remove spanner bits.
|
2014-03-10 17:01:27 -07:00 |
|
Andrzej Kapolka
|
3b63424abd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-10 12:27:07 -07:00 |
|
ZappoMan
|
cfa618d694
|
cleanup constructors
|
2014-03-08 23:31:23 -08:00 |
|
ZappoMan
|
1ceb05bf09
|
click harder
|
2014-03-08 18:22:30 -08:00 |
|
Andrzej Kapolka
|
0448596e58
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
interface/src/renderer/FBXReader.cpp
|
2014-03-05 18:28:25 -08:00 |
|
Andrzej Kapolka
|
d1747ed8d1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-05 17:12:37 -08:00 |
|
ZappoMan
|
15b5bb4385
|
Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds
Conflicts:
examples/bot.js
|
2014-03-05 02:21:40 -08:00 |
|
Andrzej Kapolka
|
63b4a2453b
|
Lots of work on metavoxel LODs and spanners.
|
2014-03-04 21:27:13 -08:00 |
|
ZappoMan
|
374af9eeb5
|
first cut at flocking birds, change willEmitVisualCallback to update
|
2014-03-04 14:40:49 -08:00 |
|
Stephen Birarda
|
231dc624ff
|
replace deprecated qt5 macros in cmake with target_link_libraries
|
2014-03-04 12:41:24 -08:00 |
|
Stephen Birarda
|
bb3a8677be
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes
|
2014-03-03 16:31:25 -08:00 |
|
Stephen Birarda
|
628f91cd73
|
complete quoting of varous Cmake commands, closes #1999
|
2014-03-03 12:15:05 -08:00 |
|
Stephen Birarda
|
60eb588e96
|
remove some unecessary null pointer checks
|
2014-03-03 11:36:01 -08:00 |
|
ZappoMan
|
ef87fbffac
|
Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling
Conflicts:
libraries/shared/src/ResourceCache.cpp
|
2014-02-28 16:58:43 -08:00 |
|
Stephen Birarda
|
094159eefd
|
make Agent parent of ScriptEngine so they stay on same thread
|
2014-02-28 16:47:54 -08:00 |
|
ZappoMan
|
c1c41ea2ca
|
handle some shutdown cases and reduce time of locking in octree server
|
2014-02-28 16:18:02 -08:00 |
|
ZappoMan
|
8d7406461a
|
Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling
Conflicts:
assignment-client/src/octree/OctreeServer.cpp
assignment-client/src/octree/OctreeServer.h
|
2014-02-28 10:54:56 -08:00 |
|
ZappoMan
|
f9718913e2
|
fix octree-server random spinout sometimes when client disconnects
|
2014-02-27 16:13:05 -08:00 |
|
ZappoMan
|
cdb0aeb153
|
some hacking on server performance
|
2014-02-27 10:47:17 -08:00 |
|
ZappoMan
|
2832c33482
|
fixed div by zero
|
2014-02-26 21:38:28 -08:00 |
|
ZappoMan
|
6f1136c417
|
more status page formatting, and include max total packets in packets per client interval
|
2014-02-26 21:25:34 -08:00 |
|
ZappoMan
|
85a42849a8
|
work on current client count
|
2014-02-26 21:25:15 -08:00 |
|
ZappoMan
|
8c4fdbb1c6
|
remove dead comments
|
2014-02-26 21:24:50 -08:00 |
|
ZappoMan
|
a34aef658d
|
cleanup OctreeSendThread correctly
|
2014-02-26 21:24:32 -08:00 |
|
ZappoMan
|
1603c1f38c
|
work on client stats and max total packets per second
|
2014-02-26 21:24:12 -08:00 |
|
ZappoMan
|
39ba98f3b1
|
fixed a comment
|
2014-02-26 14:23:58 -08:00 |
|
ZappoMan
|
1e404404c3
|
next pass at seeing voxels
|
2014-02-26 13:35:59 -08:00 |
|
Stephen Birarda
|
937768ae51
|
add option for fake billboard from URL, closes #2087
|
2014-02-25 13:51:48 -08:00 |
|
ZappoMan
|
039f9ff1e3
|
Merge pull request #2088 from birarda/authentication
always authenticate to default and fix audio-mixer session UUID
|
2014-02-25 11:22:54 -08:00 |
|
Stephen Birarda
|
a24366fcd7
|
populate packet header only once session UUID is received
|
2014-02-25 11:16:19 -08:00 |
|
Stephen Birarda
|
b09ed1dff1
|
present a login window on app start
|
2014-02-25 10:53:13 -08:00 |
|
ZappoMan
|
17e4426b50
|
Merge pull request #2086 from PhilipRosedale/master
Add stochastic falloff for sending other avatar’s data
|
2014-02-25 10:52:43 -08:00 |
|
Philip Rosedale
|
176cb103dc
|
Add stochastic falloff for sending other avatar’s data
|
2014-02-25 10:41:33 -08:00 |
|
Stephen Birarda
|
61fcfd17e3
|
add org and app info to AC for settings ini
|
2014-02-24 15:16:56 -08:00 |
|
Stephen Birarda
|
050d223b3a
|
add domain connection reset to NodeList reset
|
2014-02-24 13:33:52 -08:00 |
|
Stephen Birarda
|
27c779666b
|
add auth to assignment-client, fix refresh of static assignments
|
2014-02-24 13:29:32 -08:00 |
|
Stephen Birarda
|
9771e1bb12
|
resolve conflicts on merge with upstream master
|
2014-02-24 12:06:10 -08:00 |
|
Andrzej Kapolka
|
8745ca3139
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-02-23 20:13:23 -08:00 |
|
Andrzej Kapolka
|
68fea8de1e
|
More merge fixes.
|
2014-02-21 18:32:05 -08:00 |
|
Andrzej Kapolka
|
e470b1c41d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
interface/src/MetavoxelSystem.cpp
|
2014-02-21 18:26:40 -08:00 |
|
Andrzej Kapolka
|
ac02609bc2
|
The basic billboard behavior, closes #1864.
|
2014-02-21 15:38:49 -08:00 |
|
Stephen Birarda
|
340248ac43
|
resolve conflicts on merge with upstream master
|
2014-02-21 15:16:15 -08:00 |
|
Andrzej Kapolka
|
8d01527d93
|
Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo
|
2014-02-21 12:16:33 -08:00 |
|
Andrzej Kapolka
|
10ce2cb3f0
|
Working on sending the billboards over the network.
|
2014-02-21 11:49:29 -08:00 |
|
ZappoMan
|
a12e1ef18f
|
Merge pull request #2043 from birarda/metavoxel-fix
fixes for extra characters in logging target names
|
2014-02-21 10:24:29 -08:00 |
|
Andrzej Kapolka
|
d8321bd419
|
Merge pull request #2034 from birarda/master
fixes for scripted avatars
|
2014-02-21 10:14:41 -08:00 |
|
Stephen Birarda
|
a6c1e3e87f
|
tweaks to domain-server authentication flow
|
2014-02-20 16:31:50 -08:00 |
|
Stephen Birarda
|
3bace43aae
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-20 12:08:47 -08:00 |
|
Stephen Birarda
|
cfec1e583e
|
fix logging target-name extra characters
|
2014-02-20 12:02:23 -08:00 |
|
Stephen Birarda
|
4022d9f4c4
|
fix metavoxel interest list, keep node alive with ping
|
2014-02-20 11:36:16 -08:00 |
|
Stephen Birarda
|
ee9f8937e3
|
fix a silly typo
|
2014-02-19 18:03:34 -08:00 |
|
Stephen Birarda
|
4ee416ba96
|
fixes for scripted avatars, closes #2033
|
2014-02-19 16:55:24 -08:00 |
|
Stephen Birarda
|
7c69028dc5
|
hook up domain request for node to authenticate
|
2014-02-18 10:54:45 -08:00 |
|
Stephen Birarda
|
37f1f7ba4f
|
add a DomainInfo class to hold domain information
|
2014-02-18 09:59:22 -08:00 |
|
Andrzej Kapolka
|
9c91d3c2e7
|
Use the existing session stuff for metavoxels rather than a separate system.
|
2014-02-13 10:25:10 -08:00 |
|
Stephen Birarda
|
a1a4a3db8a
|
HifiSockAddr to SharedNodePointer changes in MetavoxelServer
|
2014-02-07 14:27:10 -08:00 |
|
Stephen Birarda
|
dd4d944dea
|
ping inactive nodes in conjunction with domain server check in
|
2014-02-07 14:06:42 -08:00 |
|
Stephen Birarda
|
a5636d2dc0
|
make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895
|
2014-02-07 12:25:43 -08:00 |
|
Stephen Birarda
|
66d4eeb805
|
enforce both a version and hash match for packets
|
2014-02-07 11:10:38 -08:00 |
|
Stephen Birarda
|
997bea708d
|
fix a PacketTypeVoxelQuery typo
|
2014-02-07 10:32:48 -08:00 |
|
Stephen Birarda
|
d39cccde77
|
add a method to find a node and upate based on packet
|
2014-02-07 10:32:16 -08:00 |
|
Stephen Birarda
|
fa1825fa32
|
repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID
|
2014-02-07 10:20:50 -08:00 |
|
Stephen Birarda
|
c1132726bf
|
use SharedNodePointer in place of Node where appropriate
|
2014-02-06 14:58:03 -08:00 |
|
Stephen Birarda
|
97a7369c76
|
remove senderWithAddress from NodeList
|
2014-02-06 14:43:46 -08:00 |
|
Stephen Birarda
|
a823722d27
|
add writeDatagram helper to NodeList to insert md5 hash
|
2014-02-06 14:28:58 -08:00 |
|
Stephen Birarda
|
e72f6d16cc
|
rename NodeList ownerUUID to sessionUUID
|
2014-02-06 11:43:23 -08:00 |
|
Stephen Birarda
|
f92f9ec0c2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-06 09:28:03 -08:00 |
|
Stephen Birarda
|
f4fe2bb754
|
move octree-server libs to assignment-client
|
2014-02-05 16:04:23 -08:00 |
|
Stephen Birarda
|
9694a622b5
|
update placeholder and give edit packet senders to Agent
|
2014-02-05 15:35:13 -08:00 |
|
Stephen Birarda
|
53170d3fe2
|
fix skeleton setting on parsing of identity packet
|
2014-02-04 16:49:21 -08:00 |
|
Stephen Birarda
|
adaa36a51d
|
repairs to key-framed URL sending through avatar-mixer
|
2014-02-04 15:28:27 -08:00 |
|
Stephen Birarda
|
7e3442cbd0
|
repair to PacketType so interface parses AM packet
|
2014-02-04 14:57:14 -08:00 |
|
Stephen Birarda
|
3959209bc2
|
complete movement of URLs to AvatarData for re-usability
|
2014-02-04 14:49:56 -08:00 |
|
Stephen Birarda
|
2b80a5fbb8
|
move face/skeleton model URLs to AvatarData
|
2014-02-04 14:40:41 -08:00 |
|
Stephen Birarda
|
26c961dc66
|
send identity packets when changes occur between keyframes
|
2014-02-04 14:24:13 -08:00 |
|
Stephen Birarda
|
33305ad111
|
have the avatar-mixer broadcast identity packets every 5 seconds
|
2014-02-04 13:42:22 -08:00 |
|
Stephen Birarda
|
31bd5f7ce8
|
add parsing of PacketTypeAvatarIdentity to AvatarMixer
|
2014-02-04 13:27:05 -08:00 |
|
ZappoMan
|
579c601ff7
|
Merge pull request #1810 from birarda/master
scripting nomenclature changes
|
2014-01-31 17:14:07 -08:00 |
|
Stephen Birarda
|
c754663582
|
force queued connection for readyRead on node socket in case it moves, closes #1685
|
2014-01-31 17:09:08 -08:00 |
|