Brad Hefta-Gaub
6a7fa63327
classify ScriptEngine errors better, and send them as signal to JS
2016-12-20 09:00:01 -08:00
Seth Alves
576eed9941
use a mutex to avoid a smaller race
2016-11-10 17:12:06 -08:00
Ryan Huffman
dd1a23ea01
Add Script.generateUUID
2016-10-28 13:42:03 -07:00
Anthony J. Thibault
2193c5faad
Integrated controller display from tutorial scripts + assets
2016-10-20 18:24:58 -07:00
Thijs Wenker
7e3073e163
fix spelling bugs
2016-09-29 22:13:27 +02:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Anthony J. Thibault
1be434342b
Work In Progress snapshot
...
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
2016-08-12 17:11:59 -07:00
Brad Hefta-Gaub
2d199fe3d0
rename function for better clarity
2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
83dc9ea6bb
punish slow scripts and don't send updates while physics is still loading
2016-07-25 21:46:30 -07:00
Seth Alves
49769f7d29
trying again -- frantic clicking on reload no longer appears to wedge things
2016-05-25 13:39:13 -07:00
Seth Alves
b0ce65ec01
trying to mimic previous behavior more closely
2016-05-25 11:42:06 -07:00
Seth Alves
1ef0f8055b
fix grammar in comment
2016-05-20 10:12:59 -07:00
Seth Alves
35065ab05e
remove unused setter
2016-05-20 10:12:38 -07:00
Seth Alves
aa58cad93e
code review
2016-05-20 09:54:54 -07:00
Seth Alves
9ad488ba7b
fix method name to match coding standard
2016-05-19 16:08:44 -07:00
Seth Alves
4e862941cb
fix a race when restarting scripts -- avoid the old not-yet-stopped script from being considered the restart script
2016-05-19 14:51:56 -07:00
Zach Pomerantz
7d4276d15f
Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor
2016-05-16 10:51:23 -07:00
Zach Pomerantz
2140dc77b3
Rename wait and unload in best thread
2016-05-13 16:14:22 -07:00
Zach Pomerantz
36565598a7
Hide script stop behind accessor and fix friendship
2016-05-13 15:52:53 -07:00
Zach Pomerantz
59e4b9c356
Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown
2016-05-13 15:28:12 -07:00
Zach Pomerantz
70d0ebb91c
Consolidate stoppingAllScripts to ScriptEngines::_stopped
2016-05-13 15:24:15 -07:00
Zach Pomerantz
806d06b552
Wait on old entity script engines in threadpool
2016-05-12 17:51:40 -07:00
Zach Pomerantz
7e82494a66
Add cap on entities scripting thread stop time
2016-05-12 17:51:37 -07:00
Zach Pomerantz
2cc788f98d
Rename ScriptEngine::wait to match std threading
2016-05-12 17:51:35 -07:00
Zach Pomerantz
820fdf09e2
Remove unused ScriptEngine::_wantSignals
2016-05-12 12:42:29 -07:00
Brad Davis
40316498a4
Enable script debugging
2016-05-09 17:02:40 -07:00
Zach Pomerantz
173d2a590c
Use sleep_until for ScriptEngine
2016-05-06 19:30:37 -07:00
Zach Pomerantz
1a0a623d5f
Report ScriptableResource memory cost to engine
2016-04-20 20:18:22 -07:00
Zach Pomerantz
7d9790ecb5
Add request for garbage collection
...
Add garbage collection request in prod
2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
0d20f2468e
CR feedback
2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
47900df3e7
cleanup
2016-04-18 10:43:08 -07:00
Brad Hefta-Gaub
0520363da8
cleanup
2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
9db0fe0d11
switch to using QSharedPointer for _entitiesScriptEngine
2016-04-18 09:46:04 -07:00
howard-stearns
7b7ec5a174
Prohibit entity script file includes from outside the original entity
...
script's directory (unless its in our resources).
2016-04-04 16:41:21 -07:00
Stephen Birarda
5ad4645b47
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-10 13:28:59 -08:00
Stephen Birarda
181b20f673
move the AssetScriptInterface to script-engine
2016-03-08 14:49:26 -08:00
Anthony J. Thibault
0d62b10a8f
Added Mat4 support to script
...
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
2016-03-07 16:16:14 -08:00
Howard Stearns
05943ed353
Entity scripts keep of the which entity they are executing for. When the entity goes away, any created timers do, too. Also, loading interface scripts is not allowed from entity scripts.
2016-03-01 16:50:58 -08:00
Brad Davis
d28f80aa07
Moving running scripts functionality to scripting library
2016-01-11 12:44:03 -08:00
Ryan Huffman
5f60aeef22
Update ScriptEngine::_isUserLoaded to be atomic
2015-12-09 14:50:48 -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
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
Stephen Birarda
762709748d
Merge pull request #6473 from ZappoMan/waitForScriptThreads
...
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
2015-11-24 10:39:22 -06:00
samcake
a1668cdc73
Let the AssertClient JS interface use global vars
2015-11-23 22:28:59 -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
Brad Hefta-Gaub
f80a765a29
add Assets.uploadData() and Assets.downloadData()
2015-11-19 17:28:20 -08:00
Atlante45
b15054c1fb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:41:06 -08:00