Commit graph

44597 commits

Author SHA1 Message Date
Seth Alves
4a9f928429 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-06 10:25:24 -07:00
Andrew Meadows
a9dd2c7015 Merge pull request #8172 from sethalves/fix-issue-8159
fix canRezTmp logic (incorrectly) resets valid lifetimes to the maximum value
2016-07-05 14:47:05 -07:00
Clément Brisset
7c0879d919 Merge pull request #8183 from humbletim/fix-typedarrays
fix TypedArray byte ordering and .subarray indexing
2016-07-05 10:00:15 -07:00
Brad Hefta-Gaub
372f8245e6 Merge pull request #8162 from SamGondelman/snapshotFix
Snapshot takes picture of HMD window instead of preview
2016-07-05 09:25:59 -07:00
Brad Hefta-Gaub
e6df17d01d Merge pull request #8185 from ctrlaltdavid/20984
QA READY: prevent users window from being dragged off screen
2016-07-05 09:16:39 -07:00
Seth Alves
669df1b6b7 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-04 10:20:30 -07:00
Seth Alves
2a25f458fc fetch rank names from web api after getting a group's ID 2016-07-04 10:20:25 -07:00
David Rowe
0ad7aa72fb Prevent users window from being dragged offscreen 2016-07-04 14:34:38 +12:00
Brad Hefta-Gaub
87cdb4144d Merge pull request #8182 from kencooke/master
floating-point versions of the audio resampler and reverb
2016-07-03 18:48:22 -07:00
Ken Cooke
f43c6447e1 remove unneeded #pragma 2016-07-03 11:46:23 -07:00
Ken Cooke
014f6fa259 PR feedback: better naming of convertInput() and convertOutput() 2016-07-03 11:40:32 -07:00
Ken Cooke
f7c9957bb1 PR feedback: better naming of convertInput() and convertOutput() 2016-07-03 11:33:05 -07:00
Seth Alves
c7793845cb Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-03 09:57:17 -07:00
Sam Gondelman
34042d51ad Merge pull request #8180 from ctrlaltdavid/fix-users-border
don't show users border when hover mouse if logged out
2016-07-03 03:14:17 -07:00
humbletim
b7874116b9 fix TypedArray byte ordering and .subarray end indexing 2016-07-02 23:36:08 -04:00
Ken Cooke
941067b9d0 Added floating-point audio reverb 2016-07-02 07:25:04 -07:00
Ken Cooke
ad8f17a142 Add support for deinterleaved float-point audio (native format) 2016-07-01 19:29:43 -07:00
Ken Cooke
d3c006b5da Added floating-point audio resampler 2016-07-01 18:50: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
David Rowe
760f4366e1 Don't show users border when hover mouse if logged out 2016-07-02 11:25:04 +12: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
Brad Davis
88d28120b6 Adding missed file 2016-07-01 15:48:58 -07:00
Brad Davis
c82ac269ce Merge pull request #8178 from howard-stearns/button-state
toolbar chicklet button state
2016-07-01 15:25:16 -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
howard-stearns
804a187a7b Mute changes. 2016-07-01 10:17:17 -07:00
James B. Pollack
122902714a Merge pull request #8175 from AlexanderOtavka/fix-eslintrc
Fix eslint descrepencies
2016-07-01 10:12:36 -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
Ryan Downe Karpf
873b57219a Merge pull request #8167 from hyperlogic/feature/equip-hotspots
equip-hotspots feature
2016-07-01 09:55:49 -07:00
Brad Davis
5288d98376 Using pipelines properly where appropriate 2016-06-30 20:52:41 -07:00
Howard Stearns
ae54399177 Merge pull request #8168 from jherico/qml_window_signal
Allow scripts to receive a visibility changed signal from their windows
2016-06-30 16:50:07 -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
Seth Alves
aae42e3802 updates to track zach's changes to api 2016-06-30 16:14:46 -07:00
Brad Davis
b7926b8582 Don't render wire geometry with lighting effects 2016-06-30 16:11:05 -07:00
Anthony J. Thibault
d8e5e3cbe4 equip bug fix
you should not be able to equip an object that is already equipped, with your other hand.
2016-06-30 16:00:18 -07:00
SamGondelman
69ffd63ba7 fix snapshot sharing window 2016-06-30 15:42:48 -07:00
Seth Alves
b9f9b18083 if an edit packet doesn't include a change to lifetime, don't attempt to cap the lifetime 2016-06-30 15:41:58 -07:00
Brad Davis
14784a6088 Remove default focus on text fields 2016-06-30 15:22:13 -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
dd73f0c333 Remove unused header from AccountManager.h 2016-06-30 14:50:29 -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