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
|
6e9854cad0
|
don't crash if geometry fails to load
|
2017-02-24 13:01:01 -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 |
|
Howard Stearns
|
a9b8045697
|
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
Filter pal by view distance
|
2017-02-24 11:10:13 -08:00 |
|
Chris Collins
|
e723385df2
|
Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements
Avatar bandwidth budget improvements
|
2017-02-23 17:12:18 -08:00 |
|
Seth Alves
|
0a2a1b1637
|
include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet
|
2017-02-23 15:25:09 -08:00 |
|
Seth Alves
|
a286c72b3b
|
cleanups
|
2017-02-23 15:12:45 -08:00 |
|
Seth Alves
|
4600d546c0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-23 14:56:06 -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 |
|
Brad Hefta-Gaub
|
1b7ec7d61e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
Conflicts:
libraries/avatars/src/AvatarData.cpp
|
2017-02-23 13:50:16 -08:00 |
|
Brad Hefta-Gaub
|
1e91f74ce7
|
clean up some uneedded nullptr checks, make them asserts
|
2017-02-23 13:32:35 -08:00 |
|
Seth Alves
|
2c42309aaa
|
perfer tablet over other overlays for mouse-clicks
|
2017-02-23 13:32:24 -08:00 |
|
Andrew Meadows
|
ed932fead5
|
Merge pull request #9611 from kunalgosar/AvatarEntityMapMetaObj
Add QMetaObject for AvatarEntityMap
|
2017-02-23 13:27:55 -08:00 |
|
Brad Hefta-Gaub
|
8cb8d686ec
|
more cleanup and some CR feedback fixes
|
2017-02-23 13:09:39 -08:00 |
|
Chris Collins
|
57beeeefb9
|
Merge pull request #9739 from sethalves/stable-to-master-update
Stable -> Master update
|
2017-02-23 13:09:00 -08:00 |
|
Seth Alves
|
c765c8da73
|
pull stable into master
|
2017-02-23 11:57:32 -08:00 |
|
Brad Hefta-Gaub
|
f61e16fccf
|
more aggressive out of view data culling
|
2017-02-23 11:01:55 -08:00 |
|
kunalgosar
|
3af05ece7d
|
Made QScript Object more JS friendly
|
2017-02-23 10:57:06 -08:00 |
|
kunalgosar
|
99e51e88ae
|
Add QMetaObject for AvatarEntityMap
|
2017-02-23 10:57:06 -08:00 |
|
Seth Alves
|
84d9af14b0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-23 10:40:18 -08:00 |
|
Brad Hefta-Gaub
|
dde9640c66
|
remove old full rate distance code
|
2017-02-23 10:29:17 -08:00 |
|
Chris Collins
|
de84e07281
|
Merge pull request #9714 from thoys/fix-recorder-js-playback
Fix recorder.js playback in interface
|
2017-02-23 09:59:37 -08:00 |
|
Thijs Wenker
|
5033e7be11
|
CR fixes
|
2017-02-23 18:22:36 +01: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 |
|
Brad Hefta-Gaub
|
4f17498daf
|
fix warning
|
2017-02-23 00:19:06 -08:00 |
|
Brad Hefta-Gaub
|
d4adee8b38
|
add over bandwidth exit to sorted avatar loop
|
2017-02-23 00:15:07 -08:00 |
|
Brad Hefta-Gaub
|
40037bee55
|
added some stats for the random drops
|
2017-02-22 23:28:40 -08:00 |
|
Brad Hefta-Gaub
|
06f0087459
|
wire up radius properly
|
2017-02-22 22:36:37 -08:00 |
|
Brad Hefta-Gaub
|
edf7c016a1
|
more cleanup
|
2017-02-22 22:06:28 -08:00 |
|
Brad Hefta-Gaub
|
4c4506b1f7
|
some cleanup
|
2017-02-22 21:47:40 -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 |
|
Brad Hefta-Gaub
|
10f465f8ea
|
Merge pull request #8 from AndrewMeadows/avatarBandwidthBudgetImprovements
count avatar joint updates and non-updates
|
2017-02-22 17:53:15 -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 |
|
Andrew Meadows
|
6ac33dbf61
|
count avatar joint updates and non-updates
|
2017-02-22 17:23:36 -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
|
de3a0d3d0c
|
button styling
|
2017-02-22 13:02:05 -08:00 |
|
howard-stearns
|
023a32563c
|
work around .qml settings issues
|
2017-02-22 12:59:40 -08:00 |
|