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
