Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 04:05:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
59280 commits 71 branches 56 tags 1.2 GiB
Commit graph

1567 commits

Author SHA1 Message Date
Stephen Birarda
a69cf76d06 Merge pull request #9879 from birarda/bug/no-unload 
make sure deleted entities are unloaded first
 2017-03-16 13:29:36 -07:00
humbletim
758c07c7d4 Merge branch 'master' into 21114-part3 2017-03-16 14:29:17 -04:00
humbletim
52a571558c * changes per CR feedback 
* revert JSON content-type workaround
* add specific error check / advice for unanchored module ids
* update unit tests
 2017-03-16 01:23:23 -04:00
Seth Alves
693aee0628 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-03-15 16:54:40 -07:00
howard-stearns
f662571cab send credentials to private data-webs as well 2017-03-15 15:46:25 -07:00
Dante Ruiz
dac16af1df Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation 2017-03-15 19:27:11 +01:00
Dante Ruiz
4bc050e583 added tablet notification 2017-03-15 19:26:50 +01:00
Stephen Birarda
0c657a1d55 add parameter to unload to remove entityID from map 2017-03-15 10:57:12 -07:00
Seth Alves
ec5acf6035 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 09:36:39 -08: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
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
Seth Alves
08ad56d254 quiet warnings 2017-03-14 18:05:53 -07:00
Seth Alves
40b87171a9 quiet warnings 2017-03-14 17:49:39 -07:00
Seth Alves
4a1be69be4 writeOBJToString 2017-03-14 07:11:38 -07:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
humbletim
075574b428 log cleanup per CR; add more specific hints (instead of relying on __FUNCTION__) 2017-03-13 16:33:42 -04: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
Dante Ruiz
2cd194104f force on to home screen 2017-03-10 20:46:01 +00:00
Seth Alves
2068b93ccc Merge pull request #9817 from druiz17/goto-home-bug 
cant call gotohomescreen when tablet is closed
 2017-03-10 10:17:23 -08:00
Dante Ruiz
e9086460e3 changed function names 2017-03-08 18:14:32 +00:00
Dante Ruiz
6acf2340a2 better way to determine if we can go to the homescreen 2017-03-08 17:42:24 +00:00
Seth Alves
509ce3f2d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 18:41:36 -08:00
Dante Ruiz
656720ae36 Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug 2017-03-07 22:22:46 +00:00
humbletim
8582c7af7b Use specific debug name literal instead of __FUNCTION__ from within lambda 2017-03-07 16:41:20 -05:00
humbletim
d93047f9e2 Switch to READONLY_PROP_FLAGS for require.cache/require.resolve properties 2017-03-07 16:41:19 -05:00
humbletim
40ba8185a0 * Update per 21114-part2 changes. 
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
 2017-03-07 16:36:07 -05:00
