Stephen Birarda
781f45e488
pull the keypath for clicked value in stats javascript
2015-04-29 17:55:10 -07:00
Stephen Birarda
a39ee91233
add a keypath data attribute on stat values
2015-04-29 17:53:29 -07:00
Stephen Birarda
eda18318d8
add highcharts for graphing of numerical stat values
2015-04-29 17:35:03 -07:00
Stephen Birarda
40dfbada5d
cleanup styling in json.human.css
2015-04-29 16:38:12 -07:00
Stephen Birarda
cca13d6c96
add back stale state for stats
2015-04-29 16:35:07 -07:00
Stephen Birarda
842886d0fc
add back read_pending_datagrams stats
2015-04-29 16:28:47 -07:00
Stephen Birarda
ab4a140806
re-enable dynamic stat updates, styling fix
2015-04-29 16:25:40 -07:00
Ryan Huffman
0d2991b9b0
Update edit.js to buffer mouseMove events
...
This helps keep events from getting backed up on the event queue by
handling move events in the update() loop and dropping extra move events
that might come before an update.
2015-04-29 16:24:36 -07:00
Stephen Birarda
cb588debfe
handle display of more complex json stats in domain-server
2015-04-29 16:21:35 -07:00
Seth Alves
3c2894adb3
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits
2015-04-29 15:59:53 -07:00
Seth Alves
b041fd1b7f
AssignmentClientMonitor now waits() on children
2015-04-29 15:58:56 -07:00
Seth Alves
69766f6e59
cleanups
2015-04-29 15:34:31 -07:00
Seth Alves
e985f56b12
cleanups
2015-04-29 15:30:13 -07:00
Seth Alves
009bb9dc71
all 4 types of assignment-client appear to exit cleanly, now
2015-04-29 15:16:00 -07:00
Philip Rosedale
5e76e01b20
Merge pull request #4723 from ericrius1/mouseGrab
...
added grab.js script, which allows users to grab and fling physical obje...
2015-04-29 15:10:43 -07:00
Stephen Birarda
31c067cac5
fix change of keypath after handling array index
2015-04-29 15:10:04 -07:00
Stephen Birarda
b55889597d
complete unmarshal of breakable json using QVariant
2015-04-29 15:03:49 -07:00
Stephen Birarda
b17191a20f
add method to convert a QStringList back to QJsonObject
2015-04-29 12:40:24 -07:00
Seth Alves
e7d8bccd5d
cleanups
2015-04-29 12:03:54 -07:00
Seth Alves
d2cd4fc405
types 0 and 1 exit cleanly, type 6 crashes
2015-04-29 11:56:45 -07:00
Stephen Birarda
24576574ae
add breaking of marshaled buffer to QStringList
2015-04-29 11:20:07 -07:00
Stephen Birarda
85919972e3
resolve conflicts on merge with upstream/master
2015-04-29 10:45:25 -07:00
Stephen Birarda
c7a7bc1646
handle sending of JSONBreakableMarshal data via sendStats
2015-04-29 10:44:17 -07:00
Andrew Meadows
5a388a0c14
Merge pull request #4722 from birarda/avatar-mixer-debug
...
add option to display AvatarData receive stats with display name
2015-04-29 10:00:24 -07:00
Stephen Birarda
e933ab2e84
update win required version of OpenSSL
2015-04-29 09:59:20 -07:00
Stephen Birarda
36a26ad416
update BUILD.md for new OpenSSL req
2015-04-29 09:58:54 -07:00
Eric Levin
489fbaac57
added grab.js to defaultScripts.js
2015-04-29 09:45:58 -07:00
Eric Levin
8b9236a18d
added grab.js script, which allows users to grab and fling physical objects
2015-04-29 09:44:22 -07:00
Stephen Birarda
61b4025526
remove the uneeded curly braces for default ctor
2015-04-29 09:33:23 -07:00
Seth Alves
b2e99b754f
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits
2015-04-29 08:23:27 -07:00
Brad Hefta-Gaub
7414201845
Merge pull request #4721 from ctrlaltdavid/20514
...
DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js
2015-04-28 20:44:09 -07:00
Brad Hefta-Gaub
b422ffe528
Merge pull request #4719 from ericrius1/avatarRange
...
Added ability to check if an avatar is within specified range of a posit...
2015-04-28 20:39:03 -07:00
Seth Alves
02fd9987c7
rework audio mixer so it can exit cleanly
2015-04-28 18:38:41 -07:00
Stephen Birarda
1995fa6a5e
fix return value comment in SimpleMovingAverage
2015-04-28 18:28:12 -07:00
Stephen Birarda
c52426385d
code review comments for #4713
2015-04-28 18:28:05 -07:00
Stephen Birarda
f9a25d7089
add Menu option to toggle Avatar receive stats
2015-04-28 18:27:54 -07:00
Stephen Birarda
f2dcacffd0
show avatar data receive rate by default with display name
2015-04-28 18:27:42 -07:00
Stephen Birarda
68998f4423
cleanup AudioMixer stats to be properly nested
2015-04-28 18:19:16 -07:00
Philip Rosedale
cd159b7ae2
Merge pull request #4690 from AndrewMeadows/bispinor
...
use fallback avatar movement logic when skeleton model still downloading
2015-04-28 17:45:09 -07:00
samcake
ff2b1af18c
Merge pull request #4720 from ZappoMan/hackTest
...
Fix entities rendering wrong when avatar scale !== 1.0
2015-04-28 17:30:15 -07:00
Stephen Birarda
4e6979cac8
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-mixer-throttling
2015-04-28 16:50:07 -07:00
Stephen Birarda
698fcdfbbf
add JSONBreakableMarshal to help with MTU stats sending
2015-04-28 16:50:00 -07:00
Stephen Birarda
404cd67bb7
Merge pull request #4716 from sethalves/assignment-client-exits
...
assignment-client shouldn't try to save contents of its nonexistent address bar
2015-04-28 19:40:44 -04:00
ZappoMan
664d126465
remove scale from Camera class since it was only used by avatar and was causing problems with no obvious benefit
2015-04-28 16:34:33 -07:00
ZappoMan
aec0bd1693
dont change camera scale with avatar scale
2015-04-28 16:26:17 -07:00
Andrew Meadows
ce7bad40ac
Merge pull request #4717 from ZappoMan/backupErrors
...
add call to perror() to get OS level error details on failed backups
2015-04-28 16:01:01 -07:00
samcake
85cd6cbff2
Merge pull request #4700 from jherico/vr_menus
...
VR menus
2015-04-28 15:59:46 -07:00
Andrew Meadows
a121ac08b3
Merge pull request #4715 from jherico/audio_crash
...
Attempting to resolve possible crash case for scripts playing sounds
2015-04-28 15:58:54 -07:00
Stephen Birarda
77be0012cf
cleanup stats packaging in AudioMixer
2015-04-28 15:35:51 -07:00
Andrew Meadows
5537c9e042
merge upstream/master into andrew/bispinor
...
Conflicts:
libraries/physics/src/DynamicCharacterController.cpp
2015-04-28 15:18:02 -07:00
