Commit graph

1596 commits

Author SHA1 Message Date
Menithal
c3021ae60d Fixing Menu Items for Parenting / Unparenting 2017-02-15 22:21:29 +02:00
Menithal
655c49d9c0 edit.js: started to work on Parenting via hotkey 2017-02-15 19:50:15 +02:00
Menithal
7b02d1073a Added a generic Window Notification for Feedback
This allows to use the existing Pop-up notifications for generic
notification messages
2017-02-15 19:49:31 +02:00
Philip Rosedale
01bdac49d0 Merge pull request #9672 from ctrlaltdavid/21121
Fix far grabbing making entity jump upon grab
2017-02-14 17:02:42 -08:00
David Rowe
625f5efdf8 Merge branch 'master' into 21164
# Conflicts:
#	scripts/system/audio.js
2017-02-15 10:00:52 +13:00
Chris Collins
442e8d68ef Merge pull request #9650 from kunalgosar/browserFix
Added isAway (paused) property to myAvatar
2017-02-14 11:16:07 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Dante Ruiz
61912b6ff0 saving work 2017-02-14 07:46:31 -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
Seth Alves
30c46b89a0 Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect
Removed ColorOverlay from TabletButton, added more icon & text states
2017-02-14 06:16:59 -08:00
David Rowe
2672b8d10a Fix tabs 2017-02-14 17:30:56 +13:00
David Rowe
61f8631a2b Fix far grabbing making entity jump upon grab 2017-02-14 17:30:20 +13: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
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08: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
kunalgosar
a8f223518c modified away script to use MyAvatar.isAway property 2017-02-10 17:28:12 -08:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
David Rowe
8a995cc1d2 Display list of audio input devices before list of audio output devices 2017-02-10 20:14:52 +13:00
David Rowe
9e3d8b0b6d Move the audio devices list into the root audio dialog 2017-02-10 20:11:20 +13:00
Dante Ruiz
0e83e5da06 minimize diff 2017-02-09 07:13:30 -08:00
Dante Ruiz
580216c3d2 adding tablet-goto.js 2017-02-09 07:13:30 -08:00
Dante Ruiz
5c5ace7c7b goto in tablet 2017-02-09 07:13:29 -08:00
Philip Rosedale
c9c04a9afc Merge pull request #9638 from PhilipRosedale/fixRescale
Fix rescale avatar bug
2017-02-08 22:09:41 -08:00
Seth Alves
2ec4f118fd Merge pull request #9639 from hyperlogic/feature/tablet-pal
Ported PAL to tablet
2017-02-08 21:17:38 -08:00
Anthony J. Thibault
c2b832fb9c removed debug prints from pal.js 2017-02-08 18:55:22 -08:00
Philip Rosedale
e94e41698e remove debug 2017-02-08 18:04:55 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
Philip Rosedale
dc957d09d8 remove comment 2017-02-08 15:45:29 -08:00
Philip Rosedale
fe92d38b60 Fixed scaling of self 2017-02-08 15:42:10 -08:00
Clément Brisset
91bfa65fe2 Merge pull request #9586 from Triplelexx/21146
21146
2017-02-08 11:07:27 -08:00
Seth Alves
47976406fc Merge pull request #9607 from hyperlogic/bug-fix/better-haptics
More consistent haptics on web overlays and entities
2017-02-08 05:47:05 -08:00
Anthony J. Thibault
244437d971 set WANT_DEBUG_STATE back to false 2017-02-07 23:50:06 -08:00
Seth Alves
e1a3b0c551 Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos
In desktop mode create tablet near mouse click location.
2017-02-07 19:51:05 -08:00
Anthony J. Thibault
cb58c567b8 In desktop mode create tablet near mouse click location.
But prevent the tablet from being displayed off screen.
2017-02-07 18:18:34 -08:00
howard-stearns
2e88f1ab1f conserving audio interval 2017-02-07 16:21:14 -08:00
howard-stearns
23fc9b6fb3 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-performance 2017-02-07 16:00:08 -08:00
howard-stearns
3bd11978aa low-hanging fruit on pal performance 2017-02-07 15:59:38 -08:00
Seth Alves
90fa8bf572 Merge pull request #9612 from druiz17/users
some tweaks to users and menus got tablet
2017-02-07 15:38:43 -08:00
Triplelexx
e7244b47a9 increase LETTER_OFFSET value
allow more room for characters, could be improved by detecting each one
2017-02-07 21:55:55 +00:00
Chris Collins
d2feb4202b Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes
send UserActivityLogger events when tablet is opened or closed
2017-02-07 08:23:09 -08:00
Anthony Thibault
2f09be5ead Merge pull request #9605 from druiz17/tabletClicking
enforce more button clicking logic
2017-02-06 20:23:16 -08:00
Seth Alves
e3af5032c0 send UserActivityLogger events when tablet is opened or closed 2017-02-06 16:49:26 -08:00
Seth Alves
68de18a3bb Merge pull request #9610 from sethalves/tablet-ui-use-models-from-s3-again
use tablet models from s3 until relative model urls work
2017-02-03 18:34:28 -08:00
Dante Ruiz
0c28776ea2 some tweaks to users and menus got tablet 2017-02-04 00:13:39 +00:00
Seth Alves
9f04a72a38 Merge pull request #9599 from hyperlogic/feature/tablet-ui-button-sort-order
tablet-ui: Added sortOrder property to buttons
2017-02-03 15:20:53 -08:00
Seth Alves
f635cd8a07 use tablet models from s3 until relative model urls work 2017-02-03 15:17:33 -08:00
Anthony J. Thibault
6738c0eade More consistent haptics on web overlays and entities 2017-02-03 12:05:30 -08:00
Dante Ruiz
2a3d0b6b17 enforce more button clicking logic 2017-02-03 19:13:57 +00:00
Chris Collins
bac5bd5c0e Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00