David Kelly
4a4c914ca8
First cut at new styling
2017-02-23 18:53:22 -08:00
Seth Alves
0a2a1b1637
include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet
2017-02-23 15:25:09 -08:00
Seth Alves
9c0104a060
don't use Entities.getEntityProperties on tablet when it's an overlay
2017-02-23 14:55:52 -08:00
Menithal
4d98cc436b
Finished up Edit.js
2017-02-23 23:20:21 +02:00
Howard Stearns
cddba43837
Merge branch 'master' into filter-pal-by-view-distance
2017-02-23 08:25:16 -08:00
Seth Alves
37004e4347
steps toward making mouse work on tablet
2017-02-23 08:11:31 -08:00
Menithal
5c0bf690fb
Merge branch 'master' into grab-clone
2017-02-23 10:35:24 +02:00
Menithal
e95e50ad6e
Preliminary work on edit.js to allow for new param
2017-02-23 10:34:04 +02:00
Seth Alves
4a778b9113
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-22 20:39:47 -08:00
Seth Alves
84f95e6776
oops
2017-02-22 19:18:42 -08:00
Seth Alves
b4be942348
trying to get tablet overlay to show up in the right place
2017-02-22 19:18:03 -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
Seth Alves
273f0130f3
fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.
2017-02-22 17:43:09 -08:00
Seth Alves
bcf1f9ab4c
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-22 16:50:29 -08:00
Seth Alves
bfc4853947
make overlays near-grabbable. make tablet be an overlay
2017-02-22 16:50:02 -08:00
Anthony Thibault
44136e550c
Merge pull request #9729 from sethalves/tablet-ui-no-haptics-for-tablet
...
don't do a haptic pulse when av's hand goes near grabbable tablet
2017-02-22 15:55:01 -08:00
Chris Collins
94517057d6
Merge pull request #9721 from hyperlogic/bug-fix/tablet-ui-tablet-placement
...
More consistent tablet angle when first creating the tablet.
2017-02-22 15:00:17 -08:00
Seth Alves
aed1d69377
don't do a haptic pulse when av's hand goes near grabbable tablet
2017-02-22 14:14:10 -08:00
howard-stearns
023a32563c
work around .qml settings issues
2017-02-22 12:59:40 -08:00
Anthony J. Thibault
4866be1f52
More consistent tablet angle when first creating the tablet.
...
The tablet should more constantly be placed above your hand, while facing your head.
It fixes the issue where the tablet would appear almost horizontal when your hand was close to your HMD and at eye level.
2017-02-21 16:01:46 -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
1ddc7de581
remove debugging (and fix missing brace)
2017-02-21 15:41:17 -08:00
Seth Alves
8cf71ebc65
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-21 13:54:21 -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
Anthony J. Thibault
7564b6f0f5
More consistent highlights/toggle for toolbar buttons
...
When the "app" for a button is visible the button should become active.
Also clicking on a highlighted/active button should close the associated "app".
This should be noticeable on the following tablet apps.
* audio
* menu
* people
* market
* users
2017-02-21 10:59:36 -08:00
David Kelly
76229905f2
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-02-21 09:24:22 -08:00
Menithal
3d8c389879
Merge branch 'master' into grab-clone
2017-02-21 07:45:36 +02:00
Philip Rosedale
5c782deb4d
Merge pull request #9701 from ctrlaltdavid/21175
...
Fix laser beam jumping upon grabbing entity
2017-02-20 13:37:11 -08:00
Seth Alves
70c9853189
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-20 12:38:13 -08:00
Menithal
d9f86612de
Fixed view toggle, Added new Notifications
...
- View Toggle now only toggles if no other modifiers are pressed
- More notification, and cases for notification
- Parenting to existing parent
- Unparenting when there is no parent
- Unparenting single entities
2017-02-19 20:18:11 +02:00
Menithal
2a4b493de5
Changed order on Menu
2017-02-19 18:24:56 +02:00
Menithal
9b8503eba5
Initial Grab Clone
2017-02-19 18:18:38 +02:00
Menithal
f3c806e910
Revert of hotkey detection, removed menu hotkeys
...
- Holding hotkeys will no longer spam parent events rapidly, detects only
the release
2017-02-18 18:33:00 +02:00
Menithal
0df6305f90
Revert removal of hotkey from js event
2017-02-18 18:22:01 +02:00
Menithal
dcbe3c622d
Added Hotkey Listening to the webview
...
Ctrl + P and Ctrl + Shift + P are now available even if the edit window
has been selected
2017-02-18 11:51:19 +02:00
David Rowe
71ba38afb0
Process controller and script updates only when finger painting is on
2017-02-18 21:28:30 +13:00
David Rowe
05c63e16ca
Send messages local only
2017-02-18 20:40:27 +13:00
David Rowe
6827a28807
Fix grab position
2017-02-18 16:36:14 +13:00
David Rowe
692fa52aca
Disable drawing pointer lasers while painting
2017-02-18 15:21:48 +13:00
David Rowe
2c02b42c96
Finger paint button icon files
2017-02-18 14:21:54 +13:00
David Rowe
0689557ba5
Draw smoother lines
2017-02-18 13:39:59 +13:00
David Rowe
777a0b51c1
Ignore spurious finger tip position values
2017-02-18 13:35:16 +13:00
David Rowe
784009a9fa
Merge branch 'master' into 21168
2017-02-18 13:20:39 +13:00
Seth Alves
def669364b
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-17 15:45:19 -08:00
Menithal
f5d266a562
Updated
2017-02-17 23:28:28 +02:00
David Rowe
2c5782e4bb
Fix laser beam jumping upon grabbing entity
2017-02-18 09:11:04 +13:00
Seth Alves
47cdade1e9
fix home-button on tablet
2017-02-17 11:47:37 -08:00
David Kelly
51246a2e45
first cut, pretty ugly
2017-02-17 10:24:01 -07:00
Menithal
f211f015d7
Merge branch 'master' into parent-hotkey
2017-02-17 19:22:28 +02:00
David Rowe
3712aea861
Handle trigger values of 1.0 not repeating
2017-02-17 19:31:53 +13:00
David Rowe
bdfc9fd418
Tidying
2017-02-17 19:31:40 +13:00
David Rowe
25761adf6c
Erase closest line
2017-02-17 19:31:25 +13:00
David Rowe
9c1bb37a34
Paint lines
2017-02-17 19:31:11 +13:00
David Rowe
5236f123c1
Interpret trigger and grip values
2017-02-17 19:30:57 +13:00
David Rowe
7b36669d80
Point index finger while painting if tablet not displayed
2017-02-17 19:30:40 +13:00
David Rowe
867e24762b
Disable lasers and grabbing while painting if tablet not displayed
2017-02-17 19:30:23 +13:00
David Rowe
bad57fa03f
Controller and painting code framework
2017-02-17 19:30:04 +13:00
David Rowe
585691f71c
Add finger painting button to tablet
2017-02-17 19:29:11 +13:00
Anthony J. Thibault
47e87e1ad4
Bug fix for clara.io marketplace
2017-02-16 17:41:36 -08:00
Anthony J. Thibault
2ea88012f9
Remove toolbar from tablet-goto.js
2017-02-16 17:36:16 -08:00
Anthony J. Thibault
345f0519ef
Removed use of Toolbar API for most default scripts.
2017-02-16 17:29:35 -08:00
Anthony J. Thibault
cffdecbf68
Merge branch 'master' into feature/toolbar-tablet-switcheroo
2017-02-16 16:28:43 -08:00
Anthony J. Thibault
7f95753a1e
Prevent tablet from being open while in toolbarMode
2017-02-16 16:18:51 -08:00
howard-stearns
6e3ae1fe4f
cleanup some accumulated cruft in pal code
2017-02-16 10:53:02 -08:00
Menithal
afbf4bc30f
Fixed Parenting/Unparenting Menu Removal and Binding
2017-02-16 10:52:42 +02:00
Menithal
d96f95a7e9
Updated edit.js and selection tool
...
Last selected entity will now be yellow instead of orange
2017-02-16 10:05:59 +02:00
Menithal
856cdcbd28
Merge remote-tracking branch 'origin' into parent-hotkey
2017-02-16 00:38:01 +02:00
Menithal
c3021ae60d
Fixing Menu Items for Parenting / Unparenting
2017-02-15 22:21:29 +02:00
David Kelly
5184cbe615
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-15 12:08:55 -07:00
Faye Li
2388ec65fe
Merge pull request #9659 from fayeli/users-fix
...
Tablet Users Fixes
2017-02-15 10:25:06 -08:00
Faye Li
8aae2aa5f0
simpler filter code
2017-02-15 10:23:36 -08:00
Faye Li
5ece3f1e1a
use new users icon
2017-02-15 10:16:20 -08: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
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
f8055a027e
Refactor of pal.js to dynamically switch between toolbar and tablet.
2017-02-14 15:34:24 -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
Faye Li
f981f21aa4
fix for ozan's domain
2017-02-13 11:47:58 -08:00
Atlante45
512bb4765f
Add entity clicks capture capabilities
2017-02-13 11:34:30 -08:00
Faye Li
27057190ce
display users even if they dont have a domain name
2017-02-13 11:01:37 -08:00
Faye Li
8cc8f2c7fd
highlight current visibility option
2017-02-13 10:51:01 -08:00
Faye Li
6e0d7bb3cf
make visibility settings into a modal for better readability
2017-02-13 10:42:07 -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
Faye Li
65ca0c7e4a
sticky header bar
2017-02-10 17:27:02 -08:00
Faye Li
e28e16ea5e
make drop down text a little bit bigger
2017-02-10 16:56:13 -08:00
Faye Li
0ba934f543
sort online users array alphabetically
2017-02-10 16:39:14 -08:00
Faye Li
8f43ceed9d
filter out yourself from users online list
2017-02-10 16:22:30 -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
David Kelly
5ca80803c0
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-09 20:01:43 -07: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
David Kelly
61e558e568
Entity Edit Filters for zones
...
Part 1 - just put them in the zones entities. Next I'll hook them
up and actually filter...
2017-02-08 09:53:25 -07: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
Anthony J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -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
f40285c688
Merge pull request #9597 from druiz17/tabletStylus
...
better scrolling and fixed button touching
2017-02-02 16:56:13 -08:00
Anthony Thibault
be4fbb63cf
Merge pull request #9583 from sethalves/fix-post-tablet-edit-buttons
...
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
2017-02-02 16:01:56 -08:00
Anthony Thibault
59b33bbc53
Merge pull request #9585 from sethalves/use-local-tablet-model
...
use tablet model from distribution rather than from s3
2017-02-02 16:01:15 -08:00
Dante Ruiz
0ec8071288
better scrolling and fixed button touching
2017-02-02 23:16:39 +00:00
Anthony J. Thibault
b44e5b5a1f
tablet-ui: preferences for tablet ui scaling
...
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00
Anthony J. Thibault
5890503ec0
Can now grab tablet in 2d mode even when it embedded in geometry
2017-02-02 10:56:56 -08:00
Anthony J. Thibault
9df887de2a
You can no longer scale the tablet with double-grab
2017-02-02 10:16:02 -08:00
Dante Ruiz
2af72f1a50
fixed tablet buliding up when flying fast
2017-02-02 17:03:53 +00:00
Seth Alves
4ae163ac60
hook pal audio meter up again
2017-02-01 19:01:55 -08:00
Triplelexx
05e3acf1a3
Merge remote-tracking branch 'upstream/master' into 21146
2017-02-02 01:16:51 +00:00
Triplelexx
1a58dad3ad
change age check
...
check for equal to -1 instead of < 1, think this would be more suitable
if undefined is returned.
2017-02-02 01:12:55 +00:00
Seth Alves
d9bdbb92ef
use tablet model from distribution rather than from s3
2017-02-01 16:55:29 -08:00
Seth Alves
6671324a33
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
2017-02-01 16:29:12 -08:00
Faye Li
80c8748046
Revert "replace old user.js"
...
This reverts commit 2340f56b53
2017-02-01 15:37:01 -08:00
