Bing Shearer
9ee64d114b
Sam's space.
2016-07-15 13:47:36 -07:00
Bing Shearer
4fb9d8801c
More coding standard fun!
2016-07-14 13:55:26 -07:00
Bing Shearer
9641ae8cd8
Coding standard fun!
2016-07-14 13:22:43 -07:00
Bing Shearer
be0446f9a9
Delete old logs if the sum size of those logs exceeds reasonable size.
2016-07-14 11:36:48 -07:00
Brad Hefta-Gaub
bcee128de0
Merge pull request #6959 from Triplelexx/20769
...
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
Seth Alves
52a7c8e032
Merge branch 'feature/grab-script-polish' of github.com:hyperlogic/hifi into refresh-feature/grab-script-polish
2016-07-11 10:09:07 -07:00
Clément Brisset
f7b3155178
Merge pull request #8213 from birarda/long-script-name
...
Interface changes for new Marketplace
2016-07-08 16:57:25 -07:00
Stephen Birarda
11aafc0f48
use endsWith for scriptURL check
2016-07-08 16:00:06 -07:00
Stephen Birarda
43967dc9a6
handle running of non .svo.json JSON files from mp CDN
2016-07-08 15:47:56 -07:00
Stephen Birarda
5bce924eda
keep signature for askToLoadScript
2016-07-08 14:34:42 -07:00
Anthony J. Thibault
9242147394
Merge branch 'master' into feature/grab-script-polish
2016-07-08 13:40:01 -07:00
Brad Hefta-Gaub
d78eb19e44
Merge pull request #8194 from jherico/glow_lines
...
Support for glowing 3D line overlays
2016-07-08 12:50:35 -07:00
Anthony J. Thibault
1ec3472230
Model overlay dimensions fixes
...
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
2016-07-08 11:36:43 -07:00
Stephen Birarda
216e47b29a
hide the long URL prefix of scripts from marketplace
2016-07-08 09:43:11 -07:00
Brad Davis
829a871d6f
Merge pull request #8208 from SamGondelman/qmlFixes
...
Fixed issues in Browser.qml and UpdateDialog.qml
2016-07-07 19:51:37 -07:00
Brad Hefta-Gaub
4c100ecc95
Merge pull request #8203 from jherico/zorder
...
Ensure newly shown windows are popped to the top of the zorder
2016-07-07 16:14:50 -07:00
SamGondelman
99fc472d77
fixed errors in Browser.qml and UpdateDialog.qml
2016-07-07 14:06:57 -07:00
Brad Davis
828be94089
Fix rendering of overlay spheres with alpha
2016-07-07 14:04:59 -07:00
Brad Davis
8ca3630cfa
Support glow effect in 3D line overlays
2016-07-07 13:36:48 -07:00
Brad Davis
23700dc90f
Ensure newly shown windows are popped to the top of the zorder
2016-07-07 13:16:59 -07:00
Ryan Huffman
d2fedee656
Add missing loading images for Asset Browser
2016-07-07 10:22:52 -07:00
Brad Hefta-Gaub
abcd1e0062
Merge pull request #8164 from SamGondelman/macHMDPreview
...
Added Mac preview image if VSync is enabled
2016-07-07 09:01:40 -07:00
SamGondelman
d05a27e0e6
embed image locally
2016-07-06 17:27:53 -07:00
Brad Hefta-Gaub
41a74f7652
Merge pull request #8193 from huffman/fix/model-overlay-dims
...
Fix model overlays not correctly scaling
2016-07-06 16:17:22 -07:00
Anthony J. Thibault
a07970f053
Fix for one-frame glitch when changing dimensions of a model entity.
...
This was due to Model::setScaleToFit being called on the script thread instead of the main thread.
2016-07-06 14:09:55 -07:00
Ryan Huffman
7d803b7513
Fix model overlays not correctly scaling
2016-07-06 11:54:39 -07:00
Brad Davis
d6250d4c5a
Fix export entities by region
2016-07-05 10:37:53 -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
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
