howard-stearns
f662571cab
send credentials to private data-webs as well
2017-03-15 15:46:25 -07:00
Seth Alves
dc82895feb
Merge pull request #9870 from Atlante45/fix/js-exceptions
...
Fix JS exception messages formatting
2017-03-15 09:32:04 -08:00
Atlante45
b67b17d3c0
Fix JS exception messages formatting
2017-03-13 09:11:20 -08:00
Brad Hefta-Gaub
eaea718de1
add various scriping interfaces for managing the audio scope and detecting noise gate transitions
2017-03-10 17:08:19 -08:00
Ryan Huffman
a744e0d11c
Merge pull request #9685 from humbletim/21114-part2
...
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Anthony J. Thibault
01abb4bdb6
Exposed DebugDraw interface to Java Script
2017-03-01 13:14:29 -08:00
David Kelly
c10b0389de
Add a getAvatarGain method to NodeList and UsersScriptingInterface
2017-02-28 14:45:34 -07:00
humbletim
2505a89b5e
Per CR feedback bump to strong ref
2017-02-28 00:41:35 -05:00
humbletim
654c72fb7e
Add weakRef guard to detect ScriptEngine deletion during ScriptCache::getScriptContents
2017-02-27 22:58:59 -05:00
humbletim
5b11c0e00a
remove unused consts
2017-02-24 20:45:12 -05:00
humbletim
731c01985b
switch from autos
2017-02-24 19:21:17 -05:00
humbletim
cdbb13ecff
Log cleanup
2017-02-24 17:40:06 -05:00
humbletim
3ac116545e
* Switch trigger for deferred loads from timer to using leading entity completion
...
* Bring back notion of tracking "bad scripts" to fail stampeding entities as a set
* Update stampede JS tests to highlight/troubleshoot preexisting unload issue
2017-02-24 16:05:11 -05:00
Howard Stearns
a9b8045697
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
...
Filter pal by view distance
2017-02-24 11:10:13 -08:00
humbletim
c89d203f94
Adapt from std::map locks to simple QHash for flagging busy scriptURLs
2017-02-24 12:27:33 -05:00
humbletim
3ad3fd472e
* Inline / duplicate exception checking per CR feedback
...
* Coding standards
2017-02-23 19:46:28 -05:00
humbletim
1eeb25a9eb
Increase deferred batch processing.
2017-02-23 19:09:27 -05:00
humbletim
f82a0196a8
Always consume exceptions thrown by include's
2017-02-23 18:12:12 -05:00
Brad Hefta-Gaub
1b7ec7d61e
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
libraries/avatars/src/AvatarData.cpp
2017-02-23 13:50:16 -08:00
kunalgosar
99e51e88ae
Add QMetaObject for AvatarEntityMap
2017-02-23 10:57:06 -08:00
Howard Stearns
cddba43837
Merge branch 'master' into filter-pal-by-view-distance
2017-02-23 08:25:16 -08:00
Chris Collins
b295a146e0
Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight
...
More consistent highlights/toggle for toolbar buttons
2017-02-22 18:07:38 -08:00
humbletim
132a889f74
* Add Qt::DirectConnection to signalHandlerException
...
* CR feedback / coding standards
2017-02-22 20:36:49 -05:00
humbletim
417587dcda
* Update per CR feedback / code standards
...
* Cull log spam
* Add tryLock to deferred processor to preempt unnecessary loadEntityContent round-trips
2017-02-22 15:22:56 -05:00
Brad Hefta-Gaub
618f37eb06
fix crash in recording playback when clip loader fails
2017-02-22 11:14:22 -08:00
Anthony J. Thibault
71b569a697
Bug-fix for crash on tablet when going from web -> home.
2017-02-22 10:22:12 -08:00
howard-stearns
2b9c69926b
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 15:42:00 -08:00
howard-stearns
aff44d682e
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 13:45:25 -08:00
howard-stearns
15d8041683
snapshot working, before button change
2017-02-21 13:14:45 -08:00
Seth Alves
4a650ff2bb
Overlays::getOverlayAtPoint was depending on the order in which the overlays were added
2017-02-19 18:37:35 -08:00
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
humbletim
b15956278c
separate out supporting changes into 21114-part2 branch
2017-02-16 07:40:19 -05: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
