Seth Alves
|
541692c5ca
|
start on scripting interface to allow saving polyvox meshes to obj files
|
2017-01-28 15:38:18 -08:00 |
|
Seth Alves
|
fa61bbe2a6
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-01-26 18:21:39 -08:00 |
|
ZappoMan
|
4c80422a73
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
|
2017-01-26 14:34:58 -08:00 |
|
Seth Alves
|
db38503d57
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-01-26 13:48:59 -08:00 |
|
samcake
|
19858bda78
|
Merge pull request #9493 from AndrewMeadows/otherAvatars
optimize, prioritize, and timebox processing of avatar updates
|
2017-01-26 13:30:51 -08:00 |
|
Seth Alves
|
0b51b1d566
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-01-26 11:00:02 -08:00 |
|
Brad Hefta-Gaub
|
5ada689ab7
|
Merge pull request #9497 from ctrlaltdavid/fix-clara-download
Fix intermittent Clara.io download crashes
|
2017-01-26 10:58:27 -08:00 |
|
Seth Alves
|
e2b1f4b2ab
|
include tablet fbx with interface distribution rather than get it from s3
|
2017-01-26 10:20:46 -08:00 |
|
Andrew Meadows
|
5783db910b
|
remove some unhelpful trace profiling data
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
82f52b9658
|
fix bug: Avatar instance not getting deleted
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
2264c29604
|
less magic
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
0f09e60acd
|
remove unhelpful comment
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
01e14eec47
|
remove commented out cruft
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
ac180758ad
|
sort, optimize, and timebox process avatar updates
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
d3dcc2b415
|
remove cruft: billboard option for Head::simulate()
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
887707426e
|
remove cruft: Head::getScalePivot()
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
69a7b1ef76
|
move some stuff out of Avatar::simulate()
call it explicity in AvatarManager::updateOtherAvatars()
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
b8afc87ad9
|
remove cruft
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
e65d9309b3
|
remove cruft: Avatar::setShouldDie()
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
e363423992
|
compute priority of avatar and sort before update
|
2017-01-26 08:35:26 -08:00 |
|
Andrew Meadows
|
88bf126168
|
remove old avatar culling and LOD logic
|
2017-01-26 08:35:25 -08:00 |
|
Andrew Meadows
|
08bba5f45f
|
add and remove some profile data points
|
2017-01-26 08:35:25 -08:00 |
|
ZappoMan
|
3c3dcbbbaa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
|
2017-01-26 08:20:03 -08:00 |
|
Anthony J. Thibault
|
5eb7849a80
|
Support for Window.geometryChanged signal.
|
2017-01-25 16:43:35 -08:00 |
|
Seth Alves
|
204652514e
|
fix some fallout from toolbar changes
|
2017-01-25 16:29:36 -08:00 |
|
Seth Alves
|
c317ba8054
|
merge from upstream
|
2017-01-25 15:57:53 -08:00 |
|
Seth Alves
|
f382b541c7
|
merge from upstream
|
2017-01-25 15:42:33 -08:00 |
|
Seth Alves
|
888d326783
|
Merge pull request #9509 from druiz17/tabletBug
removed more qml errors
|
2017-01-25 15:41:07 -08:00 |
|
Seth Alves
|
ff8d13ecc7
|
get button-states for toolbar buttons working again
|
2017-01-25 15:38:54 -08:00 |
|
Faye Li
|
49a8964c4e
|
reference new users icon art
|
2017-01-25 14:43:39 -08:00 |
|
Seth Alves
|
98f1664a46
|
use a setting to decide which UI is enabled
|
2017-01-25 14:17:45 -08:00 |
|
Dante Ruiz
|
6671d7f9e6
|
removed some unnessary menu item
|
2017-01-25 21:23:04 +00:00 |
|
Atlante45
|
f540c94113
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
|
2017-01-25 13:06:49 -08:00 |
|
Seth Alves
|
f18094f565
|
make use of tablet or HUD depend on a single variable. avoid some duplicated code
|
2017-01-25 12:00:34 -08:00 |
|
Dante Ruiz
|
0d7f15e41b
|
removed more qml errors
|
2017-01-25 18:22:28 +00:00 |
|
Seth Alves
|
7d370fb791
|
Merge pull request #9507 from cozza13/tablet-ui
Changes to tablet formatting
|
2017-01-25 09:29:16 -08:00 |
|
Dante Ruiz
|
096b2e876f
|
removing qml null print error
|
2017-01-25 08:00:40 -08:00 |
|
Chris Collins
|
df9bfa6eff
|
Changes to tablet formating
Changes to QML and .js formating to match style of mockup.
|
2017-01-25 07:41:04 -08:00 |
|
David Rowe
|
74b878a276
|
Fix threading of message box updates
|
2017-01-25 17:48:58 +13:00 |
|
Seth Alves
|
b679d94585
|
remove commented-out code
|
2017-01-24 16:04:22 -08:00 |
|
Seth Alves
|
827ae7ad4d
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
|
2017-01-24 15:50:12 -08:00 |
|
Seth Alves
|
601a35a9b6
|
try a different way of repairing tablet after a domain change
|
2017-01-24 15:49:49 -08:00 |
|
Seth Alves
|
990c7e6b28
|
Merge pull request #9498 from hyperlogic/tablet-ui
Added username to tablet header
|
2017-01-24 15:19:16 -08:00 |
|
Anthony J. Thibault
|
bff0eeef75
|
Added username to tablet header
|
2017-01-24 14:31:57 -08:00 |
|
Seth Alves
|
19cf84dd5d
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
|
2017-01-24 12:49:47 -08:00 |
|
Anthony J. Thibault
|
d2f024e84d
|
Fix for "ReferenceError: globalPosition is not defined" warning
|
2017-01-24 11:40:20 -08:00 |
|
Seth Alves
|
df9bc91f01
|
fix near-grab to equip handoff
|
2017-01-24 11:39:26 -08:00 |
|
Seth Alves
|
4de0b94b6c
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
|
2017-01-24 09:42:20 -08:00 |
|
Seth Alves
|
a28becfb1a
|
close tablet before changing domains
|
2017-01-24 09:42:12 -08:00 |
|
Anthony J. Thibault
|
432bb27119
|
The tablet Help button should be active if window is visible
|
2017-01-23 18:37:08 -08:00 |
|