Commit graph

16076 commits

Author SHA1 Message Date
Stephen Birarda
969244927b use extension for entity add for drag and drop upload 2016-03-08 13:09:20 -08:00
Stephen Birarda
28af9c51e6 add a missing parenthesis 2016-03-08 12:22:13 -08:00
Stephen Birarda
8fa32e75b2 client side fixes for upload with no extension 2016-03-08 12:19:15 -08:00
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Brad Hefta-Gaub
50eb07d465 Merge pull request #7221 from jherico/threaded_compositing2
Migrate composition of the overlay and pointer to the present thread
2016-03-08 10:22:02 -08:00
Brad Hefta-Gaub
ed67ef8f14 Merge pull request #7247 from jherico/qml_script_messaging
Allow message passing from a script to a QML window
2016-03-08 10:21:09 -08:00
James B. Pollack
2e9ebfb178 remove avatar head and body from pacakage model selections 2016-03-07 21:03:11 -08:00
Brad Davis
8988dd9771 Fix mouse drag turning 2016-03-07 17:14:44 -08:00
Brad Davis
634f8fbc83 Fix texture leak 2016-03-07 17:14:43 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Philip Rosedale
7c765f3d5a Merge pull request #7258 from hyperlogic/tony/better-lean-detection
MyAvatar: use a box instead of a sphere for horizontal re-centering
2016-03-07 15:05:10 -08:00
Seth Alves
34a76f1962 Merge pull request #7265 from ctrlaltdavid/fix-treeview
Fix Running Script's tree view
2016-03-07 14:03:50 -08:00
Stephen Birarda
267ed3af82 remove client side handling of extension for ATP hash URLs 2016-03-07 13:57:02 -08:00
David Rowe
e6b81b31d8 Fix Running Script's tree view 2016-03-08 09:59:00 +13:00
Chris Collins
7850ca3576 Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes
Avatar eye look at fixes for HMD and desktop
2016-03-07 11:50:16 -08:00
Anthony Thibault
2cbb41fd38 MyAvatar: bug fix for forward/backward lean detection 2016-03-07 10:11:22 -08:00
Anthony J. Thibault
aefeff2493 MyAvatar: Use a box instead of a sphere for horizontal re-centering 2016-03-07 09:50:38 -08:00
Philip Rosedale
ee3e0fcc38 Merge pull request #7238 from hyperlogic/tony/hmd-follow-work
MyAvatar: Improved body recentering for room scale
2016-03-04 15:51:07 -08:00
Anthony Thibault
0de19d13c4 MyAvatar: open up horizontal leaning threshold 2016-03-04 15:28:38 -08:00
Brad Hefta-Gaub
30bcb04a2f Merge pull request #7149 from jherico/overlays_qml
Make Overlay API usable from QML
2016-03-04 15:00:45 -08:00
Brad Davis
468cb05571 Merge pull request #7231 from ctrlaltdavid/20812
Restyle settings dialogs
2016-03-04 14:33:21 -08:00
David Rowe
b4c489d4c6 Fix not reliably being able to select "None" in Graphics settings 2016-03-05 10:17:39 +13:00
Brad Davis
4e1f78b585 Allow message passing from a script to a QML window 2016-03-04 13:11:08 -08:00
Anthony Thibault
37ba0ecd9f MyAvatar: prevent face from being visible when crouching
Overall, this should fix many of the issues with the head being visible when it shouldn't.
2016-03-04 11:48:55 -08:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
Anthony J. Thibault
dc456cbdbe MyAvatar: dropped vertical recenter limit. 2016-03-04 11:15:11 -08:00
Ryan Huffman
f21815e332 Merge pull request #7245 from birarda/domain-security
manually install OpenSSL DLLs for Qt
2016-03-04 09:23:21 -08:00
Brad Hefta-Gaub
5b2c3b4b26 Merge pull request #7243 from thoys/20821
CR for Job #20821 - Remove stray tray icon
2016-03-03 18:10:56 -08:00
Stephen Birarda
3750d5d780 manually install OpenSSL DLLs for Qt 2016-03-03 17:57:34 -08:00
Brad Hefta-Gaub
7bb87305d4 Merge pull request #7234 from zzmp/fix/line3d-back-cull
Render line3d without backface culling
2016-03-03 17:16:54 -08:00
Thijs Wenker
17f0688db5 removed stray traybar icon 2016-03-03 19:18:47 +01:00
David Rowe
1eb6fa425c Fix up Running Scripts dialog 2016-03-03 20:09:50 +13:00
David Rowe
f88eef7549 Update section headers 2016-03-03 19:17:48 +13:00
David Rowe
fb675dbaf5 Add vertical spacing above other settings fields 2016-03-03 18:49:13 +13:00
David Rowe
2d250e2f64 Only the first checkbox in a group has vertical space before it 2016-03-03 17:51:14 +13:00
David Rowe
a41f409e33 Defer dialog vertical spacing decisions to content items 2016-03-03 17:49:18 +13:00
Anthony J. Thibault
2a75084579 Merge branch 'master' into tony/hmd-follow-work 2016-03-02 17:44:13 -08:00
David Rowe
4729020df1 Change section expand/collapse icons 2016-03-03 14:32:08 +13:00
David Rowe
46bb3c05a5 Right justify leading control labels 2016-03-03 14:17:02 +13:00
David Rowe
81f13afb4e Tweak look of combo box control 2016-03-03 10:24:42 +13:00
David Rowe
c83ed578db Merge branch 'master' into 20812 2016-03-03 02:01:20 +13:00
David Rowe
c3b47088c9 Fix slider vertical alignment 2016-03-03 01:59:21 +13:00
David Rowe
a51dd43dff Wrap labels 2016-03-03 01:56:02 +13:00
David Rowe
c1f5bac86a Style the ComboBox 2016-03-03 01:14:00 +13:00
David Rowe
98ad785267 Get ComboBox working 2016-03-03 00:04:15 +13:00
David Rowe
829c858b04 Start on ComboBox again using Austin's HMD-compatible code 2016-03-02 22:18:12 +13:00
David Rowe
4d53dee29c Rename section control 2016-03-02 19:46:26 +13:00
David Rowe
e79427bb3b Make some settings dialogs have collapsible sections 2016-03-02 19:41:50 +13:00
Brad Hefta-Gaub
cfce5af8d4 Merge pull request #7191 from samcake/orange
Better Shading Model and support fr Stingray material
2016-03-01 18:24:09 -08:00
Anthony J. Thibault
6e80665107 MyAvatar: reduced rotation re-center threshold to 30 degrees
Also, warning fix for Linux.
2016-03-01 17:45:16 -08:00