David Rowe
d986a45497
Merge branch '20805' into 20809
2016-02-23 09:59:39 +13:00
David Rowe
942406e5d5
Improve focus shadow
2016-02-23 09:58:37 +13:00
Ryan Huffman
e6ccf501fa
Merge pull request #7135 from zzmp/fix/grid
...
Update renderGrid to use a shader, and fix grid edit tools
2016-02-22 12:58:23 -08:00
Brad Hefta-Gaub
715355464f
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-02-22 12:52:56 -08:00
Zach Pomerantz
5bf9b8bc76
Set grid minor div min to 0.01
2016-02-22 11:59:15 -08:00
Howard Stearns
523b77328c
Merge pull request #7157 from ZappoMan/revertFlippedAudioChange
...
revert change that trusted Qt's claim that it supports the audio format
2016-02-22 11:37:54 -08:00
Brad Hefta-Gaub
bb1ed2147f
revert change that trusted Qt's claim that it supports the format
2016-02-22 11:22:03 -08:00
Brad Hefta-Gaub
e369c1f327
fix unix warning
2016-02-22 10:28:00 -08:00
Chris Collins
f24e4bc6b1
Merge pull request #7152 from sethalves/fix-touch
...
fix grab-script touch
2016-02-22 09:58:29 -08:00
Brad Hefta-Gaub
3f03678d02
add version of edit that sets reticle depth
2016-02-22 09:27:27 -08:00
Chris Collins
7074f72e6f
Merge pull request #7154 from ZappoMan/hmdHacking
...
various HMD fixes and improvements
2016-02-22 09:24:44 -08:00
Brad Hefta-Gaub
19d0968ccb
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
...
Conflicts:
interface/src/ui/ApplicationCompositor.h
2016-02-22 09:18:40 -08:00
David Rowe
42734a0202
Tidy desktop QML dialogs
2016-02-22 21:16:00 +13:00
David Rowe
72fb2ff102
Make copies of modal window files
2016-02-22 17:05:57 +13:00
David Rowe
26a46207c2
Set up QML tests for message box modal dialog restyling
2016-02-22 17:03:48 +13:00
David Rowe
ea247cd796
Fix information, question, and warning OffscreenUI message box icons
2016-02-22 14:08:00 +13:00
David Rowe
db6c76bf67
Merge branch 'master' into 20805
2016-02-22 13:15:40 +13:00
Brad Hefta-Gaub
cbe80bffd6
go into away mode if you the HMD loses mouse capture
2016-02-21 12:57:14 -08:00
Brad Hefta-Gaub
9f602a938d
don't move mouse on reset sensors
2016-02-21 12:42:02 -08:00
Brad Davis
f35c1694f7
Merge pull request #7133 from ZappoMan/hmdHacking
...
Working on making HMD mouse really work
2016-02-21 12:20:12 -08:00
Brad Hefta-Gaub
ba36eed9eb
whitespace fixes
2016-02-21 11:40:15 -08:00
Brad Hefta-Gaub
68771c92f7
change position to use mutex instead of atomic<>
2016-02-21 11:38:26 -08:00
Brad Hefta-Gaub
2c7c6be6a6
fix build buster
2016-02-21 10:40:11 -08:00
Brad Hefta-Gaub
a12446dab5
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-02-21 10:10:24 -08:00
Brad Hefta-Gaub
f41ebdf71d
CR feedback
2016-02-21 10:03:54 -08:00
Brad Hefta-Gaub
3e6cddede3
CR feedback
2016-02-21 10:03:51 -08:00
Brad Hefta-Gaub
dd558f0656
Merge pull request #7147 from jherico/too_many_webs
...
Too many (or too large) web views crash Interface
2016-02-21 10:03:16 -08:00
Brad Hefta-Gaub
32a7179c62
CR feedback
2016-02-21 09:59:19 -08:00
Seth Alves
5f79500e4d
fix grab-script touch
2016-02-21 09:37:43 -08:00
Brad Hefta-Gaub
1a4591db58
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
2016-02-21 09:30:41 -08:00
Brad Hefta-Gaub
31b895058b
depth reticle work
2016-02-21 09:30:26 -08:00
Brad Davis
4aec42893f
Merge pull request #7150 from thoys/smooth_particle_trail
...
Smooth particle trails
2016-02-20 20:19:43 -08:00
David Rowe
bfedd24ad7
Fixes after reviewing against latest UI Toolkit doc
2016-02-21 16:43:41 +13:00
David Rowe
558c8872b1
Rework scrollbar to make layout more robust
2016-02-21 14:02:51 +13:00
David Rowe
b2c74447fb
Fix OSX scrollbars in scripts lists starting too low
2016-02-21 12:44:29 +13:00
Thijs Wenker
58539171a3
give particle trails a nice smooth path between frames
2016-02-20 22:46:19 +01:00
Brad Davis
786747c2d7
Properly preserve and restore the GL context after building a web entity
2016-02-20 12:01:34 -08:00
Brad Hefta-Gaub
9c3abd3eb7
some cleanup and standardization in how headPose is gathered
2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub
9066fb0622
Merge pull request #7145 from howard-stearns/lod-pid-removal
...
Lod pid removal
2016-02-20 10:29:42 -08:00
Brad Hefta-Gaub
e6614fb9e5
Merge pull request #7141 from sethalves/fix-avatar-fade
...
Fix avatar fade
2016-02-20 10:26:07 -08:00
Brad Hefta-Gaub
db448c240f
Merge pull request #7122 from howard-stearns/audio-output-buffer
...
Audio output buffer
2016-02-20 09:40:06 -08:00
Brad Hefta-Gaub
28638f19e3
Merge pull request #7148 from hyperlogic/tony/smooth-vive-controllers
...
Vive: smoother updates for IK driven by vive controllers
2016-02-20 09:37:37 -08:00
Brad Hefta-Gaub
4e2c514eb1
fix mac warning
2016-02-19 18:27:25 -08:00
Brad Hefta-Gaub
04fa37324f
tweak to virtual desktop size, to make text more readable, 240d horz FOV
2016-02-19 18:24:32 -08:00
Brad Hefta-Gaub
2810be8787
fix scripts to use new API
2016-02-19 17:57:49 -08:00
Brad Hefta-Gaub
1fa6e294e7
allow mouse to move outside of the overlay extents
2016-02-19 17:49:33 -08:00
Zach Pomerantz
665ef17fce
Remove avatar usage from grid3d
2016-02-19 16:38:53 -08:00
David Rowe
91e4fb478d
Don't display dialog focus or content shadows on OSX
...
Alpha gradients display as fuchsia on OSX.
2016-02-20 13:12:51 +13:00
Anthony Thibault
942f2c13ab
Vive: smoother updates for IK driven by vive controllers
...
Before this PR the simulation rate was clamped to never exceed 60htz.
This had problems when waving the vive hand controllers in the world,
they would jitter. The simulation rate is now clamped to never exceed
120 htz. This has the effect of synchronizing the display and the
update rates to 90htz.
Also there are improvements to vive support if threaded present is
disabled.
2016-02-19 15:58:13 -08:00
Zach Pomerantz
c9362a4073
Set grid major div min to 1
2016-02-19 15:58:08 -08:00
