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
Dante Ruiz
1ec4081a99
crash fix
2017-04-20 21:38:20 +01:00
David Rowe
2108300272
Merge branch 'master' into 21249
2017-04-20 08:43:00 +12:00
Dante Ruiz
b2a11aa9ab
check for null when we dont
2017-04-19 21:30:43 +01:00
Dante Ruiz
ce8dba21a0
fix tablet proxy choosing wrong root
2017-04-18 22:49:43 +01:00
Anthony J. Thibault
d3b4a2c08d
better "auto" configuration
2017-04-14 17:00:47 -07:00
David Rowe
2731c13a5c
Merge remote-tracking branch 'upstream/master' into 21249
2017-04-15 09:51:16 +12:00
Thijs Wenker
6f58e91d76
Merge pull request #10121 from birarda/bug/recording-cache
...
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66
address code review comments
2017-04-14 11:53:53 -07:00
David Rowe
0d9e0ebfec
Merge branch 'master' into 21249
2017-04-12 08:45:01 +12:00
Chris Collins
b07ed13023
Merge pull request #10184 from druiz17/snapshot-fix
...
snapshot bug fixes
2017-04-11 13:00:46 -07:00
Chris Collins
3a603e7ced
Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject
...
change handling of life-time of TabletProxy QObjects
2017-04-11 11:53:47 -07:00
Seth Alves
077a4fe4ae
change handling of life-time of TabletProxy QObjects
2017-04-11 10:56:47 -07:00
Stephen Birarda
84a5807ff1
return ScriptAvatarData raw pointer from getAvatar
2017-04-10 22:15:45 -07:00
Stephen Birarda
6c49db0f1b
add missing include for qScriptRegisterMetaType in Agent
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
0aa1e633fe
Fix overrides and warnings (finally?)
2017-04-10 22:15:45 -07:00
Zach Fox
2561d38d93
Fix GCC warning
2017-04-10 22:15:45 -07:00
Zach Fox
04792bf3bc
Typo fix.
2017-04-10 22:15:45 -07:00
Zach Fox
16be0ca70c
Birarda's CR changes
2017-04-10 22:15:44 -07:00
Zach Fox
1984d5bc0c
Cleanup
2017-04-10 22:15:44 -07:00
Zach Fox
3832abffee
Almost theregit add -A
2017-04-10 22:15:44 -07:00
Zach Fox
4489c34e84
I'm on fire
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
Dante Ruiz
e0f19944bc
Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix
2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8
finished allowing to go back to previous app
2017-04-10 20:58:10 +01:00
David Rowe
6896fe3ac6
Merge branch 'master' into 21249
2017-04-10 09:05:57 +12:00
Dante Ruiz
86c67a3017
tablet pages
2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb
Merge pull request #10153 from druiz17/goto-fix
...
Ability to toggle goto with the crt-l and enter keys
2017-04-07 16:36:41 -07:00
David Rowe
ebe3561582
Merge branch 'master' into 21249
2017-04-08 10:46:16 +12:00
Dante Ruiz
22521526ec
removed stray space
2017-04-06 23:41:30 +01:00
David Rowe
0400e5a1f2
Report error status in setMapping() callback
2017-04-07 10:31:52 +12:00
Dante Ruiz
52fd446d4d
toggle goto in tablet
2017-04-06 22:27:37 +01:00
David Rowe
5676364aec
Fix missing return value in Recording.saveRecordingToAsset()
2017-04-06 18:50:15 +12:00
Dante Ruiz
90f5d02c99
goto toggle option
2017-04-06 00:13:53 +01:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Stephen Birarda
c7a28a527a
cleanup Agent recording handling, make loadRecording async
2017-04-04 10:56:25 -07:00
Seth Alves
b0b214012c
Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
...
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -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
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
Chris Collins
6fe210da66
Merge pull request #10094 from sethalves/tablet-ui-fix-hmd-login
...
fix login-screen for hmd+tablet
2017-03-31 17:17:30 -07:00
Seth Alves
3cd134d138
fix login-screen for hmd+tablet
2017-03-31 16:41:21 -07:00
