Commit graph

46663 commits

Author SHA1 Message Date
Chris Collins
a2f6dd859e Merge pull request #8640 from sethalves/reenable-web-entities-on-linux
re-enable web entity-items on linux
2016-09-22 11:23:32 -07:00
Seth Alves
dc5e63c4f1 re-enable web entity-items on linux 2016-09-22 10:25:26 -07:00
Brad Hefta-Gaub
2be961ef10 Merge pull request #8631 from sethalves/avoid-modal-edit-dialogs
edit.js indicates errors via notifications.js
2016-09-22 09:19:52 -07:00
Clément Brisset
f8501d410a Merge pull request #8637 from ZappoMan/redirectOnFull
add support for redirection on domain at max capacity
2016-09-22 08:56:00 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Ken Cooke
b14f43b11e Merge pull request #8610 from zzmp/test/audio-jitter
add audio jitter simulator testing tool
2016-09-21 16:43:36 -07:00
Seth Alves
785e187a27 edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around 2016-09-21 11:39:25 -07:00
Clément Brisset
f26fbca699 Merge pull request #8623 from ZappoMan/improvedPreview
Improved preview
2016-09-20 19:05:26 -07:00
Brad Hefta-Gaub
cc8aa540b4 fix unix build 2016-09-20 15:54:57 -07:00
Brad Hefta-Gaub
52f0b5f6c8 cleanup 2016-09-20 14:06:02 -07:00
Brad Hefta-Gaub
6c68d9abb3 beter center image around center of eye 2016-09-20 14:04:51 -07:00
Brad Hefta-Gaub
73a7d1b63b redraw no-preview message if window size changes 2016-09-20 10:15:27 -07:00
Brad Hefta-Gaub
8f5c5ebf0e improved disabled preview wording 2016-09-19 18:19:35 -07:00
Brad Hefta-Gaub
2b01c60a55 Merge pull request #8615 from davidkelly/dk/1264
Make the equip sphere emissive
2016-09-19 16:33:55 -07:00
Brad Hefta-Gaub
09b3292f94 fix unix build 2016-09-19 16:32:36 -07:00
Brad Hefta-Gaub
8eb5f6682a cleanup code 2016-09-19 15:09:03 -07:00
Chris Collins
1c4fcb5112 Merge pull request #8620 from ZappoMan/detectMasterOrStable
add basic support for master vs stable builds
2016-09-19 15:08:40 -07:00
Brad Hefta-Gaub
77ec588b64 Merge branch 'master' of https://github.com/highfidelity/hifi into improvedPreview 2016-09-19 14:50:26 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00
Seth Alves
193506ea99 Merge pull request #8619 from hyperlogic/bug-fix/far-grab-jumping
Fix for jittery far-grab at low update rates
2016-09-19 12:04:46 -07:00
Chris Collins
9d7d186717 Merge pull request #8593 from marko8904/master
remove qtaudio_windows.dll on Windows before installing the new version
2016-09-19 11:47:47 -07:00
Brad Hefta-Gaub
427f6b100f Merge branch 'master' of https://github.com/highfidelity/hifi into improvedPreview 2016-09-19 11:09:58 -07:00
Anthony J. Thibault
aefe224215 Fix for jittery far-grab at low update rates
Clamp the blendFactor used to smooth out the motion of the far-grabbed object.
This prevents the newTargetPosition from over shooting it's goal.
2016-09-19 10:51:46 -07:00
Chris Collins
3d9f231543 Merge pull request #8609 from zzmp/fix/audio-stats
fix audio network stats
2016-09-19 09:08:35 -07:00
Brad Hefta-Gaub
f923b2ede4 first cut at improved HMD preview 2016-09-18 20:32:23 -07:00
Clément Brisset
3552a7c757 Merge pull request #8612 from zzmp/fix/elongate-jitter-wait
wait 10s before growing jitter in a new session/domain
2016-09-16 17:34:22 -07:00
Zach Pomerantz
b6d093889c add AudioConstants::SAMPLE_SIZE 2016-09-16 14:20:50 -07:00
David Kelly
22d80914e2 whitespace 2016-09-16 14:17:44 -07:00
David Kelly
ade17e6456 PR feedback 2016-09-16 14:15:14 -07:00
Zach Pomerantz
45b306fc97 fix preference for jitter sim 2016-09-16 12:14:57 -07:00
Zach Pomerantz
0d3a9af6a6 wait 10s before growing jitter 2016-09-16 12:03:54 -07:00
Zach Pomerantz
80bce953f7 justify jitter simulation 2016-09-16 11:40:37 -07:00
David Kelly
2ddd46f30b Switch to the cool looking model instead 2016-09-16 10:56:59 -07:00
Zach Pomerantz
bbbe070af1 bring audio network latencies to standard 2016-09-15 18:19:58 -07:00
Zach Pomerantz
5b03d3e13d render audio network stats immediately 2016-09-15 18:19:57 -07:00
Brad Hefta-Gaub
41bbfcd578 Merge pull request #8603 from sethalves/quiet-logging
categorize some qDebugs
2016-09-15 18:09:11 -07:00
Zach Pomerantz
177466e4c7 calculate unplayed ms on all streams/buffers as max 2016-09-15 17:54:41 -07:00
David Kelly
1acfe017e1 Make the equip sphere emissive
maybe this will make it visible in low ambient light situations?
2016-09-15 17:12:35 -07:00
Chris Collins
84ffda5281 Merge pull request #8608 from huffman/fix/particle_explorer
Fix eventBridgeLoader path in particle explorer
2016-09-15 16:51:41 -07:00
Howard Stearns
7a4bcc4fff Merge pull request #8600 from howard-stearns/no-edit-selection-when-over-ui
don't do hand-controller edit object-selection when pointed at a HUD element
2016-09-15 16:17:58 -07:00
Zach Pomerantz
53f5899a69 add audio jitter simulator 2016-09-15 14:51:39 -07:00
Zach Pomerantz
9792d025fa clean up audio stats 2016-09-15 13:09:06 -07:00
Ryan Huffman
6a32ef29dc Fix eventBridgeLoader path in particle explorer 2016-09-15 13:07:00 -07:00
Seth Alves
d67701f7bb new logging category for deadlock debug prints 2016-09-15 13:02:18 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Seth Alves
d83600a22e Merge pull request #8599 from howard-stearns/close-address-bar-after-going-home
close address bar after going home
2016-09-14 19:43:57 -07:00
Andrew Meadows
06b17995b1 Merge pull request #8598 from kencooke/optimized-audio-pipeline
Optimized audio pipeline
2016-09-14 12:18:40 -07:00
howard-stearns
03a8af76e3 don't do hand-controller edit object-selection when pointed at a HUD
element
2016-09-14 12:02:33 -07:00
Andrew Meadows
46e57f7773 Merge pull request #8571 from sethalves/grab-point-adjustments
grab-point adjustments
2016-09-14 11:53:05 -07:00
Seth Alves
59db640cb5 add explaining comment 2016-09-14 11:33:03 -07:00