samcake
41525a7c4d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 16:20:41 -08:00
Zach Pomerantz
919a4b6728
Split global JS Scene into Render
2015-12-18 10:33:41 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
James B. Pollack
d21e4ff5e1
Merge pull request #6592 from huffman/script-engine-fixes
...
Fix concurrency issues for bools in ScriptEngine
2015-12-10 10:48:54 -08:00
Brad Davis
978d39b7f4
Moving OpenVR to external plugin and updating to latest version
2015-12-09 16:20:24 -08:00
Ryan Huffman
a21e07327d
Update ScriptEngine::stop() to always run on its thread
2015-12-09 14:50:30 -08:00
Ryan Huffman
e7a1550b64
Update ScriptEngine::finished to include
2015-12-09 14:50:09 -08:00
Ryan Huffman
4dbfd3bfd9
Fix concurrency issues for bools in ScriptEngine
...
Several member variables were unsafely being accessed from multiple threads. Making these variables std::atomic makes this safe.
2015-12-08 11:13:27 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
46556b7fa5
Merge pull request #6513 from huffman/fix-script-race-condition
...
Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting
2015-12-03 17:17:42 -08:00
Ryan Huffman
4d84362757
Fix ScriptEngine setting _isFinished when it shouldn't
2015-12-01 11:30:56 -08:00
Stephen Birarda
c3f3639374
more spacing adjustments in ScriptEngine.cpp
2015-11-30 15:57:10 -08:00
Stephen Birarda
b1a69bb2cf
cleanup spacing in ScriptEngine
2015-11-30 15:52:10 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
David Rowe
e25d4c17e8
Fix InputController (Leap Motion) not able to be created
2015-11-25 09:29:40 +13:00
Brad Hefta-Gaub
5f88d958ab
CR feedback
2015-11-23 18:26:15 -08:00
Brad Hefta-Gaub
ce46c30647
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-23 16:27:06 -08:00
David Rowe
c72c6a0a47
Make multiline strings from JavaScript's print() readably in log file
...
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
2015-11-21 10:44:21 +13:00
Brad Hefta-Gaub
f80a765a29
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:28:20 -08:00
samcake
d2f3b48637
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-17 17:36:38 -08:00
Brad Hefta-Gaub
2f142eb088
add a receiver example
2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
Eric Levin
a2abc11df1
Merge pull request #6351 from huffman/script-path-resolution
...
Update script engine path resolution behavior to behave consistently
2015-11-10 14:10:42 -08:00
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
