Brad Hefta-Gaub
ba73acf3b4
Merge pull request #5843 from ctrlaltdavid/20681
...
Replace point and vector particle emitter with spheroid emitter
2015-09-24 08:19:49 -07:00
David Rowe
3d44fdfdf5
Fix warnings
2015-09-23 21:18:23 -07:00
Brad Hefta-Gaub
c6ac54b031
Merge pull request #5884 from sethalves/fix-obj-models
...
get obj models to be visible again. textures don't work
2015-09-23 20:43:25 -07:00
Brad Hefta-Gaub
d14820d3ef
Merge pull request #5880 from thoys/20668
...
Worklist job #20668 - JS: Add option to listen audio from camera
2015-09-23 20:40:32 -07:00
Brad Hefta-Gaub
4a4b9e1cd4
Merge pull request #5887 from thoys/patch-5
...
[Scripts] createFlashlight.js - Close script after running
2015-09-23 20:17:47 -07:00
samcake
46e9c463fc
Merge pull request #5885 from ZappoMan/batchOptimizations
...
Batch optimizations
2015-09-23 19:30:51 -07:00
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
Brad Hefta-Gaub
432dc2055f
gak
2015-09-23 17:38:59 -07:00
Brad Hefta-Gaub
9a0e5b9870
address Sam's concerns
2015-09-23 17:37:48 -07:00
Brad Hefta-Gaub
62c1e40127
CR repairs
2015-09-23 17:15:29 -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
ZappoMan
65a079cb53
fix mac build
2015-09-23 16:48:34 -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
Brad Hefta-Gaub
24e2215f14
fix mac/unix build
2015-09-23 15:47:52 -07:00
Thijs Wenker
6bb873d327
createFlashlight.js - Close script after running
...
Close the createFlashlight.js script after running once to prevent a flashlight from being created each time you start Interface
2015-09-24 00:43:50 +02: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
Seth Alves
27688fa55b
get obj models to be visible again. textures don't work
2015-09-23 14:46:57 -07:00
Brad Hefta-Gaub
ef25876c9a
implement vector caching for gpu::Batch
2015-09-23 14:46:47 -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
Brad Hefta-Gaub
c9d5caff51
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-09-23 11:55:52 -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
David Rowe
2b902238e7
Code tidying
2015-09-23 10:33:31 -07:00
samcake
7f8450f77b
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-09-23 10:30:51 -07:00
David Rowe
eb01ba9812
Merge branch 'master' into 20681
2015-09-23 09:42:56 -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
