Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Seth Alves
e4a9674614
Merge pull request #10824 from sethalves/fix-script-sleep-busyloop
...
use QEventLoop and a timer for a less CPU using sleep + event-processing
2017-06-27 21:00:40 -07:00
Seth Alves
4f672f93d2
avoid cast that isn't always available
2017-06-26 16:03:39 -07:00
Seth Alves
bf7da71eaf
use QEventLoop and a timer for a less CPU using sleep + event-processing
2017-06-26 15:07:22 -07:00
samcake
c0e8b6c8bc
clean up
2017-06-23 14:18:56 -07:00
samcake
b7b520a6e8
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-23 13:50:31 -07:00
Brad Hefta-Gaub
dc649e84df
Merge pull request #10792 from jherico/qml_crashes
...
Trying to fix QtQml/QtScript crashes
2017-06-23 12:41:43 -07:00
samcake
c24e254257
Add support for profiling from scripts
2017-06-22 18:10:20 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
samcake
bda52c33e6
Adding the function source when profiling, to explore perf issues
2017-06-22 15:35:00 -07:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
Sam Cake
c35be446e6
adding profiling on the script engine call back to timer event
2017-06-21 00:06:45 -07:00
Sam Cake
189ad9c706
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-20 22:42:40 -07:00
samcake
d853a76376
Fixing the scripts and investigating the scripting
2017-06-20 17:23:44 -07:00
NeetBhagat
2909aa9ac8
Resolve comments of @zappoman.
...
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
2017-06-17 01:00:32 +05:30
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
NeetBhagat
5c324264a2
Complete the functionality of console.trace().
2017-06-13 14:12:29 +05:30
NeetBhagat
e8fc766c2b
Complete Console Exception.
2017-06-12 20:24:59 +05:30
NeetBhagat
904e25c9e3
intial commit #21369 Working on clear method of console
2017-06-07 14:37:18 +05:30
NeetBhagat
0f9cd5d0c7
intial commit hifi: #21369 Implement parts of the JS "console" object
2017-06-06 15:20:08 +05:30
Chris Collins
f8b92b6666
Merge pull request #10536 from misslivirose/fix/check-extension-running-scripts
...
Fix/check extension running scripts
2017-05-23 22:15:50 -07:00
Liv
b2bbf21fb0
style fixes
2017-05-23 15:21:21 -07:00
Liv
09c7a61599
Fix from string equals to contains to account for working formats not correctly detected with suffix
2017-05-23 14:42:07 -07:00
Liv
3340211455
Cleanup and better error handling
2017-05-23 13:54:38 -07:00
Liv
e9fac38bbb
Add function hasValidScriptSuffix and check if script extensions are JavaScript or JSON files
2017-05-23 13:08:50 -07:00
Ryan Huffman
3c9205d0b2
Remove invalid comment and unnecessary check from ScriptEngine
...
This removes an invalid comment - waitTillDoneRunning is not only called
from the main thread - and remove a check to make sure thread() is not
null because it should no longer be deleted before ScriptEngine.
2017-05-22 15:46:43 -07:00
Ryan Huffman
09c98b3ac3
Fix ScriptEngine thread being deleted too early
...
The thread appeared to be deleted before waitTillDoneRunning was
finished. This is a speculative fix. This ensures that the QThread isn't
deleted until after the ScriptEngine is deleted.
2017-05-22 15:31:11 -07:00
humbletim
e765d8858c
update script engine to not treat about:* as a local filename; resolve debugPrint FIXME
2017-05-04 16:57:41 -04:00
Ryan Huffman
ac0a738945
Merge pull request #10261 from Atlante45/feat/progressive-load-ktx
...
Add progressive load for KTX textures
2017-04-26 18:36:01 -07:00
Ryan Huffman
105d17e85e
Add byte range support to HTTPResourceRequest
2017-04-26 10:45:14 -07:00
David Rowe
4a5f84f4b9
Merge branch 'master' into 21249
...
# Conflicts:
# libraries/audio-client/src/AudioClient.cpp
2017-04-26 13:24:18 +12:00
David Rowe
4c30c0d722
Make UserActivityLogger available to AC scripts
2017-04-25 13:42:12 +12:00
Dante Ruiz
1ec4081a99
crash fix
2017-04-20 21:38:20 +01:00
Stephen Birarda
84a5807ff1
return ScriptAvatarData raw pointer from getAvatar
2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a
add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts
2017-04-10 22:15:45 -07:00
Zach Fox
1984d5bc0c
Cleanup
2017-04-10 22:15:44 -07:00
Zach Fox
5edd5d2b30
It's working...it's workinggit add -A!
2017-04-10 22:15:44 -07:00
Zach Fox
a16e261735
Checkpoint before a number of confusing changes
2017-04-10 22:15:44 -07:00
Stephen Birarda
4ed22ad7ac
move audio loudness to AvatarData, change AvatarData to ScriptOwnership
2017-04-10 22:15:44 -07:00
Anthony J. Thibault
8ff457a1b6
Fix broken eventBridge on tablet after Reload All Scripts.
...
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
Stephen Birarda
c63a2c9cda
remove requirement of ScriptEngine in ScriptEngines slots
2017-03-20 13:40:15 -07:00
Stephen Birarda
a4d72c4e67
make AudioScriptingInterface a Dependency
2017-03-20 13:40:15 -07:00
Chris Collins
308c134119
Merge pull request #9686 from humbletim/21114-part3
...
CR 21114 -- Implement modules/require support into hifi
2017-03-20 06:22:35 -07:00
Brad Hefta-Gaub
a75acd139b
Merge pull request #9885 from sethalves/model-scripting
...
Model scripting
2017-03-17 13:13:17 -07:00
humbletim
87d62ad1eb
Merge branch 'master' into 21114-part3
2017-03-16 16:39:37 -04:00
Stephen Birarda
a69cf76d06
Merge pull request #9879 from birarda/bug/no-unload
...
make sure deleted entities are unloaded first
2017-03-16 13:29:36 -07:00
humbletim
758c07c7d4
Merge branch 'master' into 21114-part3
2017-03-16 14:29:17 -04:00
humbletim
52a571558c
* changes per CR feedback
...
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
2017-03-16 01:23:23 -04:00
Seth Alves
693aee0628
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-03-15 16:54:40 -07:00
Stephen Birarda
0c657a1d55
add parameter to unload to remove entityID from map
2017-03-15 10:57:12 -07:00
