Brad Hefta-Gaub
5a80c4d0e7
Merge pull request #5886 from samcake/calvin
...
Expose multi Draw Indirect in Batch (Hijack Austin's work...)
2015-09-23 19:13:28 -07:00
samcake
7d8f3661ad
coding standard
2015-09-23 17:49:03 -07:00
samcake
b8e630a7a7
Less Warnigns
2015-09-23 17:46:10 -07:00
Howard Stearns
14bfdebdca
Merge pull request #5883 from hyperlogic/tony/lean-threshold
...
Better Head IK when in HMD mode
2015-09-23 16:57:02 -07:00
samcake
9c44c3e4a4
Removing warnings
2015-09-23 16:19:34 -07:00
samcake
5176d51714
Merge and fix warnings
2015-09-23 16:05:53 -07:00
samcake
370b41895c
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-09-23 16:03:10 -07:00
Philip Rosedale
75a9dd13be
Merge pull request #5872 from kencooke/audio-src
...
New low-latency sample rate conversion library
2015-09-23 15:42:53 -07:00
Anthony J. Thibault
6b47373bcb
Fix for precision error in AnimPose(glm::mat4) constructor.
...
Really the culprit is GLMHelpers extractRotation().
I have a separate unit test that demonstrates the bug.
2015-09-23 15:38:56 -07:00
samcake
5fd2992c28
sometimes, magic happens, and clean rebuilds...
2015-09-23 15:34:49 -07:00
samcake
83116fdd85
Fixed the code path with tseparate vertex format, still broken otherwise in the case of primitive instanced
2015-09-23 15:20:39 -07:00
samcake
acfb5a32bc
Rename the nb parameters with num
2015-09-23 12:28:46 -07:00
samcake
8735aa8003
Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux
2015-09-23 12:19:17 -07:00
Ken Cooke
478eab3843
CR feedback
2015-09-23 12:07:17 -07:00
Anthony J. Thibault
0d7eae2d64
Fix slight translation error when rendering debug animation skeleton.
2015-09-23 11:42:55 -07:00
Anthony J. Thibault
90a551214e
Fix for AnimDebugDraw crash on shutdown.
2015-09-23 11:09:43 -07:00
Anthony J. Thibault
a454584496
Updated default avatar-animation.json
2015-09-23 10:59:52 -07:00
Anthony J. Thibault
a9848cd157
Merge branch 'master' into tony/lean-threshold
2015-09-23 10:54:12 -07:00
samcake
7f8450f77b
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-09-23 10:30:51 -07:00
Brad Hefta-Gaub
ec9bf0791b
Merge pull request #5875 from ctrlaltdavid/20689
...
Don't run Script Editor scripts from the cache
2015-09-23 08:52:30 -07:00
Andrew Meadows
feeead0e0a
Merge pull request #5879 from ZappoMan/fixWarning
...
fix a bunch of warnings
2015-09-23 08:24:21 -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
Brad Hefta-Gaub
387c4fbd92
fix bad oglplus pragma warnings
2015-09-22 21:52:16 -07:00
Brad Hefta-Gaub
17a3fd159a
apparently unix doesn't like the generic type version of sqrt()
2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub
02e1de3ba3
more warnings fixes
2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub
cd9aad4f41
more warnings fixes
2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub
9436d2922f
more warnings fixes
2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub
5b00783f18
more warnings fixes
2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub
8d8035a418
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning
...
Conflicts:
libraries/render-utils/src/Model.cpp
libraries/render-utils/src/Model.h
2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub
3fe4de4511
Merge pull request #5751 from imgntn/bubblewand_hotfix_2
...
Bubble Wand
2015-09-22 20:35:58 -07:00
Brad Hefta-Gaub
52842cb287
more warnings fixes
2015-09-22 20:34:40 -07:00
Anthony J. Thibault
9ce43a57f1
Better head IK when in an HMD.
...
Because the current IK system doesn't quite handle what we need
for the head and neck IK, we do it procedurally in the rig, and
manually set both neck and head IK targets.
2015-09-22 19:58:21 -07:00
Anthony J. Thibault
d04f4d4b2b
Added shared DebugDraw singleton.
2015-09-22 19:57:23 -07:00
Anthony J. Thibault
d53295655f
Fixes for empty poses
...
This can happen when an animation is evaluated before it is finished loading.
2015-09-22 19:54:51 -07:00
Howard Stearns
a9460b9b41
Merge pull request #5881 from AndrewMeadows/ik-repairs-004
...
remove underpose attenuation from IK relaxation step
2015-09-22 19:45:40 -07:00
James Pollack
3e3d7a8bfa
JS Linting and Coding Standards
2015-09-22 18:12:51 -07:00
Brad Hefta-Gaub
e99ad75a28
more warnings fixes
2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
6f7e13b3c1
more warning fixes
2015-09-22 17:26:45 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
Andrew Meadows
d25ba8946e
fix animation attenuation from IK relaxation step
2015-09-22 17:20:26 -07:00
Andrew Meadows
2edffaf91a
remove unused variables
2015-09-22 17:20:13 -07:00
Andrew Meadows
11fee94459
remove warning about signed/unsigned comparison
2015-09-22 17:19:47 -07:00
Philip Rosedale
474dc3920c
Merge pull request #5878 from ctrlaltdavid/20690
...
DO NOT MERGE - QA for 20690 - Don't look straight ahead in fullscreen mirror
2015-09-22 16:52:52 -07:00
Brad Hefta-Gaub
efda121619
fix a bunch of warnings on windows
2015-09-22 16:40:17 -07:00
David Rowe
eda12fd3af
Don't look straight ahead in fullscreen mirror
2015-09-22 16:15:54 -07:00
Brad Davis
deaa4a747b
Batch side implementation of multi-draw indirect
2015-09-22 15:56:58 -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
