howard-stearns
|
9cbc4fd1b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource
|
2017-01-25 16:23:52 -08:00 |
|
howard-stearns
|
b62f3e550a
|
error check/log on execution, too
|
2017-01-25 16:23:07 -08:00 |
|
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 |
|
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 |
|
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 |
|
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
|
d607e74d3c
|
Merge pull request #9501 from Atlante45/fix/steam-api
Fix Steam scripting interface calls
|
2017-01-25 08:21:02 -08: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 |
|
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 |
|
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 |
|
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 |
|
Ryan Huffman
|
f6a037339f
|
Fix bad ctor call causing build failure
|
2017-01-24 14:00:55 -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 |
|
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 |
|
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 |
|
Stephen Birarda
|
7362bf16c1
|
use isParentOf to check script whitelist, clarify description in settings
|
2017-01-23 16:44:28 -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 |
|
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 |
|
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 |
|