humbletim
9b09651337 Move BaseScriptEngine from script-engine to shared. 2017-03-07 16:34:24 -05:00
humbletim
e91de1775e use a fully-qualified initializer when constructing BatchLoader 2017-03-07 16:34:24 -05:00
humbletim
32e450e6c2 * rework _requireResolve error throws (to avoid using lambda w/default args -- which vc++ didn't care for) 
* add ExceptionEmitters to require/resolve so errors get logged even if invoked indpendently from a script
 2017-03-07 16:34:24 -05:00
humbletim
efc61c25ad * use explicit int's for moduleId constants 
* maxTestConstructorValueSize was already limiting debug output size -- adopt its strategy, use shared MAX_DEBUG_VALUE_LENGTH const
 2017-03-07 16:34:24 -05:00
humbletim
9d860a8e81 merge require/module changes into clean branch 2017-03-07 16:34:24 -05: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
Dante Ruiz
5156564f04 cant call gotohomescreen when tablet is closed 2017-03-07 00:53:36 +00:00
Seth Alves
08e2e421e4 Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js 2017-03-06 11:08:27 -08:00
Seth Alves
93246b24b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:54:49 -08:00
Anthony J. Thibault
45febe8565 Merge branch 'master' into feature/fingers-on-tablet 2017-03-03 09:04:43 -08:00
Seth Alves
cf37845f9e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-02 10:06:38 -08:00
Dante Ruiz
58c1a2fb99 Merge branch 'master' into menuFix 2017-03-02 00:55:18 +00:00
Anthony J. Thibault
01abb4bdb6 Exposed DebugDraw interface to Java Script 2017-03-01 13:14:29 -08:00
Dante Ruiz
e2479a78bd Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-01 16:04:12 +00:00
David Kelly
c10b0389de Add a getAvatarGain method to NodeList and UsersScriptingInterface 2017-02-28 14:45:34 -07:00
Dante Ruiz
f0f2b8c4da fix comboBox and PushOntoStack 2017-02-28 21:30:25 +00: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
Dante Ruiz
73c337efd0 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-25 00:42:22 +00:00
Dante Ruiz
835b23832f some modal clean up 2017-02-25 00:40:38 +00: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
Seth Alves
fcd3c09404 Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay 2017-02-24 14:27:30 -08: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
Dante Ruiz
89f5e5112f Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-24 15:25:32 +00:00
Seth Alves
610c20e01a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-23 17:41:38 -08: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
Dante Ruiz
63a78a73db Merge branch 'master' into menuFix 2017-02-23 15:45:30 +00: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
Dante Ruiz
3ba605bf23 saving work 2017-02-23 00:28:30 +00: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
43f47c1106 merge from upstream 2017-02-20 12:45:39 -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
Seth Alves
838d7f6f10 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 13:58:18 -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
d40402faae Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 06:53:34 -08: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
Seth Alves
3171ce1602 hook up more of new-model dialog 2017-02-10 12:03:26 -08:00
Seth Alves
c4ac719d2c merge from upstream + cleanups 2017-02-09 14:26:29 -08:00
Seth Alves
4c3a6842a5 start on moving edit.js to tablet 2017-02-09 14:03:01 -08: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
Seth Alves
298e842fd1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-07 19:53:57 -08:00
Dante Ruiz
b50e20c545 general function to load QML for javascript for tablet 2017-02-08 00:01:48 +00: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
Seth Alves
43bf929e95 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-02-01 20:27:43 -08:00
Anthony J. Thibault
de55a5dfe6 tablet-ui: reduced volume of button click 2017-02-01 18:47:50 -08:00
Seth Alves
adaee0e62c Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-01-31 21:27:00 -08:00
Seth Alves
91e542a7a7 ModelScriptingInterface::meshToOBJ takes a list of MeshProxys instead of just one 2017-01-31 21:26:49 -08:00
Anthony J. Thibault
cf855391af Added jsdocs for all button properties 2017-01-31 16:54:15 -08:00
Seth Alves
bb3155ee61 obj file is now produced in /tmp 2017-01-31 14:29:42 -08:00
Seth Alves
88948fa2b4 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into model-scripting 2017-01-30 19:54:50 -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
Seth Alves
d158f6afd1 hook up a way to get mesh out of polyvox 2017-01-28 20:42:14 -08:00
Seth Alves
541692c5ca start on scripting interface to allow saving polyvox meshes to obj files 2017-01-28 15:38:18 -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
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
Ryan Jones
3ccc493871 add helpers for v3 and shaders 2016-11-29 15:40:20 -08:00
howard-stearns
8b9efb461e bubble state 2016-11-23 10:22:24 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
Ryan Huffman
179eed5d11 Add Vec2 and Vec3 defiitions to jsdoc 2016-11-16 11:56:42 -08:00
Ryan Huffman
7e9df928f4 Add jsdoc comments to Menu 2016-11-16 10:49:50 -08:00
David Rowe
9b270834dd Merge branch 'master' into 21089 2016-11-16 08:51:48 +13:00
Seth Alves
43b73f0380 Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-14 10:00:46 -08:00
Ryan Huffman
51586ae0a3 Fix log typo in SpatiallyNestable 2016-11-14 09:06:11 -08:00
Brad Hefta-Gaub
cc6d68ffdf Merge pull request #8973 from humbletim/fix-batched-script-keys 
Use matching hash keys for input/output when batch-loading scripts.
 2016-11-14 08:13:32 -08:00
Seth Alves
5133ce0548 print a debug message when skipping evaluation of a previously included url 2016-11-12 10:50:21 -08:00