David Rowe
cf01d9f1af
Script.require() JSDoc fixes
2019-09-04 21:04:03 +12:00
David Rowe
f384b79bf5
Merge branch 'master' into DOC-59
2019-09-04 15:47:23 +12:00
David Rowe
9457aed631
Tidying and polishing Assets JSDoc
2019-09-04 15:43:18 +12:00
David Rowe
8820d1d76b
Assets API cache methods
2019-09-04 13:48:06 +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
David Rowe
2ad1d7a2a2
Fix typos
2019-08-22 10:27:17 +12:00
David Rowe
942347158a
Collapse some function signatures' JSDoc
2019-08-22 10:16:56 +12:00
David Rowe
11e72c638b
Assets API compression methods JSDoc
2019-08-22 09:47:25 +12:00
David Rowe
5f3081784c
Assets API methods that include mappings JSDoc
2019-08-21 12:36:37 +12:00
David Rowe
817bc6cd43
Assets API base functionality JSDoc
2019-08-21 09:50:23 +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
Kalila R
28b27a1e48
Merge branch 'v0.83.0-rc' into kasen/core
2019-08-03 15:27:23 -04: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
SamGondelman
60600779c9
merge with master
2019-07-12 11:01:17 -07: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
SamGondelman
9c1b139d5f
merge with master
2019-06-25 23:46:39 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh
2019-06-24 10:16:45 -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
David Rowe
0945bdaac7
Remainder of Entities methods' JSDoc
2019-06-20 15:11:01 +12:00
Simon Walton
7701710aa5
Consider a NetworkClipLoader resource with null URL to be failed
2019-06-19 15:02:16 -07:00
Zach Fox
8fdfdbaae4
Another attempt, still not working
2019-06-19 13:31:21 -07:00
SamGondelman
37feb7f027
merge with master
2019-06-10 10:29:39 -07:00
jennaingersoll
677b54e240
Merge pull request #15684 from ctrlaltdavid/DOC-78
...
DOC-78: Polish Vec3 JSDoc
2019-06-05 16:26:32 -07:00
David Rowe
42cb3d9828
Polish Vec3 API JSDoc
2019-06-06 10:26:43 +12:00
Shannon Romano
a3d3190813
Merge pull request #15678 from ctrlaltdavid/DOC-75
...
DOC-75: Polish Users JSDoc
2019-06-05 14:20:19 -07:00
David Rowe
eac7d298dc
Change "privacy bubble" to "privacy shield"
2019-06-06 08:21:22 +12:00
David Rowe
ef56cba71b
Polish Uuid API JSDoc
2019-06-05 14:39:27 +12:00
David Rowe
6299d38673
Distinguish between Uuid API and Uuid type in JSDoc
2019-06-05 14:39:05 +12:00
David Rowe
0bdca38644
Polish Users JSDoc
2019-06-05 11:46:14 +12:00
Anthony J. Thibault
e1534b34b4
Workaround crash in reportAdditionalMemoryCost other platforms
2019-06-04 08:56:07 -07:00
Sam Gondelman
3d05a954bc
Merge branch 'master' into proceduralMesh
2019-05-23 09:35:14 -07:00
David Rowe
5227b35c6b
Revise changes
2019-05-21 10:32:12 +12:00
David Rowe
ca7ddece8b
Add missing Script JSDoc
2019-05-21 10:32:12 +12:00
David Rowe
0a0a25139c
Deprecate items that shouldn't be in the Script API
2019-05-21 10:32:12 +12:00
David Rowe
d196e35701
Polish existing Script JSDoc
2019-05-21 10:32:12 +12:00
David Rowe
0e478de1a2
Stub out missing Script JSDoc
2019-05-21 10:32:12 +12:00
SamGondelman
da254c2ccc
(¬‿¬)
2019-05-15 23:48:04 -07:00
Shannon Romano
72d000a76d
Merge pull request #15521 from ctrlaltdavid/M22489
...
Case 22489: Scene JSDoc
2019-05-13 15:49:44 -07:00
David Rowe
71f7132a6b
Scene JSDoc
2019-05-08 09:17:11 +12:00
Revofire
47af406440
merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build.
...
various changes, idk, added a whitelist filter to ent script filter
2019-05-01 22:13:51 -04:00
David Rowe
638e040e17
Quat JSDoc update
2019-04-30 12:13:08 +12:00
David Rowe
fbe49bbfd4
Doc review
2019-04-27 10:20:35 +12:00
David Rowe
311826c04d
Merge branch 'master' into M22215
2019-04-27 10:03:24 +12:00
David Rowe
7dde764907
Merge branch 'master' into M21956
...
# Conflicts:
# libraries/audio/src/Sound.h
2019-04-23 14:58:23 +12:00
David Rowe
6e09c4885f
Review updates
2019-04-23 14:35:25 +12:00
David Rowe
60298245da
Menu JSDoc update
2019-04-16 11:24:24 +12:00
David Rowe
28dfac64ba
Merge branch 'master' into M21460
...
# Conflicts:
# libraries/image/src/image/Image.h
2019-04-05 17:50:46 +13:00
David Rowe
68f76851fd
Updates per doc review
2019-04-05 17:10:52 +13:00
Ryan Huffman
cf3a9b1d48
Fix ScriptEngine not being destroyed on its own thread
2019-04-04 13:28:13 -07:00
David Rowe
dff013128e
Text improvements and typos
2019-03-30 10:09:48 +13:00
David Rowe
da45b4db38
Add further Audio API examples
2019-03-30 09:51:02 +13:00
David Rowe
5c8d89fb12
Fill in and tidy Audio API JSDoc
2019-03-29 18:53:30 +13:00
David Rowe
9a1bb27034
AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc
2019-03-26 13:58:43 +13:00
David Rowe
cf4370ed3a
Merge branch 'master' into M21222
2019-03-26 09:44:48 +13:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio
...
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
2019-03-21 18:03:58 -07:00
danteruiz
2ab8eb98e8
better implementation
2019-03-17 14:00:41 -07:00
danteruiz
5f3e31b119
add ui to kick api
2019-03-15 18:15:18 -07:00
SamGondelman
300dd39abf
fix script engine shutdown
2019-03-13 12:23:31 -07:00
David Rowe
7445d73857
Merge branch 'master' into M21222
...
# Conflicts:
# libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13:00
SamGondelman
609c4ab52e
try to fix audio injector threading issues
2019-03-12 18:41:43 -07:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified
...
Case 21562: Audio settings screen
2019-03-08 16:22:52 -08:00
David Rowe
4779a6b156
Merge branch 'master' into M21222
2019-03-09 07:57:53 +13:00
David Rowe
5068075645
Fill in MyAvatar animation JSDoc
2019-03-09 07:42:55 +13:00
SamGondelman
f2c248c0a2
disable href and entity script events when in edit mode
2019-03-04 17:10:20 -08:00
Seth Alves
9614216006
don't disable server echo when audio qml page is closed
2019-03-04 13:47:55 -08:00
Seth Alves
d5e8cba1ee
make server-audio-loopback button work in HMDs
2019-03-04 13:47:55 -08:00
David Rowe
aa53ab7492
Distinguish between Mat4 type and Mat4 API in JSDoc
2019-02-27 09:54:11 +13:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
...
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
...
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
SamGondelman
13ece79476
merge with master
2019-02-13 16:30:22 -08:00
SamGondelman
77a8ddb3f0
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-11 16:35:05 -08:00
David Rowe
5428bb19dc
Add "Avatar Script" JSDoc API classification
2019-02-12 11:49:49 +13:00
SamGondelman
f7a487a020
move materialcache et al to material-networking library
2019-02-08 10:28:07 -08:00
SamGondelman
25ca52d892
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:48:13 -08:00
danteruiz
30bd9774b2
script engine to load platform specific files
2019-02-05 13:11:54 -08:00
SamGondelman
b80d2a9b06
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-01 13:33:04 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
...
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
Ken Cooke
fa08e42da6
Restore legacy attenuation behavior for system sounds and scripts that do not set position.
...
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
SamGondelman
5ce8f566cc
more overlay wip
2019-01-25 11:10:11 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities
...
case 20595: case 20563: Do not delete local entities when switching domains.
2019-01-17 11:25:58 -08:00
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge
...
log purge
2019-01-15 16:19:03 -08:00
Dante Ruiz
e7d3844620
making pre review requests
2019-01-14 11:14:57 -08:00
Seth Alves
6ca9ab6fba
avoid shutdown crash
2019-01-11 15:53:49 -08:00
Seth Alves
36040597ba
rename variable for consistency
2019-01-11 15:53:49 -08:00
Seth Alves
6589db628a
fix a couple shutdown crashes and a class of asan warning
2019-01-11 15:53:49 -08:00
Howard Stearns
62ed84aa19
more log purge
2019-01-11 12:34:44 -08:00
unknown
f8f13e974d
property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties
2019-01-02 11:12:10 -08:00
Wayne Chen
4c9c785c24
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-10 07:57:44 -08:00
Brad Hefta-Gaub
a005f9e9ab
Merge pull request #14546 from danteruiz/fix-reload-scripts
...
fix realod all scripts functionality broken by PR14478
2018-12-09 17:30:36 -08:00
Dante Ruiz
177a94b9a9
fix realod all scripts functionality
2018-12-07 11:48:03 -08:00
Clement
7723261cb9
Remove deferred script loading logic
2018-12-05 14:08:30 -08:00
Wayne Chen
a2a4d2ff89
removing trailing debug
2018-12-05 08:21:11 -08:00
Wayne Chen
07599c02c8
true reversion of scrips param
2018-12-05 08:16:54 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2
2018-11-28 19:10:20 -08:00
Dante Ruiz
c4a9ca3445
fix interface crashing when reloading scripts
2018-11-27 09:32:37 -08:00
Wayne Chen
b8d8710604
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-19 09:02:16 -08:00
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
Clement
7192aed131
Rework audio data memory ownership model
2018-11-14 14:45:18 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
sabrina-shanman
753557736e
Merge branch 'master' into hfm_library
2018-11-12 15:03:30 -08:00
Zach Fox
e0ca535853
CR round 2
2018-11-08 10:08:42 -08:00
Wayne Chen
f683a51ef5
allowing qApp to load overlay/load default scripts if runningscripts empty
2018-11-07 16:32:06 -08:00
sabrina-shanman
2c94d1f620
Fix hfm not linking in script-engine for Android build
2018-11-07 09:24:42 -08:00
Roxanne Skelly
cef7000a72
Case 19754 - Remove logging URLs and related file locations.
...
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
Wayne Chen
8797c40d94
cleanup unused functions
2018-11-06 15:04:51 -08:00
Clement
0ca0a6f3be
Fix JSDoc arrays
2018-11-06 12:57:17 -08:00
Clement
4e802b0f3f
Add JSDoc comments
2018-11-06 11:59:15 -08:00
Clement
37c69ebe62
Add audio soloing feature
2018-11-05 19:02:26 -08:00
sabrina-shanman
2801f324b7
Switch references to HFM to the HFM lib and remove HFM classes in FBX
2018-11-05 12:47:34 -08:00
Wayne Chen
ed847203ea
wip for getting hmd overlay
2018-10-29 11:33:28 -07:00
Kerry Ivan Kurian
e7d1c2873a
Merge branch 'master' into log-resource-requests-2
2018-10-23 13:46:59 -07:00
Brad Davis
c8e664a0a1
New SPIRV Shader toolchain
2018-10-23 10:40:12 -07:00
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Zach Fox
2f37a2b1a1
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-18 11:12:26 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack
...
Remove UndoStack API
2018-10-01 17:13:48 -07:00
Brad Hefta-Gaub
e5d9c0d442
Merge pull request #14083 from sethalves/fix-recording-upload-crash
...
call saveRecordingToAsset callback on correct thread
2018-10-01 16:46:36 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities
...
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
2018-10-01 16:16:48 -07:00
Ryan Huffman
09b2565e76
Remove UndoStack API
...
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
2018-09-26 14:43:11 -07:00
Seth Alves
87a67a3f0c
call saveRecordingToAsset callback on correct thread
2018-09-25 15:50:47 -07:00
Seth Alves
f6e57f54b0
don't call enterEntity until script preload has finished
2018-09-21 10:26:55 -07:00
Thijs Wenker
06491ef12f
API function for retrieving multiple entity properties with better performance
2018-09-20 19:34:00 +02:00
SamGondelman
c522d1bc93
merge with master
2018-09-14 00:57:13 -07:00
Clement
e6b4ccef16
Add lock around _entityScripts
2018-09-13 15:10:16 -07:00
John Conklin II
558f3dc7e5
Merge pull request #13964 from dback2/reloadScriptQThreadCrash
...
Destroy script thread on finish instead of on ScriptEngine destroyed
2018-09-10 14:11:37 -07:00
David Back
3601ade8ba
destroy thread from thread finished not scriptEngine destroyed
2018-09-07 18:36:36 -07:00
Ryan Huffman
22df1b3bc6
Add comment to Assets.sendFakeHandshake about excluding jsdoc
2018-09-06 17:19:41 -07:00
SamGondelman
9b75c7e07f
trying to separate colors and vectors
2018-09-04 17:20:05 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3
2018-08-27 10:43:52 -07:00
SamGondelman
283c0c0311
s i m p l i f y
2018-08-23 11:47:56 -07:00
Stephen Birarda
01e8fd66a3
fix script engine(s) cleanup from ESS
2018-08-22 13:52:37 -07:00
Sam Gondelman
f0986a7f5a
Merge branch 'master' into scriptvec3
2018-08-20 10:56:45 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool
...
Stack tester changes
2018-08-08 13:40:05 -04:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy
2018-08-06 09:51:14 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3
2018-08-03 14:57:49 -07:00
David Rowe
2270255d88
JSDoc review
2018-08-04 07:22:12 +12:00
David Rowe
32e3bb0e1d
Merge branch 'master' into M08513-a
...
# Conflicts:
# libraries/audio/src/SoundCache.h
2018-08-03 10:29:32 +12:00
SamGondelman
8a9c27ed92
Merge remote-tracking branch 'upstream/master' into destroy
2018-08-01 16:07:48 -07:00
Clement
9c89aa9f90
Make sure the stack test interface gets cleaned up
2018-08-01 13:29:07 -07:00
John Conklin II
7a635b6a57
Merge pull request #13709 from thoys/fix/require-load-queue
...
MS17041: Fix for require fail when the same script loaded simultaneously from another entity script
2018-08-01 11:15:32 -07:00
Thijs Wenker
74343c71d8
CR fixes
2018-07-31 22:29:53 +02:00
SamGondelman
2ca217eb4a
merge with master
2018-07-30 17:43:15 -07:00
Clement
949c7f8c19
Add automated test tool scripting interface
2018-07-30 17:18:32 -07:00
Thijs Wenker
ba8d445444
fix require by queueing content requests
2018-07-28 00:25:16 +02:00
Dante Ruiz
b750a005cf
fix script memory issue
2018-07-24 16:31:12 -07:00
David Rowe
396382afd7
Fill in Audio API JSDoc
2018-07-19 09:31:48 +12:00
David Rowe
806228299e
Stub out Audio JSDoc
2018-07-15 10:31:48 +12:00
SamGondelman
9929529f30
vec3 conversion
2018-07-11 14:18:22 -07:00
Clement
e5206a94a8
Revert "setStereoInput always returns true to not break old scripts"
...
This reverts commit 2bf7db6952
2018-07-11 11:51:06 -07:00
SamGondelman
5bbd5b9e52
vec2 conversion
2018-07-10 16:32:49 -07:00
SamGondelman
d2699e8e5b
some more attempted cleanup
2018-07-10 10:50:01 -07:00
SamGondelman
7954865141
trying to fix dependency shutdown
2018-07-05 14:34:37 -07:00
Anthony Thibault
a5919ee3fa
Merge pull request #13497 from hyperlogic/bug-fix/script-engine-batchloader-memory-corruption-fix
...
Fix memory corruption when running scripts using Script.require().
2018-06-28 14:18:56 -07:00
Anthony J. Thibault
ac6fcf092c
Fix memory corruption via lambdas that capture local variables by reference.
...
The lambdas in ScriptEngine::fetchModuleSource() were referencing local stack variables by reference.
This could lead to un-expected results including memory corruption.
To workaround this issue the QTimer and QEventLoop variables are allocated on the heap and held onto by a shared_ptr.
This shared_ptr is passed to the lambda.
This will not result in cycles and should result in the QTimer and QEventLoop being destroyed when the BatchLoader
object they are connected to is deleted.
2018-06-28 11:15:25 -07:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve
...
Fix audio device sometimes being on the wrong thread
2018-06-28 09:59:00 -07:00
Seth Alves
01632ddd29
Merge pull request #13345 from ctrlaltdavid/21890
...
Fix memory leak when reloading scripts
2018-06-27 09:39:53 -07:00
Clement
2bf7db6952
setStereoInput always returns true to not break old scripts
2018-06-19 16:37:11 -07:00
Atlante45
4a4c0d132e
Make stereo interface async
2018-06-18 17:26:29 -07:00
