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
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
Seth Alves
4a29cce584
adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled
2017-01-10 06:17:40 -08:00
samcake
8c7ec8b0c5
Add profiling in COntext batch execution and shortcuts for trace names
2017-01-09 18:05:02 -08:00
Seth Alves
35577f49d0
change the test for when MY_AVATAR collisions are short-circuited
2017-01-09 17:00:39 -08:00
Seth Alves
ad45bbf5ba
set DIRTY_COLLISION_GROUP flag when parentID changes
2017-01-09 16:45:54 -08:00
Seth Alves
45a26d599f
if something is a child of the local avatar, never let it collide with MY_AVATAR
2017-01-09 16:40:28 -08:00
Seth Alves
01ff3f14b6
re-evaluate an entities in-bullet status when parentID changes
2017-01-09 15:28:05 -08:00
Seth Alves
61f0c56a36
remove code that remembers previous state in userData
2017-01-09 14:20:03 -08:00
Faye Li Si Fi
32eda3a49c
redo
2017-01-09 14:02:14 -08:00
Faye Li Si Fi
c39eb6294e
undo
2017-01-09 14:01:59 -08:00
Faye Li Si Fi
5323e7f34d
set showKeyboardHighlight to false when initialising tablet
2017-01-09 13:36:58 -08:00
Ryan Huffman
39070fe0d1
Merge pull request #9065 from huffman/fix/script-engine-abuse
...
Fix deleteLater() vulnerability in scripts
2017-01-09 11:02:28 -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
Seth Alves
fa803aebe9
use /~/ style to reference includes
2017-01-09 10:21:07 -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
Seth Alves
25318156dc
Merge branch 'tablet-ui-grab-no-patch' of github.com:sethalves/hifi into tablet-ui-grab-no-patch
2017-01-09 10:10:32 -08:00
Faye Li Si Fi
d0d89e216d
Add showKeyboardFocusHighlight in constructor
2017-01-09 09:54:41 -08:00
