Stephen Birarda
|
744d026e81
|
initial pass at tailoring the FRD for send rate
|
2015-04-30 17:16:31 -07:00 |
|
Stephen Birarda
|
5b55a52a04
|
add check in AvatarMixer for next adjustment
|
2015-04-30 15:36:31 -07:00 |
|
Stephen Birarda
|
3e842d7e34
|
add debug for result values from DS settings
|
2015-04-30 14:59:03 -07:00 |
|
Stephen Birarda
|
5936073425
|
get avatar-mixer settings from domain-server
|
2015-04-30 14:55:53 -07:00 |
|
Stephen Birarda
|
17142a532f
|
add stats for max FRD and num avatars last frame
|
2015-04-30 10:09:23 -07:00 |
|
Stephen Birarda
|
3a10da688f
|
switch the avatar stat to kbps
|
2015-04-30 08:56:08 -07:00 |
|
Stephen Birarda
|
2c0604afd1
|
fix string JSON unmarshal, add basic avatar values
|
2015-04-30 08:55:08 -07:00 |
|
Stephen Birarda
|
842886d0fc
|
add back read_pending_datagrams stats
|
2015-04-29 16:28:47 -07:00 |
|
Stephen Birarda
|
68998f4423
|
cleanup AudioMixer stats to be properly nested
|
2015-04-28 18:19:16 -07:00 |
|
Stephen Birarda
|
77be0012cf
|
cleanup stats packaging in AudioMixer
|
2015-04-28 15:35:51 -07:00 |
|
Stephen Birarda
|
85a3b5597c
|
use a distance per avatar for conditional avatar data broadcast
|
2015-04-28 15:01:06 -07:00 |
|
Atlante45
|
604a13f8ad
|
Only editor can mute environment
|
2015-04-15 17:04:59 +02:00 |
|
Stephen Birarda
|
1d5f1807f7
|
Merge pull request #4562 from sethalves/editors-are-rezzers
add a bool value to Node which indicates if it is allowed to rez new ent...
|
2015-03-31 18:53:29 -07:00 |
|
Seth Alves
|
4e83301c65
|
add a bool value to Node which indicates if it is allowed to rez new entities
|
2015-03-31 18:27:46 -07:00 |
|
Stephen Birarda
|
61806935bb
|
add a networking constants class with metaverse URL
|
2015-03-31 16:40:21 -07:00 |
|
David Rowe
|
154dacf791
|
Fix typo
|
2015-03-31 14:21:56 -07:00 |
|
Seth Alves
|
9428857194
|
quiet compiler, remove extra-assignment/typo
|
2015-03-28 17:10:16 -07:00 |
|
Brad Davis
|
bf607e4c9c
|
Fixing indentation and usage
|
2015-03-19 15:53:16 -07:00 |
|
Brad Davis
|
72957670ba
|
Some commentary
|
2015-03-19 09:55:03 -07:00 |
|
Brad Davis
|
160f666d89
|
Merge branch 'master' into avatar
|
2015-03-18 12:55:56 -07:00 |
|
Brad Davis
|
6415ff99f6
|
Work in progress
|
2015-03-17 12:04:04 -07:00 |
|
Brad Davis
|
d7b1852164
|
Creating eachMatchingNode and using it in avatar mixer
|
2015-03-16 15:25:44 -07:00 |
|
Seth Alves
|
3bc85c2531
|
instead of a json checkbox, a dropdown to chose the file type
|
2015-03-12 09:34:01 -07:00 |
|
Seth Alves
|
2a06816f71
|
added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting
|
2015-03-11 23:09:15 -07:00 |
|
ZappoMan
|
e87e0a1e0b
|
some cleanup of dead code related to timers
|
2015-03-11 16:27:04 -07:00 |
|
Brad Hefta-Gaub
|
00b731a868
|
Merge pull request #4372 from sethalves/fix-assignment-client-monitor
pass -t to children even if run in parent mode. monitor (parent) only i...
|
2015-03-06 12:08:32 -08:00 |
|
samcake
|
6b1f42df83
|
Merge pull request #4366 from ZappoMan/removeMetavoxels
remove metavoxels
|
2015-03-03 15:50:53 -08:00 |
|
Seth Alves
|
8affca6120
|
pass -t to children even if run in parent mode. monitor (parent) only interacts with its own children
|
2015-03-03 14:58:53 -08:00 |
|
Brad Hefta-Gaub
|
b88d52a310
|
Merge pull request #4363 from huffman/block-restricted-users
Add permission-checking to edit entities
|
2015-03-03 11:04:46 -08:00 |
|
ZappoMan
|
5c3c94a618
|
remove metavoxels
|
2015-03-02 17:21:43 -08:00 |
|
Ryan Huffman
|
b370e025c9
|
Move EntityScriptingInterface instance to DependencyManager
|
2015-03-02 15:05:31 -08:00 |
|
Seth Alves
|
fb4f2fe89c
|
Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem
|
2015-02-27 10:19:06 -08:00 |
|
Seth Alves
|
b8322556a6
|
address code-review comments
|
2015-02-26 17:34:24 -08:00 |
|
Seth Alves
|
c80995170a
|
-n and -t are okay together
|
2015-02-26 17:17:19 -08:00 |
|
Seth Alves
|
7c7d727b55
|
mv ShutdownEventListener into class which is a child of QCoreApplication
|
2015-02-26 10:07:48 -08:00 |
|
Seth Alves
|
0918d4989b
|
mv ShutdownEventListener into class which is a child of QCoreApplication
|
2015-02-26 09:53:23 -08:00 |
|
Seth Alves
|
f157c5c60d
|
Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem
|
2015-02-26 09:13:49 -08:00 |
|
Seth Alves
|
128a38100f
|
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x
|
2015-02-25 14:13:55 -08:00 |
|
Leonardo Murillo
|
006b3ed0ac
|
Merge pull request #4300 from birarda/dependencies
NOT MERGEABLE - add some externals as cmake external projects
|
2015-02-25 13:22:49 -08:00 |
|
Seth Alves
|
1a4808857e
|
put local domain server's http port into shared memeory
|
2015-02-25 11:30:54 -08:00 |
|
Seth Alves
|
0ce49888ff
|
AssignmentClientApp is QCoreApplication, other classes aren't. If --min is set and all the assignment clients exit (probably due to domain server restarting), respawn until --min is statisfied.
|
2015-02-25 09:20:34 -08:00 |
|
Seth Alves
|
5c5ffc07ab
|
allow client count to drift as needed if the user doesn't specify --min or --max
|
2015-02-24 17:43:08 -08:00 |
|
Seth Alves
|
c9d6a44c3a
|
fix up command-line parsing
|
2015-02-24 16:56:13 -08:00 |
|
Stephen Birarda
|
09ffcbb2e8
|
Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare"
This reverts commit 087e2babde , reversing
changes made to 5202d2136a .
|
2015-02-24 12:30:40 -08:00 |
|
Stephen Birarda
|
087e2babde
|
Merge pull request #4324 from sethalves/assignment-client-keep-a-spare
Assignment client keep a spare
|
2015-02-24 11:40:43 -08:00 |
|
Seth Alves
|
0b9b7f06cc
|
address various comments from code review
|
2015-02-23 11:12:19 -08:00 |
|
Andrew Meadows
|
0455ccf7be
|
Merge pull request #4313 from ctrlaltdavid/20355
CR for 20355 - Initial Integration with DDE
|
2015-02-23 09:47:19 -08:00 |
|
Seth Alves
|
270d509a12
|
cleanups
|
2015-02-20 14:29:12 -08:00 |
|
Seth Alves
|
8cee88acb4
|
network chatter between Monitor and AssignmentClients is expected to be localhost only
|
2015-02-20 14:25:43 -08:00 |
|
Seth Alves
|
4bba4fc387
|
cleanups
|
2015-02-20 13:44:37 -08:00 |
|