Seth Alves
31e0cfe296
Merge pull request #9825 from thoys/record-fixes
...
Avatar Recorder and Playback Fixes
2017-03-16 07:27:42 -08: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
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
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
Triplelexx
6971aeb081
additional reference information
2017-03-14 17:18:11 +00: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
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
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
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
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