Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 22:29:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46675 commits 76 branches 59 tags 1.2 GiB
Commit graph

46675 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
2e83f21844 merge from upstream 2016-09-20 13:32:05 -07:00
Seth Alves
2468b56079 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-20 13:28:20 -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
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
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
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
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
0d3a9af6a6 wait 10s before growing jitter 2016-09-16 12:03:54 -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
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
Seth Alves
8734661a0e add explaining comment 2016-09-14 11:28:22 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
howard-stearns
db20a8ceef fix 1319 2016-09-14 11:20:09 -07:00
Seth Alves
1dace86df8 Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-14 10:38:36 -07:00
Seth Alves
409ebe526b qml keyboard for Browser window 2016-09-14 10:38:08 -07:00
Seth Alves
b48270c9a7 don't accidently select entities through edit.js window 2016-09-14 10:25:30 -07:00
Ken Cooke
ad97a15e8b Handle another case when resampling is not needed 2016-09-14 09:54:15 -07:00
Seth Alves
e6a1c14de6 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-14 09:43:19 -07:00
Ken Cooke
e82d751dac Fix typo 2016-09-14 08:25:41 -07:00
Ken Cooke
25920732ec Remove unused buffer 2016-09-14 08:23:53 -07:00
Ken Cooke
96313a421c Cleanup the confusion of using null-resampler for channel conversion 2016-09-14 08:22:18 -07:00
Ken Cooke
c555e369c8 Handle the case when resampling is not needed 2016-09-14 06:37:09 -07:00
Ken Cooke
27d24eb79b Fix compiler warning 2016-09-13 20:56:36 -07:00
Ken Cooke
ed9061040a Better Android settings 2016-09-13 20:16:23 -07:00
Ken Cooke
f1455ab157 Remove unneeded buffers 2016-09-13 20:06:44 -07:00
Ken Cooke
3a41b285a0 Fix local audio injectors, that got disabled somehow 2016-09-13 17:21:48 -07:00
Seth Alves
79dfacde64 Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard 2016-09-13 16:43:07 -07:00
Seth Alves
447de7cd5a qml keyboard for edit.js window 2016-09-13 16:31:59 -07:00
Ken Cooke
724df38df0 Optimize the audio pipeline. Use float mixBuffer and apply reverb at 24khz 2016-09-13 16:11:06 -07:00