Ryan Huffman
0da9f72c42
Update spawn position/rotation of bows in shortbow
2017-02-23 16:05:12 -08:00
Ryan Huffman
4c310e1048
Update shortbow to use spawner entities to specify position/rotation at runtime
2017-02-23 16:02:56 -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
Ryan Huffman
c8ec5cbf5d
Fix coding standard issues in shortbow
2017-02-23 13:15:14 -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
Anthony J. Thibault
84b29c6872
Reload all scripts when Debug defaultScripts.js is changed.
2017-02-23 11:02:25 -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
Anthony J. Thibault
83b3c12559
Removed Window.alert() because it was blocking the defaultScripts thread.
2017-02-23 10:28:16 -08:00
Anthony J. Thibault
1429a32928
Prevent use after free of ScriptEngine pointer when shutting down all scripts.
...
Before this change, if you were running with the Debug defaultScripts.js option on,
it could result in a dereference of a previously freed ScriptEngine pointer.
To prevent this, defaultScripts.js no longer explicitly calls ScriptDiscoveryService.stopScript() on
Script.scriptEnding.
2017-02-23 10:28:15 -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
Ryan Huffman
dd895dc04a
Fix js linting issues in shortbow
2017-02-22 16:49:22 -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
Brad Hefta-Gaub
7cc32f555e
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-22 12:03:52 -08:00
