Seth Alves
37004e4347
steps toward making mouse work on tablet
2017-02-23 08:11:31 -08:00
Seth Alves
41ef7b8dbb
add setting to control if tablet is an entity or overlay
2017-02-22 21:13:42 -08: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
1b26c3469f
fix signed/unsigned joint index problem
2017-02-22 20:39:34 -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
Chris Collins
c967f9383a
Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements
...
Multi-core Avatar Mixer
2017-02-22 11:20:28 -08:00
Anthony J. Thibault
71b569a697
Bug-fix for crash on tablet when going from web -> home.
2017-02-22 10:22:12 -08:00
Seth Alves
a8de6c8c93
Merge pull request #9723 from hyperlogic/bug-fix/tablet-ui-reload-script-bug
...
Fix for system toolbar hiding when scripts are reloaded
2017-02-22 07:34:20 -08:00
Chris Collins
04d8c78089
Merge pull request #9707 from hyperlogic/bug-fix/mac-os-deadlock
...
MacOS: Fix for audio, toolbar and tablet.
2017-02-21 17:39:07 -08:00
Anthony J. Thibault
379b7bc56d
Fix for system toolbar hiding when scripts are reloaded
2017-02-21 17:24:22 -08:00
Brad Hefta-Gaub
97fc88491f
Merge pull request #9718 from AndrewMeadows/sort-avatars-correctly
...
fix sorting algorithm for avatar render updates
2017-02-21 16:14:12 -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
Chris Collins
c0f893fe82
Merge pull request #9699 from sethalves/overlays-uuid
...
Overlays uuid
2017-02-21 15:28:28 -08:00
Andrew Meadows
dd447689e0
expose avatar sort coefficients for fine tuning
2017-02-21 15:09:44 -08:00
Brad Hefta-Gaub
a526db1779
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-21 14:18:36 -08:00
Seth Alves
3b181eb803
code review
2017-02-21 13:56:28 -08:00
Seth Alves
8cf71ebc65
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-21 13:54:21 -08:00
Andrew Meadows
27dd82b517
fix sorting algorithm for avatar render updates
2017-02-21 13:34:07 -08:00
Stephen Birarda
10828d7534
Merge pull request #9692 from birarda/feat/es-get-children-parents
...
Give implicit access to family tree of server scripted entities in ESS
2017-02-21 13:17:46 -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
Stephen Birarda
3b996f2b7f
bump packet version for new JSON query options
2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub
ec8a95037d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-20 17:01:29 -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
70c9853189
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-20 12:38:13 -08:00
Seth Alves
4a650ff2bb
Overlays::getOverlayAtPoint was depending on the order in which the overlays were added
2017-02-19 18:37:35 -08:00
Brad Hefta-Gaub
fa0749b494
Merge pull request #9696 from ctrlaltdavid/21168
...
Add finger painting script
2017-02-19 11:37:25 -08:00
Brad Hefta-Gaub
942c5689fc
more comment cleanup
2017-02-18 14:09:47 -08:00
Brad Hefta-Gaub
73d64120df
removed dead comment
2017-02-18 14:08:03 -08:00
Brad Hefta-Gaub
bc858f82fc
fixed a FIXME comment
2017-02-18 14:07:20 -08:00
Brad Hefta-Gaub
2b79602220
debug cleanup
2017-02-18 13:14:14 -08:00
Brad Hefta-Gaub
e95e7f663c
more cleanup
2017-02-18 13:04:00 -08:00
Brad Hefta-Gaub
66a6666b52
more cleanup, improved stats, port throttling
2017-02-18 12:29:01 -08:00
Seth Alves
ea03f41b57
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-18 10:32:11 -08: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
Brad Hefta-Gaub
71af81851e
migrate to new style throttling
2017-02-17 22:20:32 -08:00
Brad Hefta-Gaub
42d916a719
fix warnings
2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub
d233430809
fix warnings
2017-02-17 21:58:35 -08:00
Brad Hefta-Gaub
4570b3439d
some cleanup
2017-02-17 21:38:30 -08:00
Brad Hefta-Gaub
c2c843d841
fix mac warnings
2017-02-17 21:05:02 -08:00
David Rowe
6827a28807
Fix grab position
2017-02-18 16:36:14 +13:00
Brad Hefta-Gaub
291b823cfa
const cleanup and fix crash
2017-02-17 18:28:07 -08:00
