Commit graph

1031 commits

Author SHA1 Message Date
Zander Otavka
246a8457e1 Add some asserts 2016-08-08 15:12:17 -07:00
Zander Otavka
a826f4eca1 Fix console errors for javascript: urls 2016-08-03 15:55:51 -07:00
Zander Otavka
f9b6db12e3 Fix parsing of embedded entity scripts
Now correctly identifies when scripts are not urls as well as
javascript: urls.
2016-08-03 13:48:27 -07:00
Stephen Birarda
4cdc98287b add canKick to USI, revert constants to production 2016-08-02 14:35:51 -07:00
Stephen Birarda
7e6dbf2d1a add a kick request packet and send from NL 2016-08-02 14:35:11 -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
Stephen Birarda
609900f246 move ignore set handling to NodeList 2016-07-13 15:06:31 -07:00
Stephen Birarda
6b6513d5f9 immediately fade out ignored avatars 2016-07-13 15:06:31 -07:00
Stephen Birarda
d5af323057 don't self-ignore from UsersScriptingInterface 2016-07-13 15:06:31 -07:00
Stephen Birarda
095bd7e6c8 cleanup logging, move packet parsing to mixers 2016-07-13 15:06:31 -07:00
Stephen Birarda
441b6d2813 fix recursive mutex lock, conditional, logging 2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6 add a scripting interface to ignore users 2016-07-13 15:06:31 -07:00
Seth Alves
6786a07ac2 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-07 09:53:24 -07:00
humbletim
b7874116b9 fix TypedArray byte ordering and .subarray end indexing 2016-07-02 23:36:08 -04:00
Seth Alves
4e70e8ed42 js call to ray-pick against avatars 2016-06-28 09:55:49 -07:00
Bradley Austin Davis
34c8d257d2 Fixing issues with unclosed groups in settings persistence 2016-06-14 09:49:38 -07:00
Brad Hefta-Gaub
8ec425106a Merge pull request #7968 from birarda/audio-is-playing
fix collision of isPlaying property and slot for AudioInjectors
2016-05-26 12:06:00 -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
Stephen Birarda
ba77aaf7ef remove collision of isPlaying property and slot 2016-05-25 11:06:08 -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
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
Zach Pomerantz
4c8ff557db Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash 2016-05-20 09:31:30 -07:00
Brad Hefta-Gaub
8760cd0807 Merge pull request #7929 from zzmp/fix/script-downloaded-shutdown
fix crash on shutdown from scriptDownloaded callback
2016-05-20 09:31:04 -07:00
Brad Hefta-Gaub
d521cd82a0 Merge pull request #7908 from Atlante45/fix/settings
fix settings getting reset
2016-05-19 17:53:15 -07:00
Seth Alves
3f5ed4bef8 set isStopping on other calls to stop 2016-05-19 16:15:33 -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
Brad Hefta-Gaub
ac15097f47 Merge pull request #7834 from huffman/feat/user-agent-plugins
Add system information to UserAgent in AccountManager requests
2016-05-19 11:53:14 -07:00
Zach Pomerantz
107b1b830e Stop ScriptCache callbacks when scripts are stopped 2016-05-18 17:46:12 -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
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Atlante45
de36cd150e Move runnings scripts setting storage
So that it doesn't conflict with the "Settings" menu setting
storage.
	Running script would clear those settings while storing its data
	This adds some backward compatible code to move the scripts
settings to the new location.
2016-05-18 11:36:14 -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
4e62d7ff61 Define ScriptEngines::isStopped inline 2016-05-13 17:28:21 -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
13610b1220 Delete late-added script engines 2016-05-13 15:24:31 -07:00
Zach Pomerantz
70d0ebb91c Consolidate stoppingAllScripts to ScriptEngines::_stopped 2016-05-13 15:24:15 -07:00