History

Commits on 348be788f77885d157300a7a95dca0f21b19ce3f to libraries/script-engine/src/ScriptEngine.cpp35+

Merge branch 'master' into midiburtsloane committed 9 years agod4ae298
Trying to fix overlay crashes againBrad Davis committed 9 years ago7f1bc07
Switch to preprocessor macro for blocking invokes to capture function informationBrad Davis committed 9 years ago6fc82bb
Don't use blocking connections on the main threadBrad Davis committed 9 years agob52dd7b
make ResourceManager be owned by DependencyManagerSeth Alves committed 9 years ago794495c
Merge pull request #10824 from sethalves/fix-script-sleep-busyloopSeth Alves committed 9 years agoe4a9674
avoid cast that isn't always availableSeth Alves committed 9 years ago4f672f9
use QEventLoop and a timer for a less CPU using sleep + event-processingSeth Alves committed 9 years agobf7da71
clean upsamcake committed 9 years agoc0e8b6c
Merge branch 'master' of https://github.com/highfidelity/hifi into brownsamcake committed 9 years agob7b520a
Merge pull request #10792 from jherico/qml_crashesBrad Hefta-Gaub committed 9 years agodc649e8
Add support for profiling from scriptssamcake committed 9 years agoc24e254
Trying to fix QtQml/QtScript crashesBrad Davis committed 9 years ago4439de2
Adding the function source when profiling, to explore perf issuessamcake committed 9 years agobda52c3
new --scripts switch overrides default scripts locationDavid Kelly committed 9 years agoff5b37c
adding profiling on the script engine call back to timer eventSam Cake committed 9 years agoc35be44
Merge branch 'master' of https://github.com/highfidelity/hifi into brownSam Cake committed 9 years ago189ad9c
Fixing the scripts and investigating the scriptingsamcake committed 9 years agod853a76
Resolve comments of @zappoman. -- Rename "asserts" to "assert" -- Log printing methods will accept lists of objects or strings.NeetBhagat committed 9 years ago2909aa9
got rid of tabsBurt Sloane committed 9 years ago4f7a1a6
pedantic PRBurt Sloane committed 9 years agofbc28c0
midi in and outBurt Sloane committed 9 years ago7022c40
Complete console.trace and added a testcases for all 13 functions.NeetBhagat committed 9 years ago9646eba
Complete the functionality of console.trace().NeetBhagat committed 9 years ago5c32426
Complete Console Exception.NeetBhagat committed 9 years agoe8fc766
intial commit #21369 Working on clear method of consoleNeetBhagat committed 9 years ago904e25c
intial commit hifi: #21369 Implement parts of the JS "console" objectNeetBhagat committed 9 years ago0f9cd5d
Merge pull request #10536 from misslivirose/fix/check-extension-running-scriptsChris Collins committed 9 years agof8b92b6
style fixesLiv committed 9 years agob2bbf21
Fix from string equals to contains to account for working formats not correctly detected with suffixLiv committed 9 years ago09c7a61
Cleanup and better error handlingLiv committed 9 years ago3340211
Add function hasValidScriptSuffix and check if script extensions are JavaScript or JSON filesLiv committed 9 years agoe9fac38
Remove invalid comment and unnecessary check from ScriptEngineRyan Huffman committed 9 years ago3c9205d
Fix ScriptEngine thread being deleted too earlyRyan Huffman committed 9 years ago09c98b3
update script engine to not treat about:* as a local filename; resolve debugPrint FIXMEhumbletim committed 9 years agoe765d88