Seth Alves
9de8144f0d
merge from upstream
2017-01-13 10:17:03 -08:00
Seth Alves
50ad0d881d
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-13 10:15:00 -08:00
Seth Alves
f9a36d68ad
Merge pull request #9363 from ctrlaltdavid/21127
...
Make Clara.io downloads convert textures to PNG
2017-01-13 10:14:43 -08:00
Seth Alves
bbff372097
Merge pull request #9377 from fayeli/tablet-menu-qml
...
Rework Context Menu QML to Be Suitable for Tablet
2017-01-13 09:59:57 -08:00
Seth Alves
481cc47f79
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-13 09:28:18 -08:00
Zach Fox
71f0e02210
Merge pull request #9373 from zfox23/PAL_ScrollbarRefinement
...
PAL: Scrollbar refinement & visual updates
2017-01-12 20:41:18 -08:00
Seth Alves
88f3ff7977
Merge pull request #9376 from hyperlogic/tablet-ui3
...
Prevent crash when closing the tablet while a sound is playing.
2017-01-12 18:17:53 -08:00
Seth Alves
2d17bb6067
Merge pull request #9375 from sethalves/tablet-ui-merge-from-master
...
Tablet ui merge from master
2017-01-12 18:17:40 -08:00
Faye Li Si Fi
834e3af879
checkbox margin and nav hover color
2017-01-12 18:12:13 -08:00
Faye Li Si Fi
10a82ac11f
update breadcrumb text as you navigate menus
2017-01-12 17:38:13 -08:00
Anthony J. Thibault
1b4146af6d
Prevent crash when closing the tablet while a sound is playing.
2017-01-12 17:23:06 -08:00
Seth Alves
cc4f4ac506
fix merge from upstream
2017-01-12 17:08:14 -08:00
Seth Alves
e9422cbf1e
fix model scales
2017-01-12 16:38:27 -08:00
Faye Li Si Fi
54eef26eaa
click breadcrumb text to go back to parent menu
2017-01-12 16:33:33 -08:00
Faye Li Si Fi
ef699db5be
nav bar menu now bring you back to menu root
2017-01-12 16:14:37 -08:00
Seth Alves
5fa379fea2
fix model scales
2017-01-12 16:12:43 -08:00
Faye Li Si Fi
99b6c6f1fd
menu icon and breadcrumb text
2017-01-12 15:47:02 -08:00
Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
samcake
90151b67c4
Merge pull request #9339 from jherico/min_threadpool
...
Reduce min threads in threadpool to 1
2017-01-12 15:37:17 -08:00
David Rowe
d7ab7316a8
Tidying
2017-01-13 12:28:53 +13:00
David Rowe
ad5822d96d
Fix first progress message box not closing
2017-01-13 12:26:42 +13:00
David Rowe
632989e031
Fix progress messages not displaying in HMD
2017-01-13 12:09:22 +13:00
Brad Davis
659badd8bf
Change minimum threadpool size 1
2017-01-12 14:43:31 -08:00
Faye Li Si Fi
41356f8b1d
make space for menu navigation bar
2017-01-12 14:36:33 -08:00
samcake
ca53235d54
Merge pull request #9358 from AndrewMeadows/model-cleanup
...
minor cleanup for Model rendering code
2017-01-12 14:30:16 -08:00
samcake
b9e8f7ee14
Merge pull request #9359 from jherico/cached_qml_surfaces
...
Eagerly cache QML surfaces for Web3D overlays
2017-01-12 14:28:35 -08:00
Seth Alves
b4870a14fa
Merge pull request #9372 from druiz17/removeHud
...
Completely removed HUD
2017-01-12 14:24:40 -08:00
David Rowe
6f2386eabd
Fix processing of Clara.io status messages
2017-01-13 11:20:00 +13:00
Zach Fox
b7e95a3486
Updates from Alan
2017-01-12 14:14:28 -08:00
Dante Ruiz
784548bb25
removed hud
2017-01-12 22:07:20 +00:00
Brad Davis
e8f6f3787b
Merge pull request #9364 from jherico/trace_cpu_usage
...
Add process and system CPU usage to traces
2017-01-12 13:50:29 -08:00
Seth Alves
9c148d2be0
Merge pull request #9370 from sethalves/tablet-ui-no-accidental-static-on-release
...
make sure dynamic things are moving at least a little upon release
2017-01-12 13:46:50 -08:00
Seth Alves
998cda6dd7
Merge pull request #9368 from hyperlogic/tablet-ui
...
Fixes for qt asserts in debug
2017-01-12 13:46:42 -08:00
Seth Alves
611a926894
if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet
2017-01-12 13:45:03 -08:00
Seth Alves
1a0a013edd
Merge pull request #9369 from hyperlogic/tablet-ui2
...
Tablet springboard can now be scrolled
2017-01-12 13:38:46 -08:00
Anthony J. Thibault
37804d1875
Fix for linux warning
2017-01-12 13:32:01 -08:00
Anthony J. Thibault
b251dc9ed6
Tablet springboard can now be scrolled
2017-01-12 13:11:27 -08:00
Faye Li Si Fi
f316505a05
context menu fill to fit tablet screen
2017-01-12 13:11:08 -08:00
Dante Ruiz
71083645e9
branch update
2017-01-12 20:51:25 +00:00
David Rowe
4dee0efdd3
Use more reliable Clara.io API parameters
2017-01-13 09:12:49 +13:00
Zach Fox
8e1a70891d
Checkpoint after cherry-picking from existing PR
2017-01-12 10:59:28 -08:00
Dante Ruiz
a16b229c65
begining to remove hud items
2017-01-12 10:49:45 -08:00
Anthony J. Thibault
cf138eb1fd
Fixes for qt asserts in debug
...
* The TabletScriptingInterface destructor is invoked on app shutdown after the logging system has been destroyed.
To avoid this I removed the destructor. The log was only for debug purposes anyway.
* Removed calls to setProperty() these calls are not thread safe and were causing asserts during debug.
Instead of getting and setting the property we maintain the TabletProxy state using an enum.
2017-01-12 10:49:41 -08:00
Seth Alves
6c2cae8749
Merge pull request #9365 from druiz17/tablet-update
...
close tablet when taking a snapshot
2017-01-12 10:36:15 -08:00
Howard Stearns
606e0c382d
Merge pull request #9337 from davidkelly/dk/letsHover
...
add hover effect to PAL
2017-01-12 10:14:28 -08:00
Seth Alves
0746d38cae
Merge pull request #9367 from sethalves/tablet-ui-avoid-hold-action-bootstrap
...
Tablet ui avoid hold action bootstrap
2017-01-12 10:14:01 -08:00
Seth Alves
a47aaea37a
don't bootstrap self with an avatar hold action
2017-01-12 10:12:45 -08:00
Brad Davis
01cdbb5721
Merge pull request #9334 from elmanytas/add_libssl_dev
...
Add dependency to Ubuntu documentation
2017-01-12 10:04:49 -08:00
Seth Alves
3805d22748
Merge pull request #9362 from hyperlogic/tablet-ui
...
Fix for rendering of tablet ModelEntity in desktop mode.
2017-01-12 10:01:59 -08:00
Dante Ruiz
7d84aae670
closing tablet when taking snapshot
2017-01-12 17:29:38 +00:00
