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
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
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
Brad Hefta-Gaub
5f3ee2e98f
add a basic tablet app for the audio scope
2017-03-10 17:08:54 -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
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
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
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
Dante Ruiz
2a275a4f4b
removed tab at the end of word
2017-03-09 00:15:02 +00: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
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
a67f8ac0ed
Merge pull request #9807 from Menithal/21166-remove-limit
...
#9761 Cloneable Improvement
2017-03-08 07:15:06 -08:00
Thijs Wenker
b21bd3afa9
Make the time and slider follow the record.js toolbar
2017-03-08 01:14:11 +01: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
Dante Ruiz
fc65723d68
corrected removing duplicate devices
2017-03-06 22:14:20 +00: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
Seth Alves
a2d2c41f02
remove debug print
2017-03-06 11:45:49 -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
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
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -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
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
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
Anthony J. Thibault
644e29a43d
disable WANT_STATE_DEBUG in handControllerGrab.js
2017-03-02 14:15:05 -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
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
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
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
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
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
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
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
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