Elisa Lupin-Jimenez
c6d5b1a5e6
Removed extraneous print statements
2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0
Blocks drag does not work yet
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54
Can drag blocks zip folder into hifi and upload the .obj
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
310a0eeecc
Renamed isBlocks to isZip, added debug print for non-entity files
2017-08-02 12:24:14 -07:00
Elisa Lupin-Jimenez
b2161e433c
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-07-31 09:54:21 -07:00
Elisa Lupin-Jimenez
d4a7e9188a
Removed extraneous print statements
2017-07-27 13:33:53 -07:00
Elisa Lupin-Jimenez
acb088b263
Blocks drag does not work yet
2017-07-26 16:58:23 -07:00
Elisa Lupin-Jimenez
9cfc4dc91b
Can drag blocks zip folder into hifi and upload the .obj
2017-07-26 15:21:39 -07:00
burtsloane
d4ae298a8d
Merge branch 'master' into midi
2017-07-26 13:59:07 -07:00
Burt Sloane
a960ea5ccb
Linux build
2017-07-26 13:32:23 -07:00
Burt Sloane
4f7243e444
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
2017-07-26 13:30:57 -07:00
Seth Alves
47ea32f4d3
vertex color support in ModelScriptingInterface
2017-07-23 08:06:26 -07:00
Seth Alves
72e5fecb4e
do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex
2017-07-20 16:34:34 -07:00
Seth Alves
084a989a7a
stopAndDeleteLater is now just stop
2017-07-11 21:21:42 -07:00
Seth Alves
972dc4d1b2
more const ref
2017-07-11 19:56:34 -07:00
Seth Alves
3670a04d8e
switch bare pointers to AudioInjector objects to be QSharedPointers
2017-07-11 14:24:58 -07:00
Brad Davis
7f1bc07d04
Trying to fix overlay crashes again
2017-07-05 14:30:01 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Clément Brisset
a2c15c9794
Merge pull request #10770 from jherico/fix_deps_1
...
Cleanup entity dependencies
2017-06-28 10:48:58 -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
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -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
Sam Gateau
619b357ad0
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-26 10:03:53 +02:00
David Rowe
3de1c0a312
Make and save recording
2017-06-24 15:57:57 +12: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
06d1ac8bf7
Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch
2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
Brad Hefta-Gaub
7668fbb7a0
Merge pull request #10755 from seefo/fb5278
...
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
2017-06-22 13:35: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
Zach Pomerantz
8e1cf763e3
Merge pull request #10756 from zzmp/audio/input-level
...
Update chrome for the audio input level meter
2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391
Merge pull request #10744 from zzmp/audio/output-sample
...
Add "Play sample sound" to audio setting
2017-06-20 15:32:57 -07:00
Zach Pomerantz
c826858458
revamp tablet MicBar
2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub
cbded766b1
Merge pull request #10676 from NeetBhagat/21369
...
WL 21369 - Implement parts of the JS "console" object
2017-06-20 11:06:34 -07:00
Zach Pomerantz
a7e1b75909
stopgap with MyAvatar.qmlPosition
2017-06-19 14:41:01 -07:00
Brad Davis
ed6620fc51
Merge pull request #10718 from jherico/frame_thread
...
Cleanup and refactoring
2017-06-19 13:31: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
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Burt Sloane
4f7a1a6e2e
got rid of tabs
2017-06-15 16:35:53 -07:00
Burt Sloane
fbc28c0e2f
pedantic PR
2017-06-15 16:16:29 -07:00
Burt Sloane
7022c4009f
midi in and out
2017-06-15 15:18:06 -07:00
Zach Pomerantz
a8f69bb2e0
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-13 17:41:52 -04:00
Zach Pomerantz
20c0dac8e8
update QML with Audio.muted
2017-06-13 16:10:16 -04:00
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
b0e9c62c12
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-13 10:10:44 +05:30
NeetBhagat
e8fc766c2b
Complete Console Exception.
2017-06-12 20:24:59 +05:30
NeetBhagat
71bff04ce0
Update group functionality by removing consoleLog method from consoleScriptingInterfaceClass.
2017-06-12 12:38:56 +05:30
NeetBhagat
2bd2804d0b
complete Group Functionality i.e Group,GroupCollapsed,GroupEnd
2017-06-09 20:31:58 +05:30
NeetBhagat
dd91346c18
Started group functions.
2017-06-09 11:43:16 +05:30
NeetBhagat
ead0d42cf3
Merge branch 'master' into 21369
...
# Conflicts:
# libraries/gl/src/gl/OffscreenQmlSurface.cpp
# libraries/gl/src/gl/OffscreenQmlSurface.h
2017-06-07 15:47:19 +05:30
NeetBhagat
904e25c9e3
intial commit #21369 Working on clear method of console
2017-06-07 14:37:18 +05:30
Bradley Austin Davis
30c86ff321
Attempt to resolve Tablet scripting interface deadlocks
2017-06-06 14:58:56 -07:00
NeetBhagat
0f9cd5d0c7
intial commit hifi: #21369 Implement parts of the JS "console" object
2017-06-06 15:20:08 +05:30
Zach Pomerantz
4a3f2e1d09
use subclass for interface's Audio interface
2017-05-28 19:25:37 -04:00
Zach Pomerantz
297993b358
report success on tablet->pushOntoStack
2017-05-26 17:09:39 -04:00
Clément Brisset
efe72e1b85
Merge pull request #10530 from Atlante45/fix/default-scripts
...
Ensure user never loses its running scripts
2017-05-25 18:33:11 -07:00
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
Atlante45
10eb353126
Ensure user never loses its running scripts
2017-05-22 18:55:58 -07:00
Liv
1fa3e6bda2
Revert "Initial check that the script url has a supported extension, currently JS only"
...
This reverts commit d50bdd6aa9
2017-05-22 17:47:16 -07:00
Liv
d50bdd6aa9
Initial check that the script url has a supported extension, currently JS only
2017-05-22 16:53:41 -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
Brad Hefta-Gaub
ee6bed5c1c
Merge pull request #10189 from Atlante45/fix/memory-leak
...
Set max packet per second on the agent
2017-05-16 21:03:05 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e
Code style fixes
2017-05-11 20:38:09 +02:00
Vladyslav Stelmakhovskyi
2328da3c48
Merge branch 'master' into audio-source-sync
2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi
2d46f9d30e
Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum
2017-05-10 21:21:39 +02:00
volansystech
34edc2345c
Bug 4255: When you are in HMD and you go to file menu quit, it crashes and you have no menus when you come back.
...
Fixed NPE of buttonProxy while doing addButtonProxyToQmlTablet on quitting the application.
2017-05-09 22:07:32 +05:30
Chris Collins
4bfb23b5d2
Merge pull request #10388 from humbletim/21308
...
CR #21308 Fix Script.print
2017-05-08 10:46:49 -07:00
humbletim
c17d1a6d88
manually promote glm values to double when stringifying (to prevent -Wdouble-promotion "error")
2017-05-04 19:21:32 -04:00
humbletim
f71552c648
* update Vec3.print, Quat.print, Mat4.print, ScriptUUID.print to work with JSConsole and HMD-friendly script log
...
* add test output for Quat-euler and Mat4-row/col prints
2017-05-04 18:33:49 -04: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
Andrew Meadows
7cb2bff4c5
Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash
...
Fix vr 2d vr tablet crash
2017-05-04 10:08:55 -07:00
Zach Pomerantz
0353940d9e
decouple initialization from storage in Table.getTablet()
2017-05-02 17:49:40 -04:00
Seth Alves
6b2caf8081
Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash
2017-05-02 09:41:47 -07:00
Seth Alves
71deac49c6
reset tablet to homescreen when going from 2d to vr
2017-05-01 17:06:15 -07:00
druiz17
2bf7b12c7d
open webview from tabletwebscreen
2017-04-30 15:27:34 -07:00
Anthony J. Thibault
b80270400f
Merge branch 'master' into feature/hips-ik-target
2017-04-27 18:15:12 -07: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
aca7ad27c6
Fix ktx dependencies
2017-04-26 10:47:32 -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
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
David Rowe
4c30c0d722
Make UserActivityLogger available to AC scripts
2017-04-25 13:42:12 +12:00
Atlante45
41cd0d79b2
Set max packet per second on the agent
2017-04-24 10:56:57 -07:00
Dante Ruiz
cbd2a532a8
remove debug statments
2017-04-20 23:28:41 +01:00
