Ryan Huffman
f6a037339f
Fix bad ctor call causing build failure
2017-01-24 14:00:55 -08:00
David Rowe
1b05ae8a82
Make handling of Clara.io download-ready state transition more robust
2017-01-25 11:00:07 +13:00
Howard Stearns
559051beca
Merge pull request #9495 from howard-stearns/bypass-filter-with-lock-rights
...
bypass entity-server edit filter if you have lock/unlock rights
2017-01-24 13:38:27 -08:00
Zach Pomerantz
997c015b7f
start audio-mix timestamp now
2017-01-24 21:30:07 +00:00
Zach Pomerantz
2bc725e2be
change audio-mixer throttling to integral-based linear throttle/backoff
2017-01-24 21:30:05 +00:00
Zach Pomerantz
b028d84aab
fix audio-mixer sleep
2017-01-24 21:29:20 +00:00
Zach Pomerantz
09f41bff00
improve audio-mixer timings
2017-01-24 21:29:20 +00:00
Zach Fox
53173d8f03
use var for maxvelocity
2017-01-24 12:50:18 -08:00
ZappoMan
1309af6d7a
CR feedback
2017-01-24 12:47:47 -08:00
ZappoMan
b3eb87e8db
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-24 12:22:20 -08:00
ZappoMan
44b8a57ed3
more CR feedback
2017-01-24 12:18:33 -08:00
howard-stearns
c25072c1db
Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-24 12:15:39 -08:00
Zach Fox
0e16686fb8
Change the velocity filter to 5
2017-01-24 12:11:33 -08:00
ZappoMan
cb812ca506
CR feedback
2017-01-24 12:06:31 -08:00
ZappoMan
8b662647bd
CR feedback
2017-01-24 12:01:57 -08:00
howard-stearns
da914f0a4f
bypass entity-server edit filter if you have lock/unlock rights
2017-01-24 11:59:31 -08:00
Zach Fox
3a17a64c99
V1 of these filters
2017-01-24 11:56:50 -08:00
Stephen Birarda
9282f5555a
Merge pull request #34 from Atlante45/ess-pr
...
Temporarily remove AvatarList from EntityScriptServer
2017-01-24 11:53:13 -08:00
Clément Brisset
c8e27ec31b
Merge pull request #19 from huffman/feat/script-context
...
Add the ability to get the context that a script is running in
2017-01-24 11:52:35 -08:00
Atlante45
e54e35fbbe
Temporarily remove AvatarList from EntityScriptServer
2017-01-24 11:49:54 -08:00
Ryan Huffman
fcaca8930a
Fix enum name in EntityScriptServer
2017-01-24 08:31:58 -08:00
Zach Pomerantz
39acba5455
throttle audio streams by count using PI controller
2017-01-23 21:30:41 -05:00
Howard Stearns
f3956b3fb0
Merge pull request #9477 from howard-stearns/minimum-edit-entity-filter
...
Minimum edit entity filter
2017-01-23 18:04:52 -08:00
Stephen Birarda
479aa93ab2
Merge pull request #9480 from birarda/bug/web-entity-safe-url
...
cleanup debug for safe web entity URLs
2017-01-23 16:53:07 -08:00
Brad Hefta-Gaub
e4c59472ee
Merge pull request #9468 from kencooke/audio-mixformat-float
...
Fix another audio failure
2017-01-23 16:52:54 -08:00
Stephen Birarda
9229a07f6a
avoid failing scheme check
2017-01-23 16:46:59 -08:00
ZappoMan
0655b47dd7
fix warnings
2017-01-23 16:44:55 -08:00
Stephen Birarda
7362bf16c1
use isParentOf to check script whitelist, clarify description in settings
2017-01-23 16:44:28 -08:00
ZappoMan
efdc82f194
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 16:39:42 -08:00
Ryan Huffman
f0f5f8871c
Fix Overlay-as-child of model entity with reg point
...
This fixes as issue where when you set the parent of an overlay to be a
model entity with a non-(0.5, 0.5, 0.5) registration point, the overlay would
still be positioned relative to the center of the model. The issue is
that the default parent joint index was 0, which is the center of the
model.
Entities had a default parent joint index of -1 (technically 65535
because it is a uint16). Avatars previously defaulted to 0, and that is
maintained here.
2017-01-23 16:08:01 -08:00
ZappoMan
6801099cd9
more cleanup
2017-01-23 16:03:07 -08:00
Ryan Downe Karpf
3f151cb3d7
Merge pull request #9483 from Atlante45/fix/rescale
...
Fix Edit.js rescale for decimal values
2017-01-23 15:44:10 -08:00
howard-stearns
ada685a376
cr changes
2017-01-23 15:31:55 -08:00
Zach Pomerantz
445a97e07c
Merge pull request #9476 from zzmp/js/audio-injector-finished
...
Connect audio injector signal to scripting
2017-01-23 18:13:54 -05:00
ZappoMan
81b5a3c585
more cleanup
2017-01-23 15:12:54 -08:00
Ryan Downe Karpf
e080746990
Merge pull request #9481 from huffman/fix/edit-collision-names
...
Update the name of the collision shapes used in edit.js properties
2017-01-23 15:10:01 -08:00
ZappoMan
5f9f051c3c
more tweaks
2017-01-23 15:01:50 -08:00
Atlante45
a1962e274d
Fix rescale for 0.x values
2017-01-23 14:35:16 -08:00
Ryan Huffman
f6d5a59c8a
Fix width of edit.js dropdown to accomodate collision options
2017-01-23 14:18:56 -08:00
Ryan Huffman
d108fabd0b
Update the name of the collision shapes used in edit.js properties
...
Update the names to be consistent with what is shown on the add model
dialog.
2017-01-23 13:56:48 -08:00
Stephen Birarda
a8118e83ff
cleanup debug for safe web entity URLs
2017-01-23 13:54:43 -08:00
howard-stearns
24a9cf1f23
Merge branch 'edit-entity-filter' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-23 13:52:39 -08:00
Stephen Birarda
db398b7850
check URL host for script whitelist, not startsWith
2017-01-23 13:36:02 -08:00
ZappoMan
7ba41c72ef
cleanup debugAvatarMixer
2017-01-23 13:31:06 -08:00
ZappoMan
8ffd9412f3
cleanup simpleBot
2017-01-23 13:23:05 -08:00
Philip Rosedale
45a4ec349e
Merge pull request #9467 from humbletim/21139
...
Code Review for Job #21139 - Do not allow grab or far-grab or click while editing objects
2017-01-23 13:20:57 -08:00
ZappoMan
e0bad95257
some cleanup
2017-01-23 13:18:55 -08:00
Clément Brisset
19622f86bf
Merge pull request #9475 from Atlante45/fix/injector-options
...
Fix invalid volume values in injector options silencing all injectors
2017-01-23 13:17:55 -08:00
Stephen Birarda
1802e1520d
change some dynamic_cast to static_cast for DomainServerNodeData
2017-01-23 13:15:48 -08:00
Stephen Birarda
fb8d2e34fb
fix needless reinterpret_cast for DomainServerNodeData
2017-01-23 13:14:53 -08:00
