Ken Cooke
629ee7b0c1
Completely remove SOXR from cmake
2015-09-24 15:12:10 -07:00
Ken Cooke
478eab3843
CR feedback
2015-09-23 12:07:17 -07:00
Ken Cooke
c4bc5233b1
In AudioClient, replace all SOXR with AudioSRC. Used for input-to-network, network-to-output, and loopback resampling.
2015-09-22 23:10:03 -07:00
Ken Cooke
4b9c2ed6b6
In AudioInjector, replace SOXR with AudioSRC.
...
Used for pitch shifting in playSound(). Setup time (once per sound) is drastically improved.
2015-09-22 23:08:05 -07:00
Ken Cooke
0ad01ca935
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-src
2015-09-22 15:33:13 -07:00
Brad Hefta-Gaub
17b2bf1c33
Merge pull request #5864 from birarda/master
...
make sure server/mixers are first in FIFO
2015-09-22 14:57:49 -07:00
Brad Hefta-Gaub
5bcce50b98
Merge pull request #5846 from bob-long/master
...
Display the face blend coefficients and update the value in real time.
2015-09-22 14:56:56 -07:00
Andrew Meadows
3af1329be2
Merge pull request #5825 from thoys/20655
...
CR for Job #20655 - Add ability to close one script from another script
2015-09-22 14:52:39 -07:00
Andrew Meadows
084ba8abc0
Merge pull request #5874 from howard-stearns/AndrewMeadows-ik-repairs-003
...
cleanup IK implementation plusplus
2015-09-22 14:51:41 -07:00
Seth Alves
e7999fa7f5
Merge pull request #5876 from ZappoMan/fixWarning
...
remove dead code and fix warning
2015-09-22 13:33:17 -07:00
Eric Levin
00e0523872
Merge pull request #5851 from imgntn/flashlight_updates_1
...
Flashlight updates
2015-09-22 13:01:26 -07:00
James Pollack
e5c42c76a2
Remove update loop refs
2015-09-22 12:41:00 -07:00
James Pollack
0ad238a508
Enlarge flashlight
2015-09-22 12:39:48 -07:00
Brad Hefta-Gaub
5bb908f081
remove dead code and fix warning
2015-09-22 12:34:47 -07:00
Ken Cooke
db85bbacf4
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-src
2015-09-22 12:10:53 -07:00
Andrew Meadows
7060befd1c
Merge pull request #5862 from howard-stearns/user-specified-animation-graph
...
user-specified animation graph
2015-09-22 10:48:28 -07:00
Eric Levin
37efb80945
Update BUILD_WIN.md
2015-09-22 10:19:01 -07:00
Ken Cooke
630abda35f
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-src
2015-09-22 10:18:11 -07:00
Philip Rosedale
c09ac51d75
Merge pull request #5871 from ctrlaltdavid/20688
...
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
2015-09-22 10:17:28 -07:00
Howard Stearns
7e52d38870
Don't include the root rot, because it seems that this is already accounted for in the head params.
...
Restore the hmd conditional on setting head position. This had been removed when failing to pin it cause lean.
I believe that lean was being caused by coordinate system issues that are now addressed by the above and Andrew's big cleanup.
2015-09-22 10:12:59 -07:00
Howard Stearns
8f1dde69cc
Always keep targets, even when both position and rotation are unset. (Get from underpose.)
...
Filtering these was necessary before when the underpose coordinate was wrong, but now that we have that working, there shouldn't be any need to filter.
2015-09-22 10:10:29 -07:00
Thijs Wenker
f38bb77d0a
less calls to QHash
2015-09-22 18:48:46 +02:00
Howard Stearns
0ccf2346fa
Merge branch 'ik-repairs-003' of https://github.com/AndrewMeadows/hifi into AndrewMeadows-ik-repairs-003
2015-09-22 09:45:22 -07:00
Thijs Wenker
90b89cbb45
Merge branch 'master' of https://github.com/worklist/hifi into 20655
2015-09-22 18:44:25 +02:00
Brad Hefta-Gaub
0072b6d7d0
Merge pull request #5681 from samcake/orange
...
NetworkGeometry and FBXReader refactoring for splliting Material from Mesh
2015-09-22 09:27:11 -07:00
Ken Cooke
b983ba7056
Fix Mac and Linux builds
2015-09-22 08:46:00 -07:00
Ken Cooke
2d1150115f
New low-latency sample rate conversion library
2015-09-22 08:14:08 -07:00
samcake
80e5581639
fixing review comments
2015-09-21 22:51:14 -07:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
David Rowe
30dc07b621
Code tidying
2015-09-21 21:22:36 -07:00
David Rowe
0f85c28098
Fix HMD 3rd person view
2015-09-21 21:08:13 -07:00
BOB LONG
a23a90bf5f
Code simplification
...
Simplify the code a bit as suggested:
1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation
Correct the js sample file header.
testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
2015-09-21 19:11:13 -07:00
samcake
91b9940fe9
Merging and a fix for the diffuse map floating around
2015-09-21 18:09:25 -07:00
Andrew Meadows
3869887610
splitting AnimNode implementation into two files
2015-09-21 17:53:59 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
James B. Pollack
bf22d5a942
dont delete wand at cleanup from createWand.js
2015-09-21 17:43:05 -07:00
Andrew Meadows
e6776ef5eb
split AnimIK::evaluate() into sub-functions
...
also IK targets now in model-frame instead of root-frame
2015-09-21 17:29:39 -07:00
Brad Davis
7b5cbbf758
Merge pull request #5868 from ctrlaltdavid/20687
...
Fix HMD fullscreen mirror view
2015-09-21 17:07:31 -07:00
samcake
21f53f1bbd
debugging the lighting issue on the craps table
2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
ea141aae92
Merge pull request #5865 from jherico/bart
...
Instancing work, second pass
2015-09-21 16:51:08 -07:00
Brad Davis
483884196c
Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles
...
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 16:48:29 -07:00
Brad Davis
8f3c2af55e
Merge pull request #5863 from ZappoMan/fixParticleEffect
...
fix a couple of properties
2015-09-21 16:43:12 -07:00
Bradley Austin Davis
0401672c82
Fixing lighting again
2015-09-21 16:24:55 -07:00
James B. Pollack
d79c1bec95
remove query string
2015-09-21 16:13:24 -07:00
samcake
dfe17e5708
Fix issues from review
2015-09-21 16:12:17 -07:00
James B. Pollack
fd67a2b86f
Add on/off by pressure; add point bulb to end of flashlight
2015-09-21 16:10:08 -07:00
Bradley Austin Davis
b3aeaba5f4
CR feedback
2015-09-21 15:44:47 -07:00
samcake
a485d3d6de
Fixing the rendering of ProceduralSkybox
2015-09-21 15:21:48 -07:00
Howard Stearns
4dd95be8c4
Forgot to actually persist.
2015-09-21 15:06:11 -07:00
Bradley Austin Davis
84cea1ffd4
More CR comments
2015-09-21 14:33:32 -07:00
