Zach Fox
bf191eabb7
Some new stale PAL behavior
2017-03-22 13:35:48 -07:00
David Kelly
34a89e4b9a
added sounds, new haptics, and some cleanup
2017-03-22 13:26:51 -07:00
Dante Ruiz
3a89654111
saving work
2017-03-22 19:14:53 +01:00
Anthony J. Thibault
2c38d7ff89
Tablet spawn orientation now takes hand orientation into account.
...
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
2017-03-22 11:03:03 -07:00
David Kelly
a594419688
friend->connection which I should have done long ago
2017-03-22 10:09:48 -07:00
Triplelexx
2d1ca99e2e
change variable names that use Quat.getForward
2017-03-22 17:00:12 +00:00
Seth Alves
bd32104bc1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-22 08:41:59 -08:00
Ryan Huffman
1285f2a9eb
Merge pull request #9937 from thoys/boppo
...
El Boppo the Clown punching bag game
2017-03-22 09:30:54 -07:00
David Kelly
59b02261e5
minor cleanup, remove waiting visualization completely
2017-03-21 16:08:25 -07:00
Triplelexx
a964edee91
change all references of Quat.getFront to Quat.getForward in scripts directory
2017-03-21 22:25:30 +00:00
Dante Ruiz
d2c139ce6e
fix error from using a misspelled function
2017-03-21 22:25:45 +01:00
kunalgosar
f09ee92fe1
spacing issues
2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5
spacing issues
2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4
fixed back button on marketplace
2017-03-21 14:12:54 -07:00
David Kelly
5bcd7ca97f
visuals update. Will do some cleaning shortly
2017-03-21 13:27:00 -07:00
Seth Alves
14027d4acb
Merge pull request #9968 from druiz17/tablet-xbox
...
Fixed the third eye for the xbox controller
2017-03-21 11:03:53 -08:00
Seth Alves
04a334fd07
unmangle merge
2017-03-21 11:02:18 -08:00
Dante Ruiz
bf3c5dbf0e
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox
2017-03-21 19:47:16 +01:00
Dante Ruiz
1811a2edc7
fixed third eye laser
2017-03-21 19:45:00 +01:00
Seth Alves
1da6349505
merge from upstream
2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3
Merge pull request #9712 from huffman/feat/edit-particle-icon
...
Add particle system overlay in edit.js
2017-03-21 10:02:52 -07:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub
b7f48644af
Merge pull request #9955 from druiz17/tablet-edit-selecting
...
Fix edit.js from deselecting an object when trying to delete it
2017-03-21 09:27:30 -07:00
Zach Fox
29e97381eb
PAL open, user leaves, gray out row
2017-03-20 17:20:28 -07:00
Seth Alves
bc90e9081b
Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale
...
Tablet scale settings now take effect soon after they are changed.
2017-03-20 15:05:47 -08:00
Zach Fox
d16acc5a7f
Stale PAL Notification
2017-03-20 15:24:49 -07:00
Anthony J. Thibault
f5c3d41f2c
Tablet scale settings now take effect soon after they are changed.
2017-03-20 14:51:47 -07:00
Dante Ruiz
de24023a21
Fix edit.js from deselecting an object when trying to delete it
2017-03-20 20:43:32 +01:00
Seth Alves
8988110c3b
Merge pull request #9953 from fayeli/edit-export-entities
...
Adding Export Entities Functionality in Tablet Edit
2017-03-20 11:35:18 -08:00
David Kelly
81cb63df6b
new particle effect, first pass
2017-03-20 11:42:58 -07:00
Faye Li
f57905fbb3
remove code for jump to selection
2017-03-20 10:23:55 -07:00
Seth Alves
2e29ff3114
Merge pull request #9934 from fayeli/edit-import-entities
...
Adding Import Entities button on the Create tab of Edit
2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub
af790d8474
Merge pull request #9875 from birarda/bug/spin-strafe
...
fix double snap turn strafing
2017-03-20 10:08:05 -07:00
Ryan Huffman
df644edde4
Fix hand controller not able to select light/particle icons
2017-03-20 09:45:50 -07:00
Thijs Wenker
a8740614e2
CR Fixes
2017-03-18 01:22:06 +01:00
Faye Li
197a06c423
changes in TWO entityList.js to register the export event
2017-03-17 16:17:21 -07:00
Atlante45
4c75680877
Set teleport target to Cancel if seat in use
2017-03-17 16:10:15 -07:00
Faye Li
1a46f18aa3
adding export button + hiding jump to selection
2017-03-17 15:56:55 -07:00
David Kelly
c425c32b8f
hack somewhat different visualization in. If this is ok, will cleanup
2017-03-17 14:56:47 -07:00
Thijs Wenker
febe25511b
teleport.js - ignore entity support (for boxing gloves)
2017-03-17 21:10:06 +01:00
Faye Li
6531efffbc
hook up qml button to edit.js
2017-03-17 11:22:07 -07:00
David Kelly
58ac34b336
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-17 08:46:04 -07:00
David Kelly
2758e740bf
hacked in a particle effect (as entity) plus popped sphere into existence
2017-03-17 08:45:24 -07:00
Seth Alves
df84ff27e9
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-03-17 07:52:22 -07:00
Seth Alves
a5d19439f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-16 16:32:07 -07:00
Zach Fox
fc2a501474
Cleanup JS<->QML messaging
2017-03-16 15:38:39 -07:00
David Kelly
60000becce
more careful stopping of intervals, edge case stuff
2017-03-16 13:19:17 -07:00
David Kelly
f0fad5981a
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff
2017-03-16 09:01:13 -07:00
Seth Alves
31e0cfe296
Merge pull request #9825 from thoys/record-fixes
...
Avatar Recorder and Playback Fixes
2017-03-16 07:27:42 -08:00
David Kelly
4f6123ee29
more messaging rework - dealing with edges
2017-03-15 16:41:07 -07:00
howard-stearns
84fd17bd88
use location.metaverseServerUrl instead of hardcoded value.
2017-03-15 16:33:23 -07:00
Dante Ruiz
a5f1fb9e9a
fixed notification spelling error
2017-03-15 19:45:30 +01: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
David Kelly
d8719ac3a9
cleanup, switch to overlays with texture swapping, move overlay to between hands
2017-03-15 11:15:58 -07:00
Stephen Birarda
d13752a7c6
use the correct property name for useAdvancedMovementControls
2017-03-15 10:34:43 -07:00
Stephen Birarda
bfc51d8222
use property not function for advanced movement controls
2017-03-15 10:25:06 -07:00
Seth Alves
96a3e2a6d3
Merge pull request #9898 from ctrlaltdavid/21214
...
Load controller scripts in their own script engine
2017-03-15 08:42:20 -08:00
Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
howard-stearns
6c88bc98b4
Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-15 09:24:30 -07:00
Triplelexx
5883bd39dc
rename color to component
2017-03-15 11:17:27 +00:00
Triplelexx
41041c711f
use utils.js
2017-03-15 11:09:13 +00:00
Triplelexx
9e0091ebe0
use utils.js, move easing function, use mixes
...
some cleanup
2017-03-15 11:08:54 +00:00
Triplelexx
84d157ab18
handle overlay lifetime during update, remove color conv
2017-03-15 10:31:09 +00:00
David Rowe
cb4bd58381
Load controller scripts in their own script engine
2017-03-15 14:31:13 +13:00
Stephen Birarda
7ddb5ff770
use correct boolean when changing AMC
2017-03-14 18:09:17 -07:00
Stephen Birarda
188530590a
add missing curly brace to script
2017-03-14 17:16:49 -07:00
Stephen Birarda
490cb83489
move advanced movement control changes to MyAvatar
2017-03-14 15:03:01 -07:00
David Kelly
0a35fa34f9
some reworking, cleaning, bug fixing...
2017-03-14 14:22:44 -07:00
Zach Fox
5da0dfc4ac
Merging from Pal_v2_Zach
2017-03-14 14:05:50 -07:00
Triplelexx
6971aeb081
additional reference information
2017-03-14 17:18:11 +00:00
David Kelly
f821ccc8c3
fix typo - doh!
2017-03-14 10:00:19 -07:00
Triplelexx
8a39ce16bd
add simple easing function
...
dodgy add push
2017-03-14 16:57:45 +00:00
Triplelexx
4dd9a7c37f
add simple easing function
2017-03-14 16:51:43 +00:00
David Kelly
246d2f4017
fix comments at top
2017-03-14 08:58:14 -07:00
Triplelexx
30c16984c0
change offsetPosition to use Camera.position
2017-03-14 06:07:22 +00:00
Triplelexx
c729ceccb5
change color lerp to use HSV color
2017-03-14 03:59:24 +00:00
David Kelly
7765daf382
handle cleanup, race, etc..., more to come
2017-03-13 18:57:01 -07:00
David Kelly
fa7283a6e2
initial new messaging - working but needs cleanup
2017-03-13 18:33:36 -07:00
Triplelexx
2e0cac4676
add extra safeguards
2017-03-14 01:25:39 +00:00
Triplelexx
8bd155cb86
change offsetPosition to use Camera.orientation
2017-03-14 01:23:04 +00:00
Ryan Huffman
8246dbafab
Update particle explorer to work outside of entity list
2017-03-13 15:15:36 -07:00
Stephen Birarda
0926b2df2a
add LX snap turn to standard mapping
2017-03-13 15:14:20 -07:00
Ryan Huffman
9880d40cfb
Update edit.js light icons to now use the name entityIcon
2017-03-13 14:38:56 -07:00
David Kelly
515e6fd34e
map Controller.Standard.RB so xbox controller works. whee.
2017-03-13 13:10:05 -07:00
howard-stearns
db06c2650f
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-13 11:53:48 -07:00
Triplelexx
95fcb1df7a
fix spelling mistake
2017-03-13 18:32:53 +00:00
Ryan Huffman
d4ade8278c
Fix js linting errors in entityIconOverlayManager.js
2017-03-13 11:27:12 -07:00
Ryan Huffman
b7783dcffe
Update edit.js light/particle overlays to be clickable when behind something
2017-03-13 11:26:34 -07:00
David Kelly
e2e7573e93
handle stopping handshake part-way through
2017-03-13 11:04:51 -07:00
Zach Fox
beb848373b
Update from zfox23/PALv2 branch
2017-03-13 10:15:06 -07:00
Ryan Huffman
c2564800dc
Add edit.js particle + light icons
2017-03-13 10:10:53 -07:00
Ryan Huffman
dbcd7fd9e9
Fix light icon overlay not updating to represent light type
2017-03-13 10:10:53 -07:00
Ryan Huffman
42d518fafb
Remove debug log in entityIconOverlayManager
2017-03-13 10:10:53 -07:00
Ryan Huffman
86116aaad7
Update light/particel icons to be shown by default in edit mode
2017-03-13 10:10:53 -07:00
Ryan Huffman
ce5ee42961
Update LightOverlayManager to work with particles
2017-03-13 10:10:53 -07:00
Seth Alves
524e4bdfbc
Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race
...
Tablet ui fix edit props race
2017-03-13 08:56:56 -08:00
Triplelexx
873a9aa39e
change color swapping to be more concise
2017-03-11 07:40:32 +00:00
Brad Hefta-Gaub
23e47f2fdc
added icons to the audioScope app
2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub
b8a2525f9e
add auto pause/resume to the Audio Scope App
2017-03-10 17:38:00 -08:00
Anthony J. Thibault
3abc78e7d3
Fix for finger/sytlus on invisible/hidden tablet.
2017-03-10 17:18:13 -08:00
Brad Hefta-Gaub
5f3ee2e98f
add a basic tablet app for the audio scope
2017-03-10 17:08:54 -08:00
Anthony J. Thibault
07e10ae862
Merge branch 'tablet-ui' into feature/can-touch-this
2017-03-10 17:05:26 -08:00
Triplelexx
8a0dd55275
change naming and comment
2017-03-11 00:19:02 +00:00
Triplelexx
eb4dee0495
create audioMuteOverlay.js
...
client scipt that creates an overlay to provide mute feedback
2017-03-10 23:37:29 +00:00
Seth Alves
2098cd5b5e
remove stylus and search-beams when grab script is shut down
2017-03-10 13:02:16 -08:00
Seth Alves
88e74251a1
cleanups
2017-03-10 12:51:34 -08:00
Seth Alves
411ec9a791
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race
2017-03-10 10:22:10 -08:00
Seth Alves
fffff817a3
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-10 10:20:40 -08:00
Seth Alves
494b602d4c
Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot
...
toolbar becomes visible after taking a snapshot
2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4
Merge pull request #9835 from druiz17/toolbar-window-dont-close
...
Close toolbar windows when reloading scripts
2017-03-10 10:19:07 -08:00
Seth Alves
d792559d9a
have edit.js resend properties of selected entity to entityProperties.js once it's ready
2017-03-10 09:59:23 -08:00
Dante Ruiz
d54005b62e
no more duplicate snapshot buttons after taking reloading scripts
2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382
toolbar becomes visible after taking a snapshot
2017-03-09 22:54:22 +00:00
Anthony J. Thibault
d8f04d90a7
Merge branch 'master' into feature/can-touch-this
2017-03-09 14:24:10 -08:00
Anthony J. Thibault
6f53aaed5c
Small simplification of building stylusTarget list.
2017-03-09 14:04:13 -08:00
druiz17
0069569e96
Merge branch 'tablet-ui' into 21197
2017-03-09 09:31:15 -08:00
Seth Alves
023b01814e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-quick-summon-1
2017-03-09 09:16:37 -08:00
druiz17
007ed9fe81
Merge pull request #9836 from druiz17/2-tablets-fix
...
Fixed having more than one tablet when reloading scripts
2017-03-09 09:13:14 -08:00
Anthony J. Thibault
1acc5ea760
Finger now points when near tablet + deadspot added when touching the tablet
2017-03-08 19:03:56 -08:00
Dante Ruiz
2a275a4f4b
removed tab at the end of word
2017-03-09 00:15:02 +00:00
Seth Alves
9435c58c2c
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1
2017-03-08 16:10:38 -08:00
Dante Ruiz
b878f164fb
minimize diff again
2017-03-09 00:10:38 +00:00
Dante Ruiz
f6d799c048
minimize diff
2017-03-09 00:09:32 +00:00
Dante Ruiz
561bd27c38
minimize diff
2017-03-09 00:08:50 +00:00
Dante Ruiz
5f7a0ea8fc
Close tablet when switching form HMD to desktop and vice versa
2017-03-09 00:05:26 +00:00
Seth Alves
6aac2eb338
for overlay tablets, precreate them so that they show up quickly when summoned
2017-03-08 15:31:24 -08:00
Seth Alves
de2dd7383d
didn't need invis flag, after all
2017-03-08 15:30:49 -08:00
Dante Ruiz
ce105e0329
fix double tablets when reloading scripts
2017-03-08 22:21:57 +00:00
Dante Ruiz
881213259d
Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close
2017-03-08 21:44:20 +00:00
Dante Ruiz
59b4fa5fd7
Close toolbar windows when scripts are reloaded
2017-03-08 21:44:04 +00:00
Seth Alves
371c20ee25
hide tablet by making it not visible rather than destroying it
2017-03-08 10:33:59 -08:00
Seth Alves
66d44ac6f0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-08 09:26:51 -08:00
Seth Alves
a67f8ac0ed
Merge pull request #9807 from Menithal/21166-remove-limit
...
#9761 Cloneable Improvement
2017-03-08 07:15:06 -08:00
David Rowe
950f91965d
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-08 17:35:58 +13:00
Anthony J. Thibault
836c701cb3
More accurate and responsive stylus and finger touching.
...
The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved.
* hovering the finger/stylus over the surface of the tablet should cause buttons to highlight.
* flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet.
* stabbing the tablet quickly, should also more accurately trigger button presses.
* moving the hand/stylus from behind the tablet should be less likely to cause press events.
2017-03-07 18:19:32 -08:00
Thijs Wenker
b21bd3afa9
Make the time and slider follow the record.js toolbar
2017-03-08 01:14:11 +01:00
Seth Alves
b938579598
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 11:42:44 -08:00
Andrew Meadows
1e9623e2f2
Merge pull request #9813 from druiz17/multipule-audio-fix
...
removed duplicated audio devices
2017-03-07 10:00:48 -08:00
Seth Alves
f594689fa8
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 09:24:50 -08:00
Dante Ruiz
fc65723d68
corrected removing duplicate devices
2017-03-06 22:14:20 +00:00
Seth Alves
4886f1cbfc
don't run stylus-on-overlay code unless the overlay is a web3d overlay
2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub
38668b6ce5
Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays
...
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 12:32:18 -08:00
Thijs Wenker
6ded937b25
Merge pull request #9809 from Menithal/21201
...
WL#21201 Snap-together Magnetic blocks
2017-03-06 21:30:53 +01:00
David Rowe
09ecb12510
Merge branch 'tablet-ui-edit-js' into 21197
...
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-07 08:59:40 +13:00
Seth Alves
27066e89a6
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:46:19 -08:00
Seth Alves
a2d2c41f02
remove debug print
2017-03-06 11:45:49 -08: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
eb47db4441
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:07:22 -08:00
Dante Ruiz
b6671d92c8
removed duplicated audio devices
2017-03-06 18:46:57 +00:00
Seth Alves
6ac576c9e6
Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays
2017-03-06 10:43:43 -08:00
Seth Alves
19a31d7630
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 10:15:53 -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
Brad Hefta-Gaub
781e0be0e3
Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh
...
preserve audio data during pal refresh
2017-03-06 08:45:46 -08:00
Seth Alves
c677326025
Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet
...
Touch the tablet with your finger
2017-03-04 11:58:47 -08:00
Menithal
ea3f7f0274
Initial Magnetic block
2017-03-04 18:50:30 +02:00
Menithal
d85cb645b0
Changed limit logic, default limit is now 0
...
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
2017-03-04 11:42:43 +02:00
howard-stearns
15d680d4f9
preserve audio data during pal refresh
2017-03-03 16:56:12 -08:00
Anthony J. Thibault
e56f02d94f
Changed default for preferFingerOverStylus to false.
2017-03-03 14:12:04 -08:00
Seth Alves
bccfa79e8b
Merge pull request #9749 from ctrlaltdavid/21176
...
If someone else is grabbing entity you want to grab show their grab beam
2017-03-03 13:43:28 -08:00
David Rowe
6403e51d20
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-04 09:00:49 +13:00
David Rowe
48ee661f02
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-04 08:58:48 +13:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Seth Alves
40caa1ea49
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-03 09:01:57 -08:00
David Rowe
388a144af1
Tidying after merge
2017-03-03 18:44:50 +13:00
David Rowe
482c23ead5
Merge branch 'master' into 21186
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-03-03 18:38:42 +13:00
David Rowe
9384dfd89c
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-03 18:05:18 +13:00
David Rowe
854292b193
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-03 17:51:12 +13:00
Brad Hefta-Gaub
e655e442a0
Merge pull request #9799 from sethalves/steady-hand-lasers
...
Steady hand lasers
2017-03-02 18:27:39 -08:00
Seth Alves
3b581a8dfe
merge from upstream
2017-03-02 16:35:44 -08:00
Seth Alves
155a310852
Merge pull request #9761 from Menithal/21166
...
WL#21166 Cloneable Equipment
2017-03-02 16:33:13 -08:00
Seth Alves
10cb7aab06
Merge pull request #9684 from Menithal/parent-hotkey
...
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
2017-03-02 16:30:43 -08:00
ZappoMan
6400bb6319
CR feedback
2017-03-02 14:34:14 -08:00
Anthony J. Thibault
644e29a43d
disable WANT_STATE_DEBUG in handControllerGrab.js
2017-03-02 14:15:05 -08:00
Seth Alves
f321ffdf91
don't clear EDIT_SETTING flag when creating new entities
2017-03-02 13:00:52 -08:00
Seth Alves
bbfd373887
Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-02 12:51:52 -08:00
Seth Alves
9b3c16d489
get handControllerGrab overlay lines working again
2017-03-02 12:48:37 -08:00
Seth Alves
2047e0194d
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 12:44:10 -08:00
David Rowe
b985b348ec
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-03 09:43:49 +13:00
David Rowe
4d624ad256
Merge branch 'menuFix' into 21199
2017-03-03 09:42:16 +13:00
Menithal
91fa871d55
Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey
2017-03-02 21:40:45 +02:00
Menithal
9c31f66b75
Addressed CR of 9684
2017-03-02 21:39:56 +02:00
Seth Alves
94b5e6333c
get handControllerGrab overlay lines working again
2017-03-02 11:02:06 -08:00
Ryan Huffman
1564c76ab4
Merge pull request #9792 from huffman/feat/hand-controller-drop
...
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
2017-03-02 10:51:35 -08:00
Seth Alves
9d4445fd61
Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-02 10:07:37 -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
Seth Alves
8893c4770e
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 10:02:33 -08:00
Seth Alves
93055a67a8
use new-style hand-lasers for both hands
2017-03-02 10:01:08 -08:00
ZappoMan
9e71801ae1
remove properties from RayToEntityIntersectionResult
2017-03-01 18:21:04 -08:00
Anthony J. Thibault
4f03c06a94
Added General Preference to control stylus vs finger usage
...
By default the finger is preferred over the stylus.
2017-03-01 18:07:53 -08:00
Seth Alves
7f6b803652
3d-line-overlays can now have an endParentID and endParentJointIndex
2017-03-01 17:27:32 -08:00
Dante Ruiz
58c1a2fb99
Merge branch 'master' into menuFix
2017-03-02 00:55:18 +00:00
Seth Alves
7c4869eb73
fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother
2017-03-01 16:10:07 -08:00
David Rowe
9f56d2f6f6
Make tablet general settings dialog naming more consistent with desktop
2017-03-02 12:30:36 +13:00
Menithal
231ebef117
Removed stray debugPrint
2017-03-02 01:01:57 +02:00
Menithal
fd1fded276
Fixed Clone instancing issues
2017-03-02 00:59:45 +02:00
Anthony J. Thibault
d142c3d69b
eslint fix
2017-03-01 13:29:24 -08:00
Anthony J. Thibault
f418457100
Index finger touch support for the tablet-ui.
2017-03-01 13:28:17 -08:00
David Rowe
6fafc829e1
Merge branch 'menuFix' into tablet-ui
2017-03-02 09:28:35 +13:00
David Rowe
f60c2f8ec9
Merge branch 'tablet-ui-edit-js' into tablet-ui
2017-03-02 09:27:09 +13:00
Menithal
82236bdcb9
Merge remote-tracking branch 'upstream/master' into 21166
2017-03-01 22:09:29 +02:00
Menithal
f538ac24f3
Various Properties
2017-03-01 22:07:02 +02:00
David Kelly
45293ab130
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-03-01 12:55:54 -07:00
Ryan Huffman
1c3840dc78
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
2017-03-01 10:25:16 -08:00
David Kelly
efe44425a6
cr feedback, plus something I missed
2017-03-01 09:26:03 -07: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
Seth Alves
c2085ebb6e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-28 13:33:51 -08:00
David Kelly
1fc57ce9a6
alan's feedback
2017-02-28 11:51:40 -07:00
Clément Brisset
7f9437dcc5
Merge pull request #9690 from Atlante45/feat/sit
...
Add hips pinning / Sit script
2017-02-28 10:41:22 -08:00
Dante Ruiz
d5714bfa6e
Merge branch 'master' into menuFix
2017-02-28 16:55:44 +00:00
Matti Lahtinen
d0c2c26a8e
One last gotcha from the conflict resolution.
2017-02-28 16:37:08 +02:00
Matti Lahtinen
e21785d5ec
Merge branch 'master' into 21166
2017-02-28 16:34:28 +02:00
David Rowe
d8d17be0e0
Rotate about translation grab position
2017-02-28 23:22:07 +13:00
David Rowe
e3f2f3c5bc
Tidying
2017-02-28 23:04:23 +13:00
David Rowe
28768d4a78
Rotate the entity by twice the rotating controller's rotation
2017-02-28 22:22:34 +13:00
David Rowe
5b6f953ac2
Add hand controller state of distance-rotating for second grab hand
2017-02-28 17:35:13 +13:00
Seth Alves
117be16c31
pull from upstream
2017-02-27 16:48:23 -08:00
Ryan Huffman
f5f7cc5266
Fix teleport seat beam color to match model
2017-02-27 16:38:55 -08:00
Ryan Huffman
aa94106229
Update teleport to sit in invisible seats
2017-02-27 16:38:55 -08:00
Ryan Huffman
40b238c12e
Add new teleport seat model + beam
2017-02-27 16:38:53 -08:00
Ryan Huffman
c632884aac
Update teleport script to handle detecting seats
2017-02-27 16:38:53 -08:00
Ryan Huffman
9197819291
Cleanup teleport to make use of new TARGET
2017-02-27 16:38:53 -08:00
Ryan Huffman
b8c7905fa4
Cleanup some duplication of code in teleport.js
2017-02-27 16:38:53 -08:00
Matti Lahtinen
b1639ee3aa
Removed a Stray Print json that would spam logs.
2017-02-27 23:40:06 +02:00
Menithal
9fbde41dc4
Styling formating and Rebuild attempt
2017-02-27 23:27:48 +02:00
David Rowe
6fcc096bcf
Fix JavaScript error
2017-02-28 10:14:38 +13:00
David Rowe
08cae1d3f2
Make other avatar's grab beam finish at entity's centroid
2017-02-28 10:02:06 +13:00
David Rowe
f4a3627b76
Make other avatar's grab beam start at more natural position
2017-02-28 09:47:36 +13:00
Dante Ruiz
21c15927cf
Homebutton dimension and position scales with tablet
2017-02-27 19:33:52 +00:00
David Rowe
31b6d528df
Merge branch 'master' into 21176
2017-02-28 08:29:44 +13:00
Dante Ruiz
19110ecfee
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-27 16:00:08 +00:00
Seth Alves
34c5d480c4
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-27 06:35:50 -08:00
Seth Alves
1864975c51
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-27 06:35:22 -08:00
Menithal
1d8be2aeaa
Added missing dynamic
2017-02-26 19:17:46 +02:00
Menithal
69949cd6b5
Finalized Grab-Clone action
2017-02-26 18:49:13 +02:00
Philip Rosedale
4925b3c47c
Merge pull request #9756 from ctrlaltdavid/21122
...
Point index finger and raise thumb if not touching controller
2017-02-25 14:59:48 -08:00
David Kelly
baa7f81d79
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-02-24 18:38:57 -08:00
David Rowe
0cc499b08b
Point index fingers and raise thumbs if not touching controls
2017-02-25 14:20:23 +13: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
David Rowe
a205d2a00c
Use animation for pointing index finger instead of setting joint angles
2017-02-25 11:36:06 +13: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
Seth Alves
b2a35f45db
when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3
2017-02-24 13:04:43 -08:00
Seth Alves
eedc5c1647
don't allow tablet to get stuck to a hand when passing it back and forth between hands
2017-02-24 12:10:52 -08:00
Seth Alves
71ab6a1a84
fix a couple of problems related to grabbing tablet while edit.js is active
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2017-02-24 11:38:42 -08:00
Seth Alves
70060eb464
in 2d mode, clicks on tablet don't get used for other things
...
Conflicts:
scripts/system/libraries/entitySelectionTool.js
2017-02-24 11:37:04 -08:00
Seth Alves
73774a6590
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-24 11:34:59 -08:00
Seth Alves
f208f5e2d1
fix a couple of problems related to grabbing tablet while edit.js is active
2017-02-24 11:34:10 -08:00
David Rowe
a98824f483
Code review
2017-02-25 08:13:15 +13:00
David Kelly
d399f648d5
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
2017-02-24 10:32:43 -08:00
David Kelly
2458f95c42
more of a peak loudness with decay, now
2017-02-24 10:31:55 -08:00
Menithal
10151c3f5b
Added Multi-userdata field updater
2017-02-24 08:04:03 +02:00
David Rowe
d9a716bf3d
If someone else is grabbing entity you want to grab show their grab beam
2017-02-24 18:42:52 +13:00
Seth Alves
e43c4c17f5
in 2d mode, clicks on tablet don't get used for other things
2017-02-23 21:27:25 -08:00
David Kelly
4a4c914ca8
First cut at new styling
2017-02-23 18:53:22 -08:00
Seth Alves
ce717d04e9
merge in tablet-as-overlay code
2017-02-23 18:40:20 -08: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
Seth Alves
d6428ee98c
Merge pull request #6 from fayeli/tablet-edit-layout-fix
...
fix overlapping issue with the delete button
2017-02-23 17:40:15 -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
Seth Alves
5bff2034c3
cleanups, attempt to get particle explorer to work right
2017-02-22 12:07:18 -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
Seth Alves
92580a977b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-20 13:54:12 -08: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
43f47c1106
merge from upstream
2017-02-20 12:45:39 -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
Seth Alves
39e1edafd2
merge from upstream
2017-02-17 13:16:12 -08:00
David Rowe
2c5782e4bb
Fix laser beam jumping upon grabbing entity
2017-02-18 09:11:04 +13:00
Seth Alves
5ddcbae934
save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet
2017-02-17 11:51:23 -08:00
Seth Alves
47cdade1e9
fix home-button on tablet
2017-02-17 11:47:37 -08:00
Seth Alves
0d10667bb4
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-17 09:58:33 -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
Seth Alves
b6b6ad780d
allow isSpotlight to be 0 or 1
2017-02-16 17:15:52 -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
Seth Alves
12b8a77488
in edit.js, convert entity property ID to be a text-field so the data can be copied
2017-02-15 16:29:50 -08:00
Seth Alves
3d7733219c
edit's open-asset-browser button works, again
2017-02-15 16:15:18 -08:00
Seth Alves
e030a4a518
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-15 15:20:14 -08:00
Seth Alves
33c1c3ac11
when a new particle-entity is created, hook the particle explorer to it
2017-02-15 15:19:49 -08:00
Seth Alves
076b0ed3ab
get particle explorer working, again
2017-02-15 15:00:25 -08: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
Seth Alves
3ea0f6d2d2
allow lasers to scroll tablet while in edit-mode
2017-02-15 11:34:48 -08:00
David Kelly
5184cbe615
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-15 12:08:55 -07:00
Seth Alves
a19bc31a78
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-15 10:51:22 -08:00
Seth Alves
792c7ff51f
PointerEvent will now relay keyboard modifiers
2017-02-15 10:41:56 -08: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
Seth Alves
219e569014
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-15 07:25:39 -08: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
