Ryan Huffman
f6df7e298e
Merge branch 'script-path-resolution' into baseball
2015-11-09 14:03:10 -08:00
Atlante45
b15054c1fb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:41:06 -08:00
Eric Levin
7700e67734
Merge pull request #6326 from imgntn/entity_params
...
Add Ability to Pass Parameters When Calling Methods on Entities
2015-11-09 12:17:58 -08:00
Ryan Huffman
b835711266
Update script engine path resolution behavior
...
The path resolution will now be relative to the script currently
being evaluated *on its initial evaluation.* The previous behavior
was that all paths would be resolved relative to the root script
for client scripts, and inconsistent for entity scripts depending
on the order that scripts were loaded. The entity script situation
was particularly bad because including more than 1 level deep produced
inconsistent results.
2015-11-09 12:04:17 -08:00
Atlante45
55c6706f76
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-06 13:31:39 -08:00
James B. Pollack
e928c8278b
overload a single function and cleanup, add examples
2015-11-06 11:48:51 -08:00
James B. Pollack
3cee569bae
pass parameters to entities
2015-11-05 16:57:39 -08:00
James Pollack
751d51ee72
entity call params
2015-11-05 14:19:11 -08:00
Atlante45
0508091130
Rebase fixes
2015-11-03 11:37:57 -08:00
Zach Pomerantz
6bf9a4518a
Bail early from ScriptEngine::run if stopped
...
evaluate() bails anyway, so this will avoid the cost of init().
If run() is invoked from runInThread(), this may avoid a race
where _isRunning is set after it is checked because the check
occured during init().
2015-11-03 11:24:04 -08:00
Stephen Birarda
8cd41b9383
resolve conflicts on merge with huffman/baseball
2015-11-03 11:13:15 -08:00
Ryan Huffman
afffe7f5c6
Merge branch 'master' of github.com:Atlante45/hifi into baseball
2015-11-03 11:10:14 -08:00
Brad Hefta-Gaub
8839458d54
Merge pull request #6242 from highfidelity/controllers
...
New Controller interfaces/api
2015-10-30 12:47:51 -07:00
Howard Stearns
ada32dd260
typo
2015-10-29 19:17:52 -07:00
Stephen Birarda
d03a837263
resolve conflicts on merge with upstream master
2015-10-29 14:28:50 -07:00
Brad Davis
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
Howard Stearns
d79d0bc5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 08:25:41 -07:00
Atlante45
136747929e
Fix typo
2015-10-28 17:11:46 -07:00
Atlante45
7695afec0a
Fix ScriptEngine crash
2015-10-28 16:43:41 -07:00
Stephen Birarda
cee029f752
resolve conflicts on merge with upstream/master
2015-10-28 15:19:10 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
Atlante45
c0138bd189
Rename check functions and make them static
2015-10-27 12:39:40 -07:00
Atlante45
ffe73348fb
Move check functions to cpp only
2015-10-27 12:11:27 -07:00
Atlante45
a53a576aa3
checkExceptions after testing entity scripts in the sandbox
2015-10-27 12:11:27 -07:00
Atlante45
ea56f965a4
Lambda conversion fix for windows
2015-10-27 12:11:27 -07:00
Atlante45
3e43a3c345
Some more script checks
2015-10-27 12:11:27 -07:00
Atlante45
13b7fa6b5d
Typo
2015-10-27 12:11:27 -07:00
Atlante45
c8c9118d4d
Improve script engine error logging + some cleanup
2015-10-27 12:11:27 -07:00
Atlante45
3742c169b5
Make handler generators more readable
2015-10-27 12:11:27 -07:00
Atlante45
380139364c
checkExceptions after testing entity scripts in the sandbox
2015-10-26 12:41:49 -07:00
Atlante45
1c048880ee
Lambda conversion fix for windows
2015-10-26 12:27:48 -07:00
Atlante45
8d72fcada5
Some more script checks
2015-10-26 11:33:13 -07:00
Atlante45
9771361840
Typo
2015-10-26 10:49:41 -07:00
Howard Stearns
4b4907c9ef
Allow multiple scripts to register, and allow them to specify the specific anim vars they are interested in.
2015-10-26 10:04:55 -07:00
Howard Stearns
e11b0add9a
Update safety trampoline with correct arguments.
2015-10-24 15:29:49 -07:00
Atlante45
421d967e49
Improve script engine error logging + some cleanup
2015-10-23 15:41:31 -07:00
Atlante45
4e33aa84e8
Make handler generators more readable
2015-10-23 15:41:31 -07:00
Howard Stearns
2b7ceffd64
Get rid of globalObject().property("MyAvatar").property("animationStateHandlerResult").
2015-10-22 16:23:09 -07:00
Howard Stearns
1d0464ede5
Name change and thread checks per comments.
2015-10-22 15:15:10 -07:00
Howard Stearns
9fd61907f5
Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts.
2015-10-21 20:50:07 -07:00
Brad Davis
bea6fdd890
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
734a39f962
Breaking up UserInputMapper, restoring some mappings
2015-10-18 18:58:03 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Brad Davis
e39219c2b5
Fixes and PR comments
2015-10-14 16:51:52 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
Brad Hefta-Gaub
d3ee9b0f39
more work on exposing device inputs as JavaScript named constants
2015-10-09 20:58:23 -07:00
Brad Davis
99d1e17ae8
Support reload-on-change for local scripts
2015-10-07 19:18:59 -07:00
Brad Hefta-Gaub
08babecb75
add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps
2015-09-17 19:51:21 -07:00
Brad Hefta-Gaub
b16dfb8a9e
whitespace repair
2015-09-17 17:41:54 -07:00
Brad Hefta-Gaub
81255c8379
whitespace repair
2015-09-17 17:40:41 -07:00
