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
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
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
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
Anthony J. Thibault
26a5b5ed91
Fix for rendering of tablet ModelEntity in desktop mode.
...
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable. This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
2017-01-11 18:37:57 -08:00
Seth Alves
bf304a815a
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 10:48:03 -08:00
Seth Alves
c76987c179
Merge pull request #9351 from sethalves/tablet-ui-show-lasers-when-scrolling
...
update lasers when distance-scrolling a web entity/overlay
2017-01-11 10:45:25 -08:00
Seth Alves
bf1bd1d859
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 09:56:08 -08:00
Seth Alves
9be2f26407
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-11 09:55:58 -08:00
Seth Alves
493985ac2a
Merge pull request #9354 from sethalves/update-tablet-ui-again
...
Update tablet ui again
2017-01-11 09:55:46 -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
Seth Alves
2886d7f7a4
Merge pull request #9353 from druiz17/tabletPositionUpdate
...
updated tablet position
2017-01-11 09:52:57 -08:00
Dante Ruiz
2d8d5401dc
updated tablet position
2017-01-11 08:41:07 -08:00
samcake
8b45afecde
Merge pull request #9342 from jherico/trace_detail
...
More tracing support
2017-01-10 17:55:50 -08:00
Seth Alves
c93d83dadd
update lasers when distance-scrolling a web entity/overlay
2017-01-10 16:41:07 -08:00
Seth Alves
0c06832be4
Merge pull request #9350 from druiz17/hombutton2.0
...
Home button works with stylus
2017-01-10 15:38:34 -08:00
Dante Ruiz
0b3a7d90f1
removed committed code
2017-01-10 23:26:37 +00:00
Dante Ruiz
d0baa0e303
home button works with the stylus
2017-01-10 14:51:46 -08:00
druiz17
ad48e79053
Merge pull request #9346 from hyperlogic/tablet-ui
...
In desktop mode, tablet is in front of camera.
2017-01-10 14:48:15 -08:00
Zach Fox
0b574e170a
Merge pull request #9348 from howard-stearns/talking-glow-node
...
Talking glow node
2017-01-10 14:12:09 -08:00
druiz17
85c143e64d
Merge pull request #9347 from sethalves/tablet-ui-grab-no-patch
...
remember previous parentID in the script and try to put it back when releasing
2017-01-10 14:08:08 -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
howard-stearns
e67675ac36
color nodes by audio level
2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e
store audio level in overlay data object (so that they gc properly and we
...
have the data to color with).
2017-01-10 13:08:07 -08:00
Seth Alves
0fc1abc068
remember previous parentID in the script and try to put it back when releasing
2017-01-10 13:00:49 -08:00
Anthony Thibault
2d8fdd765c
Merge pull request #9345 from fayeli/audio-bar-improvements
...
Tablet Audio Bar Improvements
2017-01-10 12:49:21 -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
Brad Davis
7ce4277b4c
Merge pull request #9341 from samcake/blue
...
Add profiling in Context batch execution and shortcuts for trace names
2017-01-10 09:56:51 -08:00
Faye Li
c98a8168ee
uncheck "show meter level" by default
2017-01-10 09:53:55 -08:00
druiz17
96d7a568f0
Merge pull request #9344 from sethalves/tablet-ui-grab-no-patch
...
Tablet ui grab no patch
2017-01-10 09:42:03 -08:00
Seth Alves
bff9e9be38
put back code that replaces previous parentID on release
2017-01-10 09:22:36 -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
Dante Ruiz
c99f897db1
first commit
2017-01-10 09:13:45 -08:00
Seth Alves
eb4a2b0af5
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch
2017-01-10 09:13:34 -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
