Brad Hefta-Gaub
2017ea4491
hacking on using sorted avatars for bandwidth budget
2017-02-21 14:18:00 -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
howard-stearns
aff44d682e
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 13:45:25 -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
howard-stearns
15d8041683
snapshot working, before button change
2017-02-21 13:14:45 -08:00
Thijs Wenker
72eb797910
remove unused encoder (was for testing)
2017-02-21 20:22:29 +01:00
Thijs Wenker
15518e9aa1
remove debugger line
2017-02-21 20:20:23 +01: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
Thijs Wenker
13b2b6086f
Fix recorder.js playback in interface
2017-02-21 19:47:26 +01:00
Stephen Birarda
3b996f2b7f
bump packet version for new JSON query options
2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub
06d78d488f
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-20 17:02:00 -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
598e79f697
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-19 13:29:37 -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
David Rowe
692fa52aca
Disable drawing pointer lasers while painting
2017-02-18 15:21:48 +13:00
David Rowe
2c02b42c96
Finger paint button icon files
2017-02-18 14:21:54 +13:00
Anthony J. Thibault
856a38af0c
Fix for audio, toolbar and tablet on macos.
2017-02-17 17:08:23 -08:00
Chris Collins
ec07969c0b
Merge pull request #9703 from kunalgosar/logDisplayMode
...
Logging HMD/Desktop Transitions
2017-02-17 17:07:02 -08:00
David Rowe
0689557ba5
Draw smoother lines
2017-02-18 13:39:59 +13:00
David Rowe
777a0b51c1
Ignore spurious finger tip position values
2017-02-18 13:35:16 +13:00
David Rowe
784009a9fa
Merge branch 'master' into 21168
2017-02-18 13:20:39 +13:00
Seth Alves
def669364b
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-17 15:45:19 -08:00
Seth Alves
d7bb6f105b
make tablet part IDs available through qApp
2017-02-17 15:43:20 -08:00
Seth Alves
f6bd21c483
Merge pull request #9694 from hyperlogic/feature/toolbar-tablet-switcheroo
...
By default, tablet icons will display on the toolbar in desktop mode.
2017-02-17 15:07:17 -08:00
kunalgosar
b8b5927351
Logging display mode changes
2017-02-17 13:21:01 -08:00
David Rowe
2c5782e4bb
Fix laser beam jumping upon grabbing entity
2017-02-18 09:11:04 +13:00
Seth Alves
47cdade1e9
fix home-button on tablet
2017-02-17 11:47:37 -08:00
Anthony J. Thibault
5963c6ddc3
Fix for toolbar visibility after snapshots.
2017-02-17 11:04:04 -08:00
Brad Hefta-Gaub
305e1ae1d2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-17 10:18:53 -08:00