James B. Pollack
ac99ec04d0
Merge remote-tracking branch 'upstream/master' into viveteleporter
2016-07-05 10:28:07 -07:00
Stephen Birarda
e784d7c400
Merge pull request #8170 from huffman/fix/multiple-sessions
...
Fix multiple sessions being created for some users
2016-07-01 16:41:56 -07:00
Ryan Downe Karpf
7eb07cba4c
Merge pull request #8171 from jherico/qml_fixes
...
Keyboard focus polish for Vive UI
2016-07-01 16:20:36 -07:00
howard-stearns
1ad9cfde99
make hud button participate in buttonState just like other toolbar
...
chicklets
2016-07-01 13:54:00 -07:00
howard-stearns
71c44f4f93
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-07-01 13:05:32 -07:00
howard-stearns
02cc6cc567
hover states
2016-07-01 12:18:26 -07:00
Sam Gondelman
af67d814eb
Merge pull request #8163 from ctrlaltdavid/20981
...
distinguish between file name and directory as prompt in file chooser
2016-07-01 10:39:32 -07:00
howard-stearns
43c7fd1e27
New art.
2016-07-01 10:34:13 -07:00
James B. Pollack
0c60d87d3b
fix some touch mappings
2016-07-01 10:32:37 -07:00
Sam Gondelman
a39376e490
Merge pull request #8174 from jherico/overlay_lighting
...
Don't render wire geometry with lighting effects
2016-07-01 10:03:19 -07:00
Brad Davis
5288d98376
Using pipelines properly where appropriate
2016-06-30 20:52:41 -07:00
howard-stearns
125f6d8b63
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-06-30 16:49:19 -07:00
James B. Pollack
3b57fd1faf
Merge pull request #8173 from SamGondelman/snapshotFix2
...
Fix snapshot dialog rendering
2016-06-30 16:48:43 -07:00
howard-stearns
f03f5f3e68
new icons
2016-06-30 16:47:10 -07:00
howard-stearns
b22844dc97
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-06-30 16:24:36 -07:00
howard-stearns
ff55644fe8
stateful hud toolbar buttons
2016-06-30 16:24:11 -07:00
Brad Davis
b7926b8582
Don't render wire geometry with lighting effects
2016-06-30 16:11:05 -07:00
SamGondelman
69ffd63ba7
fix snapshot sharing window
2016-06-30 15:42:48 -07:00
Brad Davis
167cb72a0e
Don't auto-focus the filter field in running scripts
2016-06-30 15:18:59 -07:00
Brad Davis
ce54f1b1d1
Improve desktop 'unfocus' functionality
2016-06-30 15:18:14 -07:00
Brad Davis
86f8b57841
Highlight controls based on activeFocus, not focus
2016-06-30 15:16:28 -07:00
Ryan Huffman
49da7d9a61
Remove sending of session id in request body in favor of header
2016-06-30 14:43:27 -07:00
Ryan Huffman
38776fe007
Fix multiple sessions being created for some users
...
If a user didn't have send-data activated they don't have their session id
sent in the header of requests, but instead send it inside the request
body. The session id being send in the request included curly braces which
the server considers invalid.
2016-06-30 14:35:27 -07:00
Brad Davis
7b0b56d793
Merge pull request #8157 from jherico/qml_fixes
...
HMD UI Fixes
2016-06-30 13:26:57 -07:00
David Rowe
759b3065fc
Distinguish between file name and directory as prompt in file chooser
2016-06-30 20:48:19 +12:00
Brad Davis
5a9be817df
PR comments
2016-06-29 10:28:55 -07:00
Brad Davis
962f9d5f22
Don't update the shown state of the tool window when it's already invisible
2016-06-28 18:10:06 -07:00
Brad Hefta-Gaub
ec0ca1d173
Merge pull request #8146 from huffman/fix/launch-version
...
Add version to launch user activity
2016-06-28 17:13:10 -07:00
Howard Stearns
da61100b6d
Merge pull request #8150 from highfidelity/vive-ui
...
merge vive-ui to master
2016-06-28 13:31:55 -07:00
Ryan Huffman
b36a39b2bc
Add version to launch user activity
2016-06-28 09:59:59 -07:00
Andrew Meadows
58e05b2e90
Merge pull request #8143 from AlexanderOtavka/remove-cam-slots
...
namechange Camera::_rotation --> Camera::_orientation
2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2
Merge pull request #8121 from SamGondelman/miniMirrorFix
...
Mini mirror/multi-monitor bug fixes
2016-06-27 22:04:39 -07:00
howard-stearns
68be819ea2
fix crash when hmd context menu triggers a modal
2016-06-27 14:07:13 -07:00
Zander Otavka
235ee4bd46
Refactor Camera scripting interface a little
...
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used. get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
2016-06-27 13:06:12 -07:00
Howard Stearns
de7738e644
Merge pull request #8134 from highfidelity/vive-ui
...
Vive UI bug fixes
2016-06-24 18:39:06 -07:00
Brad Davis
f90a351400
Don't reposition windows prior to selecting the initial display plugin
2016-06-24 16:31:24 -07:00
Sam Gondelman
3c809ef40c
Merge pull request #8123 from AlexanderOtavka/first-person-hmd
...
Automatically enter first person when in HMD mode
2016-06-24 15:58:38 -07:00
howard-stearns
9ae3c38616
doh!
2016-06-24 15:26:24 -07:00
howard-stearns
2ae0a7defc
If there are TWO conditions holding things back, weight for them both to
...
clear.
2016-06-24 14:46:46 -07:00
howard-stearns
7da854d98c
do not reset hud from button
2016-06-24 13:35:47 -07:00
Zander Otavka
dd023e16fd
Tabs -> spaces
2016-06-24 13:16:24 -07:00
Zander Otavka
d45694836f
Add signal for display mode change in HMD
2016-06-24 11:57:12 -07:00
Zander Otavka
41d38ab630
Revert "Automatically enter first person when in HMD mode"
...
This reverts commit 3c9f3f3927
2016-06-24 10:16:40 -07:00
Zander Otavka
88ad570024
Revert "Uses spaces, not tabs"
...
This reverts commit 7e5b9db13a
2016-06-24 10:16:26 -07:00
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51:15 -07:00
Zander Otavka
7e5b9db13a
Uses spaces, not tabs
2016-06-22 16:50:47 -07:00
Zander Otavka
3c9f3f3927
Automatically enter first person when in HMD mode
2016-06-22 16:22:14 -07:00
howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
SamGondelman
d4cfe6256a
don't render mini mirror if rendering fullscreen mirror
2016-06-22 14:46:08 -07:00
howard-stearns
d3735322a5
Whitespace.
2016-06-22 13:03:13 -07:00
