Anthony J. Thibault
e4076e6244
warning fixes
2017-02-17 09:45:13 -08:00
Anthony J. Thibault
8ccca86dee
Settings for Tablet Becomes Toolbar
2017-02-16 15:57:36 -08:00
Anthony J. Thibault
5b1f150171
Fix for race condition when switching between Main Menu and Audio Menu
2017-02-16 12:52:46 -08:00
Anthony J. Thibault
03b6280ed0
Fix for empty toolbar issue
2017-02-15 16:50:08 -08:00
Anthony J. Thibault
67302cbd2b
toolbar work to better support tablet buttons
2017-02-15 15:53:08 -08:00
Anthony J. Thibault
ed11edad56
EventBridge support
2017-02-15 13:59:04 -08:00
Anthony J. Thibault
912e8aa04a
Tablet buttons now work in toolbar.
...
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
2017-02-14 15:37:24 -08:00
Anthony J. Thibault
4503923665
Initial version of TabletProxy.toolbarMode boolean
...
Copies all tablet buttons between the tablet and the system toolbar.
To test type this in the console:
Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;
2017-02-14 15:36:03 -08:00
Anthony J. Thibault
5e25d073f3
WIP commit
2017-02-14 15:36:01 -08:00
David Rowe
625f5efdf8
Merge branch 'master' into 21164
...
# Conflicts:
# scripts/system/audio.js
2017-02-15 10:00:52 +13:00
Seth Alves
4393bc3c2e
Merge pull request #9656 from humbletim/21114-part1
...
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
2017-02-14 06:49:05 -08:00
Anthony J. Thibault
1c783031b1
Removed ColorOverlay from TabletButton, added more icon & text states
...
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.
* icon
* hoverIcon
* activeIcon
* activeHoverIcon
* text
* hoverText
* activeText
* activeHoverText
Updated scripts to set new button states, if necessary.
2017-02-13 15:09:46 -08:00
humbletim
9b0bee92d1
add executeOnScriptThread
2017-02-11 06:21:11 -05:00
humbletim
0f7652e173
* integrate with latest master
...
* consolidate emit entityScriptDetailsUpdated calls
* limit maxRetries to 1 when isEntityServerScript()
2017-02-11 06:00:31 -05:00
humbletim
831bf93500
* refactor ScriptCache per FIXMEs
...
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
2017-02-11 04:47:31 -05:00
David Rowe
77f0fb1491
Change the "Mute" tablet button to "Audio"
2017-02-11 22:40:19 +13:00
David Rowe
98c1a18326
Fix accumulating signal connections
2017-02-11 21:02:23 +13:00
David Rowe
b5b92c1508
Make the tablet's mic icon reflect the current mute state
2017-02-11 09:53:02 +13:00
Brad Hefta-Gaub
74f10a1e7f
Merge pull request #9603 from huffman/feat/trace-thread-script
...
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -08:00
Ryan Huffman
026c68c7de
Merge pull request #9625 from huffman/fix/server-script-entity-updates
...
Fix Server Entity Script w/ high update rate causing issues
2017-02-09 10:07:32 -08:00
Anthony J. Thibault
b3a46c3518
Bug fix for TabletProxy::loadQMLSource()
2017-02-08 18:56:16 -08:00
Anthony J. Thibault
a209d0372a
First cut of pal on tablet.
2017-02-08 17:34:03 -08:00
Ryan Huffman
f75eceda65
Add entity PPS per script configuration
2017-02-08 13:11:18 -08:00
Dante Ruiz
7db86204d1
general function to load QML for javascript for tablet
...
(cherry picked from commit b50e20c545
2017-02-08 10:25:11 -08:00
Anthony J. Thibault
7d630f6c9a
Added Mat4.createFromColumns
2017-02-07 12:03:28 -08:00
Ryan Huffman
55df6f8f76
Add tracing to ScriptEngine and EntitiesScriptingInterface
2017-02-03 09:45:33 -08:00
Ryan Huffman
f2638637f7
Add thread names to traces
2017-02-03 09:18:58 -08:00
Anthony J. Thibault
85e01e3922
tablet-ui: Added sortOrder property to buttons
...
By default user created buttons will appear after system buttons.
2017-02-02 17:18:22 -08:00
Anthony J. Thibault
de55a5dfe6
tablet-ui: reduced volume of button click
2017-02-01 18:47:50 -08:00
Anthony J. Thibault
cf855391af
Added jsdocs for all button properties
2017-01-31 16:54:15 -08:00
Anthony J. Thibault
0542945110
Moved SoundEffect into a separate compilation unit.
...
Also, fixed license header in TabletScriptingInterface, to include proper author and date.
2017-01-30 12:46:22 -08:00
Dante Ruiz
006c3a99dc
fix tablet menu crashing
2017-01-27 19:04:53 +00:00
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
Dante Ruiz
a147ce3f5f
fixed load script issue
2017-01-25 08:00:41 -08:00
Anthony J. Thibault
bff0eeef75
Added username to tablet header
2017-01-24 14:31:57 -08:00
Seth Alves
3496e4cc7a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 16:50:41 -08:00
Zach Pomerantz
cba0b295e8
connect audio injector signal to scripting
2017-01-23 15:09:08 -05:00
Ryan Huffman
9b1cd52fb4
Add the ability to get the context that a script is running in
2017-01-23 08:58:01 -08:00
Clément Brisset
6da188b6ae
Merge pull request #33 from huffman/feat/entity-server-script-property
...
Fix compilation error and move MessageID to CilentServerUtils
2017-01-20 17:37:01 -08:00
Ryan Huffman
be9b19e534
Fix default param ref failing on non-MSVC builds
2017-01-20 16:43:35 -08:00
Dante Ruiz
41bf65ed5e
home button improvments
2017-01-20 16:35:41 -08:00
Clément Brisset
95f07f3917
Merge pull request #32 from huffman/feat/entity-server-script-property
...
PR FIxes
2017-01-20 15:39:22 -08:00
Ryan Huffman
888d7ab03d
Add exception information to script status
2017-01-20 15:33:48 -08:00
Stephen Birarda
eb033c797a
fallback if local URL empty when loading default scripts
2017-01-20 10:36:57 -08:00
Seth Alves
6641f9bafd
Merge pull request #9444 from druiz17/homeButtonFix
...
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Stephen Birarda
25bd6fa2c1
move recording interface to Agent/Application only
2017-01-20 10:27:08 -08:00
Seth Alves
c492319be2
merge from upstream
2017-01-20 10:14:11 -08:00
Dante Ruiz
1e7e4576cc
comparing with ID instead of strings
2017-01-19 16:38:55 -08:00
Ryan Huffman
c252d80782
Fix EntityScriptDetails having incorrect scriptText
2017-01-19 14:41:56 -08:00
