Commit graph

46871 commits

Author SHA1 Message Date
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
Seth Alves
6bce73db80 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-20 10:37:32 -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
Seth Alves
ba8aa5b50c fix camelcase 2016-09-19 16:38:34 -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
Seth Alves
571aaac4d7 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-19 15:37:53 -07:00
Seth Alves
8108557e10 whitespace 2016-09-19 15:37:50 -07:00
Seth Alves
eb6d329dfa exit status depends on what happened. timeout added so it wont wait for server responses forever. 2016-09-19 15:30:55 -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
45b48c01bf command-line arguments to control ice-server ip address and domain-server ID 2016-09-19 13:39:42 -07:00
Seth Alves
c87652ab6d cl flag to cache stun-server resposne 2016-09-19 13:34:56 -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
Seth Alves
fe085d7b90 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-19 09:58:27 -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
Seth Alves
b5e216db68 ice test-client uses stun server to get public address 2016-09-16 17:21:42 -07:00
Seth Alves
2e0cc158de ice test-client uses stun server to get public address 2016-09-16 17:21:28 -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
Seth Alves
793687bb08 more command-line arguments 2016-09-16 14:11:44 -07:00
Seth Alves
d3dc0698a5 more command-line arguments 2016-09-16 13:51:33 -07:00
Seth Alves
6231fc4ba1 tool for testing ice-server 2016-09-16 13:34:40 -07:00
Seth Alves
cadbbd6194 tool for testing ice-server 2016-09-16 13:34:32 -07:00
Seth Alves
babe8f95bc tool for testing ice-server 2016-09-16 13:34:05 -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