Commit graph

50005 commits

Author SHA1 Message Date
Stephen Birarda
42083a1a6d Merge pull request #9457 from Atlante45/entity-script-server
Entity script server
2017-01-25 15:37:27 -08:00
howard-stearns
34e9c5debc initial script error checking 2017-01-25 14:56:06 -08:00
howard-stearns
df91ef5f5f blocking fetch of http scripts 2017-01-25 14:22:42 -08:00
Clément Brisset
3f34a9e832 Merge pull request #40 from birarda/entity-script-server
hack to accept possibly newer server scripts
2017-01-25 13:21:45 -08:00
Zach Pomerantz
fb31254f57 add proportional term to audio-mixer throttling controller 2017-01-25 21:18:03 +00:00
Zach Pomerantz
46afa7e764 DRY audio-mixer all-stream mixes 2017-01-25 21:18:03 +00:00
Zach Pomerantz
1153c1900f reorder AudioMixerSlave::prepareMix to be sequential 2017-01-25 21:18:03 +00:00
Zach Pomerantz
66c82f3193 clean AudioMixerSlave::addStreamToMix 2017-01-25 21:18:03 +00:00
Zach Pomerantz
6cfaa624a5 mv helpers from AudioMixerSlave 2017-01-25 21:18:03 +00:00
Stephen Birarda
11005bdc55 Merge pull request #41 from Atlante45/ess-pr
Merge branch 'master' of https://github.com/highfidelity/hifi into es…
2017-01-25 13:14:03 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
kunalgosar
7b896f961b change server to default to not auto-muting 2017-01-25 13:00:57 -08:00
Ryan Downe Karpf
b053fb55aa Merge pull request #9478 from birarda/bug/too-many-casts
some reinterpret/dynamic cast cleanup in domain-server
2017-01-25 12:47:27 -08:00
Stephen Birarda
304618f51d cleanup comment and scoping for server script URL changes 2017-01-25 12:39:41 -08:00
Stephen Birarda
f1b4f79ad9 a simple hack to accept newer server scripts 2017-01-25 12:39:41 -08:00
Zach Pomerantz
9bdea98d21 clean AudioMixerSlave::mix 2017-01-25 19:24:12 +00:00
Zach Fox
fc18df4942 Merge pull request #9504 from zfox23/FILTERS_ZoneFilter
ENTITY FILTERS: "Zone Filter"
2017-01-25 11:04:33 -08:00
Bradley Austin Davis
70664b64eb Attempt to account for sparse texture memory overhead 2017-01-25 10:59:49 -08:00
Zach Pomerantz
275e337a80 rm unused LOUDNESS_TO_DISTANCE_RATIO 2017-01-25 18:55:54 +00:00
Ryan Huffman
f165e364e2 Merge pull request #39 from huffman/entity-script-server
Remove entity server script status log spam from edit.js
2017-01-25 09:33:25 -08:00
Ryan Huffman
2bb7a7a4a6 Remove entity server script status log spam from edit.js 2017-01-25 09:32:25 -08:00
Ryan Huffman
9e4f47d57f Update AvatarData to use the default parent joint index 2017-01-25 09:08:54 -08:00
Ryan Huffman
d607e74d3c Merge pull request #9501 from Atlante45/fix/steam-api
Fix Steam scripting interface calls
2017-01-25 08:21:02 -08:00
David Rowe
74b878a276 Fix threading of message box updates 2017-01-25 17:48:58 +13:00
David Rowe
dcd632013f Better variable name 2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6 Fix up Clara.io error handling 2017-01-25 16:36:06 +13:00
Clément Brisset
5cd0af9136 Merge pull request #37 from birarda/entity-script-server
fix interest list checks, remove unecessary sets
2017-01-24 18:46:26 -08:00
Stephen Birarda
cd1ddd3a3a Merge pull request #38 from Atlante45/ess-pr
Fix wrong status when removing script
2017-01-24 18:44:05 -08:00
Atlante45
9cacde2416 Fix wrong status when removing script 2017-01-24 18:36:27 -08:00
Stephen Birarda
9b8cbba53f add isInInterestSet to DomainServer for extra checks 2017-01-24 18:32:33 -08:00
Stephen Birarda
586c3512a7 remove useless additional includeThisEntity sets 2017-01-24 17:35:45 -08:00
Clément Brisset
4ec5d70e76 Merge pull request #36 from birarda/entity-script-server
force full send if query changes, don't check inclusion if not updated
2017-01-24 17:26:30 -08:00
Stephen Birarda
e511b6e84c cleanup connect check in DomainServer 2017-01-24 17:14:05 -08:00
Stephen Birarda
fc42c1bc94 don't tell ESS about script Agents that won't talk to it 2017-01-24 17:10:05 -08:00
Atlante45
b4400af026 Rename Steam.isRunning to Steam.running 2017-01-24 17:06:50 -08:00
Zach Fox
9ce3dc134a V1 of the filter 2017-01-24 16:53:50 -08:00
Stephen Birarda
69b47dcf50 use currentParameters instead of getJSONParameters() 2017-01-24 16:49:17 -08:00
Stephen Birarda
67a3d97f81 cleanup includeThisEntity check 2017-01-24 16:41:20 -08:00
Stephen Birarda
543d0ce77e add a comment about usesFrustum check in EntityTreeElement 2017-01-24 16:36:44 -08:00
Stephen Birarda
33378ede5c force full scene send if json parameters changed 2017-01-24 16:34:57 -08:00
Zach Pomerantz
4ac0df8f8d throttle audio by node, not stream 2017-01-25 00:19:38 +00:00
Zach Pomerantz
b7148b338d change audio-mixer backoff threshold 2017-01-25 00:19:28 +00:00
Atlante45
808d336fe6 Protect again empty plugin 2017-01-24 16:17:49 -08:00
howard-stearns
8eff3b1e83 restructure initialization so that server can do server-like things to get
the filter program from file
2017-01-24 16:14:41 -08:00
Atlante45
b4d3a2b79f Fix member not being set 2017-01-24 16:13:28 -08:00
Stephen Birarda
5a3f99a504 Merge pull request #9479 from birarda/bug/whitelist-starts-with
use host check for entity script whitelist instead of startsWith
2017-01-24 15:21:25 -08:00
Zach Fox
463bff6750 Merge pull request #9496 from zfox23/FILTERS_NoModelChange_VelocityClamp
ENTITY FILTERS: "Can't change model" & "Can't exceed velocity X"
2017-01-24 15:09:04 -08:00
Zach Fox
9796a476ea Clamp negative velocity too 2017-01-24 15:08:17 -08:00
ZappoMan
8c2c05719a fix warning 2017-01-24 14:21:47 -08:00
Stephen Birarda
bd340f99ce Merge pull request #35 from huffman/entity-script-server
Fix bad ctor call causing build failure
2017-01-24 14:17:51 -08:00