Brad Hefta-Gaub
ae071aec0d
add a bunch more stats for avatar processing
2017-02-09 09:52:09 -08:00
samcake
c62108c3c8
Resolve merging conflict
2017-02-09 09:49:59 -08:00
Dante Ruiz
6bc685b02a
saving work
2017-02-09 07:13:29 -08:00
Dante Ruiz
5c5ace7c7b
goto in tablet
2017-02-09 07:13:29 -08:00
Seth Alves
2ec4f118fd
Merge pull request #9639 from hyperlogic/feature/tablet-pal
...
Ported PAL to tablet
2017-02-08 21:17:38 -08:00
Seth Alves
908df7ee8a
Merge pull request #9637 from thoys/FixHiddenCursorForBrowseAndSaveDialogs
...
Fix for hidden cursor while using Export Entities / Import Entities form
2017-02-08 19:42:33 -08:00
Brad Hefta-Gaub
41dc498888
add inView simulation stats
2017-02-08 18:32:39 -08:00
Anthony J. Thibault
090f632189
Pal: Moved keyboard tray to be flush with bottom of window.
2017-02-08 18:16:48 -08:00
Anthony J. Thibault
7cc3079328
Tightened up margins for the tablet.
2017-02-08 17:58:24 -08:00
Anthony J. Thibault
a209d0372a
First cut of pal on tablet.
2017-02-08 17:34:03 -08:00
Brad Hefta-Gaub
c2171ca08f
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats
...
Conflicts:
libraries/avatars/src/AvatarData.h
2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub
6c41a25032
more stats
2017-02-08 16:51:00 -08:00
Thijs Wenker
6957ac5f8b
Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread
2017-02-09 01:31:07 +01:00
Brad Hefta-Gaub
b399420190
CR
2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub
357cc052e1
first cut at simulation stats
2017-02-08 15:32:48 -08:00
Andrew Meadows
e02810458b
clear old avatarEntityData when saving settings
2017-02-08 14:14:48 -08:00
Brad Hefta-Gaub
07cf87749f
Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots
2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
89368afd68
add back accidentally removed line
2017-02-08 12:52:17 -08:00
Brad Hefta-Gaub
eedfc4fd38
fix various bot related bugs
2017-02-08 12:35:00 -08:00
samcake
363db8a834
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-08 11:52:18 -08:00
Andrew Meadows
cc301d1c1a
remove legacy empty avatarEntityData settings
2017-02-08 11:50:15 -08:00
mike
6cba2049dd
Made jumping easier on the Vive
2017-02-07 19:46:16 -08:00
Seth Alves
90fa8bf572
Merge pull request #9612 from druiz17/users
...
some tweaks to users and menus got tablet
2017-02-07 15:38:43 -08:00
Clément Brisset
eb0a316b6f
Merge pull request #9604 from hyperlogic/feature/allow-multiple-instances
...
Allow multiple instances to run if environment variable is set
2017-02-07 15:32:31 -08:00
samcake
2975f73fc9
merging
2017-02-07 13:13:21 -08:00
Dante Ruiz
27e1bd50d0
reworded text
2017-02-06 19:52:51 +00:00
Dante Ruiz
5ff91c018b
snapshot fix
2017-02-06 19:39:57 +00:00
samcake
9fd1d5114c
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
2017-02-06 10:16:41 -08:00
samcake
c864e57855
first pass on a working image class and the mip generation
2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed
avoid assertion on mac
2017-02-03 22:49:41 -08:00
Dante Ruiz
dd8f095bd8
minimize diff
2017-02-04 00:36:41 +00:00
Dante Ruiz
0c28776ea2
some tweaks to users and menus got tablet
2017-02-04 00:13:39 +00:00
Seth Alves
9f04a72a38
Merge pull request #9599 from hyperlogic/feature/tablet-ui-button-sort-order
...
tablet-ui: Added sortOrder property to buttons
2017-02-03 15:20:53 -08:00
Anthony J. Thibault
f8e6bd8c6b
Allow multiple instances to run if environment variable is set
...
If the environment variable HIFI_ALLOW_MULTIPLE_INSTANCES is present, the value is ignored,
then you can have multiple copies of interface running on the same machine.
2017-02-03 10:53:26 -08:00
Ryan Huffman
ce9f8bed1b
Remove duplicate fps/downloads PROFILE_COUNTER
2017-02-03 09:41:48 -08:00
Ryan Huffman
9d4fdfa38a
Add Test.profileRange
2017-02-03 09:19:10 -08:00
Ryan Huffman
e181c2a16e
Add script_udpate_rate to trace
2017-02-03 09:19:03 -08:00
Ryan Huffman
f2638637f7
Add thread names to traces
2017-02-03 09:18:58 -08:00
Chris Collins
bac5bd5c0e
Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
...
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony J. Thibault
85e01e3922
tablet-ui: Added sortOrder property to buttons
...
By default user created buttons will appear after system buttons.
2017-02-02 17:18:22 -08:00
Anthony J. Thibault
b44e5b5a1f
tablet-ui: preferences for tablet ui scaling
...
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00
Dante Ruiz
2cc1ee008d
added clicking sounds to tablet menus
2017-02-02 17:46:42 +00:00
Seth Alves
f907af1b9b
Merge pull request #9587 from hyperlogic/bug-fix/tablet-ui-network-2d-tablet
...
Tablet-ui: fix tablet orientation for users in 2d desktop mode
2017-02-01 20:17:40 -08:00
Anthony J. Thibault
de55a5dfe6
tablet-ui: reduced volume of button click
2017-02-01 18:47:50 -08:00
Anthony J. Thibault
9d124983a6
Tablet-ui: fix tablet orientation for users in 2d desktop mode
...
Double 180 flip. Once before to account for -z forward of camera.
Once after to account for avatar 180 flip.
2017-02-01 17:48:28 -08:00
Chris Collins
eabd41d0e9
Merge pull request #9579 from hyperlogic/bug-fix/tablet-ui-keyboard-focus
...
tablet-ui: Fix for keyboard focus
2017-02-01 15:26:02 -08:00
Anthony J. Thibault
2760065ee1
Bug fix for previous commit
2017-02-01 13:51:31 -08:00
Anthony J. Thibault
9be6fe2192
tablet-ui: Fix for keyboard focus box still being visible sometimes
2017-02-01 13:44:12 -08:00
Zach Fox
8b1161b0b0
Fix it
2017-02-01 12:32:30 -08:00
Anthony J. Thibault
ca79397ee8
tablet-ui: Fix for keyboard focus
...
Don't allow clicks on non-web entities from stealing focus away from web overlays.
2017-02-01 11:22:17 -08:00
Seth Alves
ab8be15ce0
Merge pull request #9570 from highfidelity/tablet-ui
...
Tablet ui
2017-02-01 09:38:13 -08:00
Anthony J. Thibault
8f362861eb
tablet-ui: button icon images now work with http urls.
2017-01-31 16:53:25 -08:00
Seth Alves
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Brad Hefta-Gaub
2fc6b4b0af
Merge pull request #9544 from humbletim/fix-rightclick-menu
...
Hide webview context menus when clicked
2017-01-31 13:03:50 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
b597f3e098
Merge pull request #9267 from AndrewMeadows/report-all-collision-events
...
fix for missed START collision events
2017-01-31 08:54:58 -08:00
Seth Alves
7d80679652
Merge pull request #9566 from sethalves/tablet-ui
...
Tablet ui
2017-01-31 05:03:51 -08:00
Seth Alves
39d195fce2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-31 05:02:07 -08:00
Alan Z
6e7260207f
Fix label typo in help graphic
...
fixes #2748 in Fogbugz
2017-01-30 16:51:22 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
Andrew Meadows
0809149a8c
harvest collision events before disowning
2017-01-30 13:21:23 -08:00
Anthony J. Thibault
39d68828ab
Disable FXAA on tablet overlay in desktop mode.
...
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.
Two new shaders were introduced.
simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf
These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Anthony J. Thibault
a9b478888c
First cut of Web3DOverlays without FXAA applied.
2017-01-30 11:24:58 -08:00
Seth Alves
ac475300f6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-30 08:15:29 -08:00
humbletim
8c0d7f9e28
hide context menu on item click
2017-01-28 14:37:49 -05:00
humbletim
8f4586b9b8
hide webview context menu when clicked
2017-01-28 10:46:50 -05:00
Zach Fox
5cba928540
Do it!
2017-01-27 16:30:59 -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
