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
cc4f4ac506
fix merge from upstream
2017-01-12 17:08:14 -08:00
Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
Brad Davis
659badd8bf
Change minimum threadpool size 1
2017-01-12 14:43:31 -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
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
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
b251dc9ed6
Tablet springboard can now be scrolled
2017-01-12 13:11:27 -08:00
Zach Fox
8e1a70891d
Checkpoint after cherry-picking from existing PR
2017-01-12 10:59:28 -08:00
Dante Ruiz
7d84aae670
closing tablet when taking snapshot
2017-01-12 17:29:38 +00:00
Brad Davis
2de83d42bc
Add process and system CPU usage to traces
2017-01-12 09:19:08 -08:00
Andrew Meadows
b3e336de3d
remove cruft: unused function arguments
2017-01-11 15:02:18 -08:00
Brad Davis
f235a52a6d
Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet
2017-01-11 14:21:29 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
Brad Davis
31f39d7eef
Allow scripts to inject tracing events
2017-01-10 14:06:39 -08:00
Anthony J. Thibault
3f0860f9c3
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c
Merge pull request #9343 from druiz17/menuApp
...
Moved the context menu to the tablet
2017-01-10 13:34:44 -08:00
Faye Li
07039897c6
New color scheme for audio bar
2017-01-10 11:41:16 -08:00
Anthony J. Thibault
9db6806026
In desktop mode, tablet is in front of camera.
...
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
to move the tablet appropriately.
There's a known bug with the tablet entity position lagging the camera by one frame.
2017-01-10 11:31:45 -08:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
Faye Li
c98a8168ee
uncheck "show meter level" by default
2017-01-10 09:53:55 -08:00
Dante Ruiz
2fc76d64fd
clean up unused code and files
2017-01-10 09:13:46 -08:00
Dante Ruiz
6705846518
clean up round 1
2017-01-10 09:13:46 -08:00
Dante Ruiz
6c51edec77
added context menu to tablet
2017-01-10 09:13:45 -08:00
Dante Ruiz
3fab901b49
commit chabges
2017-01-10 09:13:45 -08:00
druiz17
28c8d527df
Merge pull request #9340 from fayeli/tablet-hide-yellow
...
Ability to disable yellow highlight around Web Overlays
2017-01-10 09:11:51 -08:00
Faye Li Si Fi
93e4f9126f
disable drawing highlight if "showKeyboardFocusHighlight" flag is false
2017-01-09 11:01:15 -08:00
Anthony J. Thibault
6794ed7cc4
Merge remote-tracking branch 'upstream/master' into tablet-ui
2017-01-09 10:37:46 -08:00
Faye Li Si Fi
2fa17ea6a7
fix missing parenthesis
2017-01-09 10:23:31 -08:00
Chris Collins
30d5f70e11
Merge pull request #9278 from jherico/cpu_opt_scene
...
More low level optimizations
2017-01-09 10:10:40 -08:00
Faye Li Si Fi
d0d89e216d
Add showKeyboardFocusHighlight in constructor
2017-01-09 09:54:41 -08:00
Brad Hefta-Gaub
1a7b5ab520
Merge pull request #9326 from jherico/oculus_budget_stats
...
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 18:18:16 -08:00
Howard Stearns
b432ffa78d
Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction
...
Fix the PAL & Space Bubble interaction
2017-01-06 16:47:43 -08:00
Seth Alves
ad6175857d
Merge pull request #9328 from hyperlogic/tablet-ui
...
Allow Hifi.SoundEffect to be used in all qml
2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49
Allow Hifi.SoundEffect to be used in all qml
...
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Zach Fox
dec41f67cc
Fix bugs and generally fix behavior
2017-01-06 13:58:23 -08:00
Seth Alves
668bc35227
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge
2017-01-06 13:31:13 -08:00
Howard Stearns
36c99a604b
Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal
...
Edit button to select in pal
2017-01-06 13:17:29 -08:00
Brad Davis
15b9e750f9
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 10:51:26 -08:00
howard-stearns
2f5f53c8e4
cr
2017-01-06 10:28:09 -08:00
Atlante45
428a7f3bf8
Log Dialog doesn't float on top
2017-01-05 17:49:39 -08:00
Zach Fox
495925a017
This behavior was harder to change than expected...
2017-01-05 16:58:32 -08:00
Faye Li Si Fi
e7d14b9381
Adding new property "showKeyboardFocusHighlight" to Web3DOverlay
2017-01-05 16:49:55 -08:00
howard-stearns
f5c4535115
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 16:29:34 -08:00
Howard Stearns
3f54428744
Merge pull request #9313 from howard-stearns/pal
...
People Action List
2017-01-05 15:49:56 -08:00
Seth Alves
d072b1524a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-05 15:27:11 -08:00
