Commit graph

534 commits

Author SHA1 Message Date
Ryan Huffman
73a0266edb Fix case in Script.include where urls is empty 2016-10-18 11:41:15 -07:00
Ryan Huffman
03c01bb9b0 Add exception handling to callEntityMethod calls 2016-10-07 10:30:18 -07:00
howard-stearns
6cae62f584 init the accumulator for script elapsed time 2016-10-07 09:38:30 -07:00
Ryan Huffman
bbd7174d06 Fix script paths not resolving correctly 2016-10-06 17:37:47 -07:00
Ryan Huffman
42b0d8230c Move extract/encode enitty functions in ScriptEngine 2016-10-05 19:14:42 -07:00
Ryan Huffman
df09254437 Fix EntityItemID not being converted to string in ScriptEngine 2016-10-05 15:45:54 -07:00
Ryan Huffman
8e3f4b705f Add entity url back into entity script filenames 2016-07-09 03:57:29 -07:00
Ryan Huffman
e3be333144 Remove 'EntityID' from entity script filename 2016-10-05 09:28:12 -07:00
Ryan Huffman
667a737018 Fix ScriptEngine not properly resolving paths 2016-10-05 09:28:12 -07:00
howard-stearns
c806f6cad2 better shutdown check for timer firings 2016-09-30 16:05:39 -07:00
Thijs Wenker
3d14a32d17 fix controller::ScriptingInterface not found warning in AC 2016-09-29 22:11:12 +02:00
elisa-lj11
cdc5dde40e Merge remote-tracking branch 'highfidelity/master' into zip_project 2016-08-23 11:22:43 -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
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
f277a019bf FileScriptingInterface
Created new .cpp and .h for the download and unzipping of a model
2016-08-04 16:46:56 -07:00
Brad Hefta-Gaub
74a3835a1e CR feedback 2016-07-28 15:15:33 -07:00
Brad Hefta-Gaub
22619a66ba process events also 2016-07-28 10:51:17 -07:00
Brad Hefta-Gaub
755989b8ff don't allow punished scripts to slow stop or shutdown 2016-07-28 10:01:05 -07:00
Brad Hefta-Gaub
2d199fe3d0 rename function for better clarity 2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
a12034cb45 fix unix warning, added comments 2016-07-26 07:54:55 -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
4e70e8ed42 js call to ray-pick against avatars 2016-06-28 09:55:49 -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
ef709c09d0 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 09:46:30 -07:00
Seth Alves
00336f4860 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-23 09:58:20 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Seth Alves
aa58cad93e code review 2016-05-20 09:54:54 -07:00
Zach Pomerantz
4c8ff557db Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash 2016-05-20 09:31:30 -07:00
Zach Pomerantz
8025a3f14c Prevent crash from script timers on shutdown 2016-05-18 17:30:34 -07:00
Zach Pomerantz
c480dcfddd Check thread validity after event processing 2016-05-18 16:26:54 -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
e1c130d02f Timeout long sandbox scripts 2016-05-12 17:51:39 -07:00
Zach Pomerantz
1107882be2 Throw to stop non-evaluating scripts 2016-05-12 17:51:38 -07:00
Zach Pomerantz
7e82494a66 Add cap on entities scripting thread stop time 2016-05-12 17:51:37 -07:00
Zach Pomerantz
f2f89ca062 Add logging to ScriptEngine lifetime 2016-05-12 17:51:36 -07:00
Zach Pomerantz
2cc788f98d Rename ScriptEngine::wait to match std threading 2016-05-12 17:51:35 -07:00
Zach Pomerantz
edf82c57ba Clean scripting thread deletion 2016-05-12 12:45:02 -07:00
Zach Pomerantz
13d602487f Remove guard over atomic in ScriptEngine::stop 2016-05-12 12:43:16 -07:00
Zach Pomerantz
820fdf09e2 Remove unused ScriptEngine::_wantSignals 2016-05-12 12:42:29 -07:00
Brad Hefta-Gaub
af6be7f5f3 Merge pull request #7845 from jherico/script_debug
Enable script debugging
2016-05-10 15:56:38 -07:00
Brad Davis
b117a4b8d7 Debugging menu destruction 2016-05-10 12:21:19 -07:00
Seth Alves
68201746aa Merge branch 'master' of github.com:highfidelity/hifi into fix-stanard-library-include-some-more 2016-05-09 18:39:37 -07:00
Brad Davis
40316498a4 Enable script debugging 2016-05-09 17:02:40 -07:00
Zach Pomerantz
7db082b915 Amend comment that was not a busy wait 2016-05-09 15:05:13 -07:00
Seth Alves
b0a5d8b719 make Script.include(/~/system/libraries/utils.js) work from web again 2016-05-08 08:45:58 -07:00