Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
...
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
Sam Gateau
acf51ad217
Merge pull request #16137 from jherico/fix/bugz-1398
...
BUGZ-1398: Tablet access to local HTML
2019-09-06 09:59:22 -07:00
Brad Davis
0511f87bad
BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U
2019-09-05 11:43:43 -07:00
humbletim
271fac4bca
Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge
2019-09-05 09:46:21 -04:00
David Rowe
6474705ca2
Reformat "supported script types" in Entities and Scripts signals
2019-09-04 21:06:30 +12:00
David Rowe
cf01d9f1af
Script.require() JSDoc fixes
2019-09-04 21:04:03 +12:00
jennaingersoll
037ad36262
Merge pull request #16103 from ctrlaltdavid/DOC-64
...
DOC-64: ScriptDiscoveryService API JSDoc
2019-08-30 22:35:39 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365
...
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
2019-08-30 13:10:09 -07:00
Brad Davis
428a58710d
BUGZ-1365: Ensure that by default web views can't access local content
2019-08-29 13:44:49 -07:00
Shannon Romano
b4d0c87654
Merge pull request #16117 from ctrlaltdavid/BUGZ-1316
...
BUGZ-1316: Fix crashes in Assets API
2019-08-29 09:07:37 -07:00
David Rowe
fb818c0726
Fix crash in Assets.setBakingEnabled() when callback undefined
2019-08-29 13:33:22 +12:00
David Rowe
746f97a0e0
Fix crash in Assets.getAsset() when callback undefined
2019-08-29 13:33:04 +12:00
Shannon Romano
f63fc15d4f
Merge pull request #16115 from sabrina-shanman/crash_shutdown_running-script
...
Attempt to fix crash from script running too late
2019-08-28 15:54:10 -07:00
sabrina-shanman
437f6b4096
Only say we're throwing a script error when we mean it
2019-08-28 14:58:57 -07:00
David Rowe
d52bb66048
Add missing JSDoc
2019-08-29 09:38:43 +12:00
sabrina-shanman
67a06b3a74
Attempt to fix crash from script running too late
2019-08-28 14:28:12 -07:00
David Rowe
8c735ed6ae
Fix ScriptDiscoveryService.scriptsModel.parent() crash for invalid index
2019-08-28 16:32:52 +12:00
David Rowe
757a4f908b
Fix ScriptDiscoveryService.scriptsModel.data() crash for invalid row
...
Also fixes unexpected data for invalid column > 1.
2019-08-28 16:32:22 +12:00
David Rowe
3e795d9b99
Typos and improvements
2019-08-27 10:03:26 +12:00
David Rowe
c19c1c9a5d
Scripts API JSDoc fixes
2019-08-27 09:24:01 +12:00
David Rowe
fff2a15960
ScriptsModel and ScriptsModelFilter classes' JSDoc
2019-08-27 09:24:01 +12:00
David Rowe
e1e74a2c34
ScriptDiscoveryService API JSDoc
2019-08-27 09:24:00 +12:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown
...
BUGZ-984: Wait for client entity-scripts to unload when shutting down
2019-08-16 10:12:38 -07:00
Simon Walton
9aacd136b8
Add blocking to script unload for client entity-scripts
2019-08-14 13:51:40 -07:00
Clement
90aeb636bd
Delete reply after the callback is executed
2019-08-12 17:21:22 -07:00
Clement
b2704da9ef
Don't manage _sendData's memory
2019-08-07 15:04:20 -07:00
Clement
0b72e4dc60
Make XML HTTP requests script owned
...
This was causing them to leak every time
2019-08-07 13:18:39 -07:00
amerhifi
a37ef7d80e
adding default script location setting for defaultscriptoverride runs. Prevents the second interface run to have no ui
2019-08-02 13:00:43 -07:00
amerhifi
0ee9de7ed8
lambda space
2019-08-02 11:24:21 -07:00
amerhifi
d05f1ac87f
adding ability to reload defaultOverrdie script without saving to settings:
2019-08-02 11:23:33 -07:00
Kalila R
8b6cce5889
Moved getTypeAsString function from public to protected
2019-07-30 17:26:49 -04:00
Simon Walton
2ebc6e66fe
Merge remote-tracking branch 'upstream/master' into scriptaudioinjector-delete-via-signal
...
Need 985 PR.
2019-07-26 09:53:23 -07:00
humbletim
058c81aa1a
Merge branch 'hifi-master' into kpi-v1-modkit-rc
2019-07-26 01:36:52 -04:00
Simon Walton
a9d3413626
Delete script audio-injector wrapper when wrapped object goes
2019-07-25 17:51:01 -07:00
Simon Walton
53cf915e8d
Guard for AudioInjectorManager existance; clear an audio interface pointer
2019-07-24 14:51:41 -07:00
humbletim
c5b2514e0e
fix linux build warning; remove unnecessary code
2019-07-23 12:13:49 -04:00
Shannon Romano
23c7e1c0f3
Merge pull request #15843 from SamGondelman/quit
...
Fix ScriptEngines::loadScript invoke call
2019-07-15 08:32:16 -07:00
kasenvr
e9e9607a3b
modkit core changes initial commit
...
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
2019-07-14 21:35:13 -04:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts
...
DEV-164: Add defaultScriptsOverride option
2019-07-10 10:16:55 -07:00
Ryan Huffman
d29cd796ca
Add defaultScriptsOverride option
2019-07-01 23:51:34 -07:00
Anthony Thibault
6c66f5a37b
Fix for DependencyManager crash on shutdown on Mac
...
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.
However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early. Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.
To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.
However, this is only a speculative fix, because this is so difficult to reproduce.
2019-07-01 17:37:57 -07:00
David Rowe
2d6d3eb4fe
Doc review
2019-06-28 17:05:36 +12:00
SamGondelman
fb4be671e7
fix invoke call
2019-06-26 10:54:50 -07:00
David Rowe
b2b7a6ae99
Merge branch 'master' into DOC-79
2019-06-22 12:11:22 +12:00
David Rowe
eb227c6b9a
Document Entities entity methods
2019-06-22 11:59:07 +12:00
Shannon Romano
13615eb9ff
Merge pull request #15818 from sabrina-shanman/crash_scriptengine_thread
...
(BUGZ-619) Fix potential crash when ending script on main thread
2019-06-21 15:08:42 -07:00
sabrina-shanman
4fafa2135a
Fix potential crash when ending script on main thread
2019-06-21 14:20:15 -07:00
Zach Fox
8044b33d65
This also works
2019-06-21 13:44:31 -07:00
Zach Fox
5067fd4cd2
OK this is definitely working
2019-06-21 13:41:11 -07:00
Zach Fox
d49205be74
Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers
2019-06-20 09:45:49 -07:00
