Ryan Huffman
cbb55a06a0
Update ScriptEngine to store full running status off entity scripts
2017-01-19 13:27:44 -08:00
Zach Fox
534fcd9399
Potential fix
2017-01-19 10:20:36 -08:00
Zach Fox
346cfbfe02
First checkpoint
2017-01-18 12:55:24 -08:00
Seth Alves
b6188bb73a
fix warnings
2017-01-18 12:49:25 -08:00
Dante Ruiz
1c13f538f7
removed debug output
2017-01-18 17:08:13 +00:00
Dante Ruiz
fa3bea52cd
fixed bug with menu
2017-01-18 16:45:27 +00:00
Dante Ruiz
baff07b0f9
controller with menus finally work
2017-01-18 07:41:25 -08:00
Dante Ruiz
9a61b6030b
tabletFocus update
2017-01-18 07:40:15 -08:00
Dante Ruiz
d3fa7651c9
some what working d-pad
2017-01-18 07:40:15 -08:00
dante ruiz
865a78a8c8
saving work
2017-01-18 07:40:14 -08:00
Seth Alves
b57803057d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 06:38:44 -08:00
Seth Alves
0abb41ca2d
Merge pull request #9413 from hyperlogic/tablet-ui
...
clara.io marketplace works on tablet
2017-01-18 06:37:55 -08:00
Anthony J. Thibault
56fc42a2bd
clara.io marketplace works on tablet
2017-01-17 15:38:44 -08:00
Atlante45
5db37fff95
More entity script server work
2017-01-17 13:47:45 -08:00
David Kelly
9b1aaf3bfe
CR feedback
2017-01-17 12:09:47 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
David Kelly
6c701bb0f0
remove ignored avatars from PAL when they disconnect
2017-01-16 18:22:53 -08:00
Zach Fox
b0b6aeac6c
Ken's feedback
2017-01-13 13:00:03 -08:00
Zach Fox
8bb200902f
First pass
2017-01-13 12:57:35 -08:00
Seth Alves
88f3ff7977
Merge pull request #9376 from hyperlogic/tablet-ui3
...
Prevent crash when closing the tablet while a sound is playing.
2017-01-12 18:17:53 -08:00
Anthony J. Thibault
1b4146af6d
Prevent crash when closing the tablet while a sound is playing.
2017-01-12 17:23:06 -08:00
Anthony J. Thibault
37804d1875
Fix for linux warning
2017-01-12 13:32:01 -08:00
Anthony J. Thibault
cf138eb1fd
Fixes for qt asserts in debug
...
* The TabletScriptingInterface destructor is invoked on app shutdown after the logging system has been destroyed.
To avoid this I removed the destructor. The log was only for debug purposes anyway.
* Removed calls to setProperty() these calls are not thread safe and were causing asserts during debug.
Instead of getting and setting the property we maintain the TabletProxy state using an enum.
2017-01-12 10:49:41 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
Dante Ruiz
6c51edec77
added context menu to tablet
2017-01-10 09:13:45 -08:00
Dante Ruiz
3fab901b49
commit chabges
2017-01-10 09:13:45 -08:00
Dante Ruiz
c99f897db1
first commit
2017-01-10 09:13:45 -08:00
Ryan Huffman
39070fe0d1
Merge pull request #9065 from huffman/fix/script-engine-abuse
...
Fix deleteLater() vulnerability in scripts
2017-01-09 11:02:28 -08:00
Anthony J. Thibault
0860c50a49
Allow Hifi.SoundEffect to be used in all qml
...
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Seth Alves
d072b1524a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-05 15:27:11 -08:00
Anthony J. Thibault
70078b0e78
Fix for linux build
2017-01-05 15:04:16 -08:00
Anthony J. Thibault
85de0d3bbf
Added local only spatialized button click sounds to tablet
2017-01-05 13:54:06 -08:00
Zach Fox
2f503d0bcc
Allow for compatibility with old mod.js script
2017-01-05 13:25:27 -08:00
Howard Stearns
3d8da683db
Merge pull request #9290 from zfox23/PersonalMute
...
Personal mute; Quasi-ignore; Reversible PAL actions
2017-01-04 14:37:09 -08:00
Zach Fox
dde5f69ac9
More CR & simplifications
2017-01-04 12:41:30 -08:00
Dante Ruiz
8327df55e4
removed commented out code
2017-01-04 19:21:03 +00:00
Dante Ruiz
3f34cb863e
removed whitespace
2017-01-04 11:09:26 -08:00
Dante Ruiz
a30ad2709b
Home button fix
2017-01-04 11:09:26 -08:00
Ryan Huffman
601aa51392
Merge branch 'master' into fix/script-engine-abuse
2017-01-04 08:09:06 -08:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Anthony J. Thibault
e4a08709c6
Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui
2017-01-03 16:23:57 -08:00
Anthony Thibault
9502a8b0c4
Merge pull request #9294 from fayeli/tablet-mic-level
...
Audio level calculation in tabletUI.js
2017-01-03 16:12:04 -08:00
Anthony J. Thibault
3c2f9acd39
Hooked up EventBridge to TabletScriptingInterface.
2017-01-03 15:43:21 -08:00
Faye Li
752051834d
function style casting
2017-01-03 13:30:19 -08:00
Faye Li
d8227a686c
fill in updateAudioBar function, invokes qml function
2017-01-03 12:51:26 -08:00
Faye Li
68aacfe544
added "updateAudioBar" function signature in header file
2017-01-03 12:38:23 -08:00
Anthony J. Thibault
850db0b6b3
jsdoc fix for TabletProxy
2017-01-03 11:20:42 -08:00
Brad Hefta-Gaub
4c1aaa376d
remove cruft
2017-01-03 11:13:03 -08:00
Brad Hefta-Gaub
d440532cff
make sure RPC is timely
2017-01-03 11:10:07 -08:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub
82ab8635d7
debugging
2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub
7c7d239e00
first cut at using wait signals to improve RPC timing
2016-12-30 09:13:21 -08:00
Brad Hefta-Gaub
4b9345d7c6
cleanup accidental change
2016-12-29 16:45:16 -08:00
Brad Hefta-Gaub
0c22fcb5c4
better handling of timers
2016-12-29 16:41:14 -08:00
Zach Fox
10b5b957f2
Ahh...It's beautiful and simple now.
2016-12-29 13:09:40 -08:00
Zach Fox
bb2b48d424
Getting very close.
2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b
audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate
2016-12-29 08:53:37 -08:00
Zach Fox
af1c67a252
Progress!
2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682
It seems to be working, minus removing from list
2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283
First steps, holding off til Howard finishes
2016-12-28 15:12:21 -08:00
howard-stearns
768b747b3a
Make avatar go away when ignored, even when pal is up. (But currently, it
...
comes back!)
2016-12-27 10:17:39 -08:00
howard-stearns
2f2940b7cc
fixes
2016-12-27 10:14:28 -08:00
howard-stearns
0ad9786f6b
requestsDomainsListData
2016-12-27 10:14:20 -08:00
Anthony J. Thibault
01a96347a5
Updated Web3dOverlay.cpp to work with TabletRoot.qml
2016-12-20 14:40:29 -08:00
Brad Hefta-Gaub
0448023a0f
better handle null senders, trim lines after 2000
2016-12-20 14:14:28 -08:00
Anthony J. Thibault
ec38c4e319
Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui
2016-12-20 13:43:06 -08:00
Brad Hefta-Gaub
9b11c7cc9c
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/networking/src/NodeList.cpp
2016-12-20 10:46:57 -08:00
Howard Stearns
9ff06e53d4
Merge pull request #9235 from davidkelly/dk/fingerprintInPAL
...
Expose Machine Fingerprint in PAL
2016-12-20 10:06:36 -08:00
Brad Hefta-Gaub
6a7fa63327
classify ScriptEngine errors better, and send them as signal to JS
2016-12-20 09:00:01 -08:00
Seth Alves
dc996bee95
merge from upstream
2016-12-20 08:06:01 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Brad Hefta-Gaub
0c9ff87feb
add support for an HMD script debug log window
2016-12-19 19:34:14 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
Anthony J. Thibault
a791ddcc22
Tablet can switch to a web url.
...
Help button has been updated to switch to the help.html. It doesn't look good because
the content was authored expecting landscape window, not portrait.
The API is by no means final. But it exposes two methods to JS.
* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.
tabletTest.js and help.js have been updated to use this functionality.
2016-12-19 17:52:19 -08:00
Brad Hefta-Gaub
df954cab10
remove some log spam, recatargorize script logs to allow fine grain filtering
2016-12-19 16:15:10 -08:00
David Kelly
36792e005a
initial commit
2016-12-19 14:19:39 -08:00
Zach Fox
e940daf5b4
Comments and clarity
2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08
Super close
2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
Anthony J. Thibault
5441d33a25
Support for the ablity to change button properties from js.
2016-12-15 18:17:14 -08:00
Anthony J. Thibault
5d1ccfbccc
Tablet#removeButton now works properly
2016-12-15 15:49:37 -08:00
Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
Anthony J. Thibault
d2c4417b24
Hook up Help button to the new Tablet interface
2016-12-14 17:05:47 -08:00
David Rowe
dbd00e39a8
Handle unzip failure
2016-12-15 11:52:34 +13:00
Anthony J. Thibault
d4f9d21ce8
Pass tablet QQuickItem to TabletScriptingInterface
...
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
2016-12-14 14:04:48 -08:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
David Kelly
8719d36cd9
Merge pull request #9125 from kencooke/audio-ambisonics
...
First-order Ambisonic renderer
2016-12-12 11:36:12 -08:00
Ken Cooke
a4cbf6be8a
Fix to preserve localOnly from script when not ambisonic
2016-12-09 16:55:53 -08:00
David Rowe
460d332c6f
Delete redundant code
2016-12-07 10:06:32 +13:00
David Rowe
8e30674069
Tidying
2016-12-07 09:28:35 +13:00
David Rowe
2f42f4cfa5
Merge branch 'master' into 21089
2016-12-05 18:33:38 +13:00
Ken Cooke
e93e1a7c4f
Preliminary support for Ambisonic audio injectors.
...
Supports 4-channel WAV files, presumed to be B-format (FuMa) first-order Ambisonic.
Supports WAV with arbitrary sample rate (needs optimization).
Supports soundfield volume and orientation set via script.
Supports localOnly client-side injection using simple (non-spatialized) test renderer.
2016-12-02 18:20:57 -08:00
Ryan Jones
7b0756c745
remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions
2016-11-30 16:37:04 -08:00
Atlante45
1d8c97b337
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
2016-11-30 10:22:16 -08:00
David Rowe
a75d0b3fe8
Merge branch 'master' into 21089
2016-11-30 14:50:51 +13:00
Ryan Jones
fe774a8530
adjust whitespace
2016-11-29 15:41:50 -08:00
