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
Seth Alves
f18094f565
make use of tablet or HUD depend on a single variable. avoid some duplicated code
2017-01-25 12:00:34 -08:00
Dante Ruiz
0d7f15e41b
removed more qml errors
2017-01-25 18:22:28 +00:00
Seth Alves
7d370fb791
Merge pull request #9507 from cozza13/tablet-ui
...
Changes to tablet formatting
2017-01-25 09:29:16 -08:00
Dante Ruiz
096b2e876f
removing qml null print error
2017-01-25 08:00:40 -08:00
Chris Collins
df9bfa6eff
Changes to tablet formating
...
Changes to QML and .js formating to match style of mockup.
2017-01-25 07:41:04 -08:00
David Rowe
74b878a276
Fix threading of message box updates
2017-01-25 17:48:58 +13:00
Seth Alves
b679d94585
remove commented-out code
2017-01-24 16:04:22 -08:00
Seth Alves
827ae7ad4d
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 15:50:12 -08:00
Seth Alves
601a35a9b6
try a different way of repairing tablet after a domain change
2017-01-24 15:49:49 -08:00
Seth Alves
990c7e6b28
Merge pull request #9498 from hyperlogic/tablet-ui
...
Added username to tablet header
2017-01-24 15:19:16 -08:00
Anthony J. Thibault
bff0eeef75
Added username to tablet header
2017-01-24 14:31:57 -08:00
Seth Alves
19cf84dd5d
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 12:49:47 -08:00
Anthony J. Thibault
d2f024e84d
Fix for "ReferenceError: globalPosition is not defined" warning
2017-01-24 11:40:20 -08:00
Seth Alves
df9bc91f01
fix near-grab to equip handoff
2017-01-24 11:39:26 -08:00
Seth Alves
4de0b94b6c
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 09:42:20 -08:00
Seth Alves
a28becfb1a
close tablet before changing domains
2017-01-24 09:42:12 -08:00
Anthony J. Thibault
432bb27119
The tablet Help button should be active if window is visible
2017-01-23 18:37:08 -08:00
Seth Alves
353b38286a
Merge pull request #9490 from hyperlogic/tablet-ui
...
For for Tablet Tilt and Oculus Touch A B buttons sending UINav events
2017-01-23 18:14:53 -08:00
Anthony J. Thibault
0ab956a0c1
A and B buttons on oculus touch no longer trigger UI Nav events
2017-01-23 17:08:25 -08:00
Seth Alves
281b7a6eca
close tablet anytime AddressManager::hostChanged fires
2017-01-23 16:49:05 -08:00
Seth Alves
69252deb2e
close the tablet when going to a new domain
2017-01-23 16:28:56 -08:00
Seth Alves
200105c856
Merge pull request #9484 from hyperlogic/tablet-ui
...
UI navigation work with game pads
2017-01-23 16:01:45 -08:00
Anthony J. Thibault
584a9a3c98
UI navigation work with game pads
...
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active. Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
2017-01-23 15:22:49 -08:00
ZappoMan
81b5a3c585
more cleanup
2017-01-23 15:12:54 -08:00
Seth Alves
cdb14e7662
put name of button-click file back
2017-01-23 13:55:11 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
ZappoMan
292d472a59
checkpoint - got first cut at distance based rotation tolerance working
2017-01-23 13:06:29 -08:00
Seth Alves
702aba9646
use a softer button-click sound
2017-01-23 10:13:45 -08:00
Seth Alves
be8bc9652b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 09:44:04 -08:00
Ryan Huffman
9b1cd52fb4
Add the ability to get the context that a script is running in
2017-01-23 08:58:01 -08:00
Seth Alves
e96a3d4bcb
try another click sound
2017-01-20 14:50:24 -08:00
samcake
afd3c3b504
Merge pull request #9436 from AndrewMeadows/cauterization-cleanup
...
Cleanup of code that decides not to render head when in first-person
2017-01-20 14:49:08 -08:00
Zach Fox
11a57efafb
Fix it!
2017-01-20 13:44:29 -08:00
Seth Alves
dfa949f2d8
switch to new click sound
2017-01-20 13:35:41 -08:00
Atlante45
04e81c5db7
Fix interface build
2017-01-20 10:53:57 -08:00
Seth Alves
6641f9bafd
Merge pull request #9444 from druiz17/homeButtonFix
...
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Stephen Birarda
25bd6fa2c1
move recording interface to Agent/Application only
2017-01-20 10:27:08 -08:00
Zach Fox
8f3c4794c6
Comments
2017-01-20 10:24:52 -08:00
Zach Fox
9c9206acc0
Prevent logspam
2017-01-20 10:24:51 -08:00
Zach Fox
c83cd4a94a
Complex checkpoint
2017-01-20 10:24:51 -08:00
Seth Alves
c492319be2
merge from upstream
2017-01-20 10:14:11 -08:00
Ryan Downe Karpf
03851d4188
Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
...
Some initial analytics for PAL usage
2017-01-20 08:30:46 -08:00
David Kelly
5adc2cc593
Couple improvements
...
Only send one message when gain is changed. Eliminated the bool and
now just sending un-personalMute, etc...
2017-01-19 17:22:39 -08:00
Dante Ruiz
a319db3cb4
removed duplicate code
2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc
comparing with ID instead of strings
2017-01-19 16:38:55 -08:00
Andrew Meadows
10cdea9cd8
cleanup model fade logic
2017-01-19 14:17:50 -08:00
Seth Alves
47b59ffae3
don't save tablet to Settings when logging out or switching domains
2017-01-19 14:10:48 -08:00
Zach Fox
64ef3d5665
Merge pull request #9426 from zfox23/PAL_AdminLabel
...
PAL: Admin Labels, Updated Letterboxes
2017-01-19 13:48:05 -08:00
Andrew Meadows
9631864ae2
make soft attachments cauterized for MyAvatar
2017-01-19 12:56:07 -08:00
Andrew Meadows
5a2e337758
fix comments
2017-01-19 12:56:07 -08:00
Andrew Meadows
bfbef91f53
re-enable cauterization of meshes for MyAvatar
2017-01-19 12:56:07 -08:00
Andrew Meadows
1a3fa84985
add newline at EOF
2017-01-19 12:56:07 -08:00
Andrew Meadows
189da81bb1
fix for crash on unloaded model
2017-01-19 12:56:07 -08:00
Andrew Meadows
3dd8fd838b
move cauterization out of Model class
2017-01-19 12:56:07 -08:00
David Kelly
d9fbf832e2
Some initial analytics for PAL usage
2017-01-19 11:35:17 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
Brad Davis
70de00c6bf
Merge pull request #9421 from jherico/more_trace_details
...
Additional trace details for GPU timing, frame data updates
2017-01-19 09:12:34 -08:00
Dante Ruiz
342a6c67fb
menu checkable button fix
2017-01-19 08:12:49 -08:00
Dante Ruiz
30b57b62da
toggle help
2017-01-19 08:12:49 -08:00
samcake
05304c72e0
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-18 17:00:20 -08:00
Seth Alves
7c938728e5
don't do constant haptics if stylus touches tablet frame. home button triggers only once per click
2017-01-18 16:56:39 -08:00
Brad Davis
1ef4ac9a6c
Additional trace details for GPU timing, frame data updates
2017-01-18 16:19:32 -08:00
Seth Alves
c4d85c91d0
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 15:51:54 -08:00
Seth Alves
3517daaad2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 15:49:12 -08:00
Anthony J. Thibault
bcd94203e6
Raised min fps of tablet overlay for smoother scrolling
2017-01-18 15:32:39 -08:00
Seth Alves
c6d0c0909e
avoid unthreadsafe use of getJointIndex
2017-01-18 14:54:38 -08:00
Zach Fox
7f57251a0e
Remove logs also removed in Master
2017-01-18 13:38:19 -08:00
David Kelly
3b70fa08a3
Merge pull request #9417 from davidkelly/dk/palLogSpam
...
Removing some PAL-related interface log spam
2017-01-18 13:20:57 -08:00
Zach Fox
f8dd7f5433
Cleanup
2017-01-18 12:55:25 -08:00
Zach Fox
e9d3c36873
Final commit?
2017-01-18 12:55:25 -08:00
Zach Fox
d067ba7dcc
Alan's feedback
2017-01-18 12:55:24 -08:00
Zach Fox
9d19aa3c79
Checkpoint
2017-01-18 12:55:24 -08:00
Zach Fox
202d4e8107
Checkpoint
2017-01-18 12:55:24 -08:00
Zach Fox
346cfbfe02
First checkpoint
2017-01-18 12:55:24 -08:00
Ryan Huffman
8137c59ef7
Add support for sending requests to entity script server
2017-01-18 11:15:29 -08:00
Dante Ruiz
0f3ac2831e
fix tablet menu selection issue
2017-01-18 17:20:42 +00:00
Dante Ruiz
1c13f538f7
removed debug output
2017-01-18 17:08:13 +00:00
Dante Ruiz
fa3bea52cd
fixed bug with menu
2017-01-18 16:45:27 +00:00
Dante Ruiz
baff07b0f9
controller with menus finally work
2017-01-18 07:41:25 -08:00
Dante Ruiz
9a61b6030b
tabletFocus update
2017-01-18 07:40:15 -08:00
Dante Ruiz
d3fa7651c9
some what working d-pad
2017-01-18 07:40:15 -08:00
dante ruiz
865a78a8c8
saving work
2017-01-18 07:40:14 -08:00
Seth Alves
b57803057d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 06:38:44 -08:00
Seth Alves
0abb41ca2d
Merge pull request #9413 from hyperlogic/tablet-ui
...
clara.io marketplace works on tablet
2017-01-18 06:37:55 -08:00
Brad Davis
cbc89e77ab
Consume fewer resources in AssetServer when interface is running locally
2017-01-17 18:15:39 -08:00
David Kelly
f5300d3862
Removing some PAL-related interface log spam
...
Probably more, but these _seem_ to be the worst
2017-01-17 17:06:18 -08:00
Faye Li Si Fi
d7209ef7f7
syntax
2017-01-17 16:56:54 -08:00
Faye Li Si Fi
42a96a94b4
fix
2017-01-17 16:54:40 -08:00
Faye Li Si Fi
126bfba512
fix tablet menu scrolling issue
2017-01-17 16:40:12 -08:00
Zach Fox
7a568ed8a7
Merge pull request #9401 from zfox23/PAL_DisplayName
...
PAL: Editable Display Names & Immediate Update
2017-01-17 16:00:41 -08:00
Anthony J. Thibault
56fc42a2bd
clara.io marketplace works on tablet
2017-01-17 15:38:44 -08:00
samcake
246dcbd0c0
Removing the warning
2017-01-17 15:01:27 -08:00
Zach Fox
59ff970d5b
CR feedback
2017-01-17 15:01:02 -08:00
Seth Alves
c8382e6853
Merge pull request #9412 from fayeli/menu-fix
...
Fixes for Tablet Menu Issues
2017-01-17 14:58:47 -08:00
David Kelly
341ac685e9
Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists
...
remove ignored avatars from PAL when they disconnect
2017-01-17 14:21:36 -08:00
Seth Alves
be165b567e
remove XXX comments
2017-01-17 13:32:58 -08:00
Seth Alves
e76f1c5937
if another avatar has something hung from their camera, don't act like their camera is my camera
2017-01-17 13:28:13 -08:00
Faye Li Si Fi
20ac96a7f9
fix clicking on checkboxes in menus or on ghosted menu items slides in a blank page
2017-01-17 12:29:38 -08:00
David Kelly
9b1aaf3bfe
CR feedback
2017-01-17 12:09:47 -08:00
Faye Li Si Fi
965f9ab0a7
fix tapping menu when already at the top-level menu blanks the tablet
2017-01-17 11:58:48 -08:00
Stephen Birarda
1e04aebb8d
add --fast-hearbeat command line switch for 1s stats
2017-01-17 11:25:40 -08:00
samcake
69f9053e61
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-17 10:55:10 -08:00
David Kelly
2460e89a57
CR feedback
2017-01-17 09:53:04 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
David Kelly
6c701bb0f0
remove ignored avatars from PAL when they disconnect
2017-01-16 18:22:53 -08:00
Seth Alves
f900629cdb
Merge pull request #9390 from sethalves/load-models-in-keyhole
...
fix physics not starting up when a model is close behind
2017-01-16 18:06:23 -08:00
samcake
83d1c3ad01
Adding support for the meta rendering
2017-01-16 17:47:58 -08:00
Zach Fox
3b56f46206
Style changes
2017-01-16 13:18:24 -08:00
Zach Fox
32e330320e
Cleanup after rebase
2017-01-16 11:26:57 -08:00
Stephen Birarda
1993e358d6
Merge pull request #9318 from birarda/ovr-platform-entitlement
...
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
Zach Fox
2f176f50fa
Another checkpoint
2017-01-16 10:44:54 -08:00
Zach Fox
6e4a4da92a
Checkpoint
2017-01-16 10:42:29 -08:00
Zach Fox
117e302b2a
First pass
2017-01-16 10:39:11 -08:00
Zach Fox
d2c7342a62
Merge pull request #9352 from zfox23/PerAvatarVolume
...
PAL: Per-Avatar Volume Slider; visual tweaks
2017-01-16 10:34:31 -08:00
Seth Alves
bd67715cd2
don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed
2017-01-16 08:54:56 -08:00
Chris Collins
2557c797af
Merge pull request #9300 from zzmp/graphics/forward-opaque
...
Add opaques/skinned to forward rendering path
2017-01-16 08:48:18 -08:00
Seth Alves
756d96c368
fix search ray getting left on. started adding stylus models
2017-01-16 07:46:12 -08:00
ZappoMan
c9c311e275
checkpoint for distance joints
2017-01-15 11:47:48 -08:00
Seth Alves
36fdaa6350
avoid a little pop when grabbing something with ignore-ik as true
2017-01-15 10:10:54 -08:00
ZappoMan
c884b276e2
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-14 22:15:22 -08:00
Zach Fox
a5343d9aa9
Final tweaks before PR!
2017-01-13 17:20:29 -08:00
Zach Fox
a89868dcad
Make sliders appear only when row is selected
2017-01-13 15:41:17 -08:00
Zach Fox
8343769352
NameCard improvements & user feedback
2017-01-13 15:25:07 -08:00
Zach Fox
a69a10b8e4
Cleanup after rebase
2017-01-13 13:15:01 -08:00
Zach Fox
a9226e303c
Pull out visual changess & move them to other PR
2017-01-13 13:00:23 -08:00
Zach Fox
b0b6aeac6c
Ken's feedback
2017-01-13 13:00:03 -08:00
Zach Fox
b9cddc31a9
Checkpoint before implementing Ken's suggestions
2017-01-13 13:00:03 -08:00
Zach Fox
503468e49b
Style changes
2017-01-13 12:59:23 -08:00
Zach Fox
dcff873cd4
Modify slider function
2017-01-13 12:57:35 -08:00
Zach Fox
8bb200902f
First pass
2017-01-13 12:57:35 -08:00
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
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
ZappoMan
aed1b69ee0
make the avatar bounding box be avatar local and only change when it actually changes
2017-01-12 17:19:06 -08:00
Seth Alves
cc4f4ac506
fix merge from upstream
2017-01-12 17:08:14 -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
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
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
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
Faye Li Si Fi
f316505a05
context menu fill to fit tablet screen
2017-01-12 13:11:08 -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
David Rowe
8cd7e1b377
Improve user messages
2017-01-12 15:48:25 +13:00
David Rowe
b41f8c754d
Add updateable message box to JavaScript API
2017-01-12 15:46:53 +13: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
ZappoMan
5b76eaaf52
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-11 10:22:14 -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
ZappoMan
13198fd949
add datarate
2017-01-09 13:57:59 -08:00
ZappoMan
636ade9eb7
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 11:29:54 -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
Brad Hefta-Gaub
ef7b9bfde0
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 10:07:05 -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
howard-stearns
ef02c84759
further simplification of letterbox, and use for selection failures
2017-01-05 14:46:32 -08:00
howard-stearns
0cdeac8736
abstract out letterbox message
2017-01-05 14:32:31 -08:00
Stephen Birarda
46086cdcce
set the OCULUS_STORE property with oculus store arg
2017-01-05 14:02:35 -08:00
howard-stearns
0670a4689f
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 13:57:44 -08:00
Anthony J. Thibault
7198cd13b5
added button click wav
2017-01-05 13:56:04 -08:00
Anthony J. Thibault
85de0d3bbf
Added local only spatialized button click sounds to tablet
2017-01-05 13:54:06 -08:00
Howard Stearns
bbf7d16537
process consistent select message
2017-01-05 13:45:03 -08:00
Howard Stearns
28326ff47a
Merge pull request #9306 from zfox23/PALVisualUpdates
...
Fix PAL scrollbar; add helper popup to ADMIN tab
2017-01-05 13:29:21 -08:00
howard-stearns
47aa1e4f8e
add pal to defaultScripts
2017-01-05 12:23:17 -08:00
Zach Fox
b5713656be
Minor language changes on Admin help text
2017-01-05 09:27:12 -08:00
Brad Hefta-Gaub
acca9dbe87
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Brad Hefta-Gaub
368f48f0a7
Merge pull request #9247 from huffman/feat/tutorial-touch-grip
...
Add support for new Touch grip mappings to tutorial
2017-01-04 17:58:05 -08:00
Clément Brisset
e34ecac843
Merge pull request #9299 from Atlante45/settings
...
Fix settings hitch
2017-01-04 17:19:44 -08:00
howard-stearns
9709bedca7
checkpoint
2017-01-04 16:55:58 -08:00
Zach Fox
0c77ff2556
Fix silly quotation bug
2017-01-04 16:28:23 -08:00
Zach Fox
083bf95917
Fix PAL scrollbar; add helper popup to ADMIN tab
2017-01-04 16:25:13 -08:00
Brad Hefta-Gaub
f9ca41e89c
Merge pull request #9302 from jherico/expose_dropped_count
...
Expose dropped frames count to stats UI
2017-01-04 16:12:35 -08:00
Howard Stearns
3d8da683db
Merge pull request #9290 from zfox23/PersonalMute
...
Personal mute; Quasi-ignore; Reversible PAL actions
2017-01-04 14:37:09 -08:00
Zach Fox
675159be45
Last commit to fix final bugs
2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4
Bugfix re: population; remove user image for now
2017-01-04 14:06:51 -08:00
Zach Fox
c695878025
Clear local ignored list upon domain change
2017-01-04 13:31:16 -08:00
Brad Davis
3f2fdd1915
Expose dropped frames count to stats UI
2017-01-04 13:20:58 -08:00
Zach Fox
dde5f69ac9
More CR & simplifications
2017-01-04 12:41:30 -08:00
Faye Li Si Fi
32bc73dad3
added activeText and activeIcon properties in QML
2017-01-04 12:20:41 -08:00
Atlante45
56a25dfdee
Check setting value changed
2017-01-04 11:56:24 -08:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Anthony J. Thibault
e4a08709c6
Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui
2017-01-03 16:23:57 -08:00
Anthony Thibault
9502a8b0c4
Merge pull request #9294 from fayeli/tablet-mic-level
...
Audio level calculation in tabletUI.js
2017-01-03 16:12:04 -08:00
Zach Fox
899dd21328
Lots of CR feedback
2017-01-03 15:43:30 -08:00
Anthony J. Thibault
3c2f9acd39
Hooked up EventBridge to TabletScriptingInterface.
2017-01-03 15:43:21 -08:00
Brad Hefta-Gaub
60d48bcd49
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-03 14:42:59 -08:00
Faye Li
68aacfe544
added "updateAudioBar" function signature in header file
2017-01-03 12:38:23 -08:00
Zach Pomerantz
01cf48807c
change Render.RenderForwardTask to Render.Forward
2017-01-03 14:47:48 -05:00
Faye Li
7e1b06efdc
slot function in QML
2017-01-03 11:15:28 -08:00
Zach Pomerantz
26cfc83e20
Merge branch 'master' into graphics/fetch-cull-sort
2017-01-03 14:04:39 -05:00
Anthony Thibault
c201b6a7f9
Merge pull request #9256 from druiz17/moreButtons
...
all hub button now on tablet
2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Zach Fox
4a21eaa33f
Cleanup before PR
2016-12-30 15:18:01 -08:00
Zach Fox
951db2e2da
Bugs fixed!
2016-12-30 15:12:17 -08:00