12894 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	32b56a4bf7	fix the slight flicker that's being caused by error in calculating the model inverse matrix	2015-09-28 16:09:57 -07:00
Brad Davis	203c601e95	Fix for bad textures when using _glActiveBindTexture	2015-09-28 12:26:11 -07:00
Howard Stearns	9e001f0b4b	Merge pull request #5903 from AndrewMeadows/ik-repairs-006 ... enforce target rotation during IK calculations	2015-09-25 15:50:59 -07:00
Andrew Meadows	a97f556958	enforce IK target rotation	2015-09-25 15:13:57 -07:00
Eric Levin	135e2683a6	Merge pull request #5902 from ctrlaltdavid/particles-fixes ... Particles fixes	2015-09-25 10:56:18 -07:00
Andrew Meadows	4f0bd08b62	Merge pull request #5900 from ZappoMan/batchOptimizations ... more work on batch optimzation	2015-09-25 09:00:38 -07:00
Andrew Meadows	7822d58164	Merge pull request #5870 from howard-stearns/apostrophe ... Apostrophe key resets animation state.	2015-09-25 08:50:19 -07:00
David Rowe	d233d3f81b	Fix particle emitter corner cases	2015-09-24 19:17:02 -07:00
David Rowe	629128c17f	Fix particle emit directions for point emitter	2015-09-24 19:16:28 -07:00
David Rowe	d063f3488d	Back out fromSpherical code addition	2015-09-24 19:14:26 -07:00
Brad Hefta-Gaub	85b2322acc	more work on batch optimzation	2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub	8a8da58dfd	Merge pull request #5898 from kencooke/audio-src ... Completely remove SOXR from cmake	2015-09-24 15:59:23 -07:00
Howard Stearns	266c69fc70	Disable the old-school Rig::inverseKinematics during reset.	2015-09-24 15:33:52 -07:00
Ken Cooke	629ee7b0c1	Completely remove SOXR from cmake	2015-09-24 15:12:10 -07:00
Howard Stearns	bdbd9ab69e	Merge pull request #5895 from AndrewMeadows/ik-repairs-005 ... allow head translation when using hand IK in 3rd person screenie mode	2015-09-24 14:12:05 -07:00
Andrew Meadows	59da684eb9	make IKTarget::setType() a one-liner	2015-09-24 13:15:03 -07:00
Brad Hefta-Gaub	19d30bb08b	Merge pull request #5890 from ctrlaltdavid/20691 ... Orient particles to face camera but not roll with it	2015-09-24 12:49:13 -07:00
Andrew Meadows	17e3e9394f	allow head translation for 3rd person screenie IK	2015-09-24 12:38:46 -07:00
Brad Hefta-Gaub	776acf2182	ignore gverb warnings	2015-09-24 09:07:43 -07:00
Brad Hefta-Gaub	5e82b9c433	more warning fixes	2015-09-24 08:26:56 -07:00
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
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
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
David Rowe	a2c7b3bcc9	Orient particles to face camera but not roll with it	2015-09-23 17:00:07 -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
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
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