13080 commits

Author	SHA1	Message	Date
samcake	429d82e650	Fixing review comments	2015-10-06 09:54:37 -07:00
samcake	c92a6d58ab	Dispatch classes in their properly named files to appease the coding standard gods	2015-10-06 09:46:32 -07:00
samcake	59afbf1a04	Remove the renderPart call from model.cpp and put the code path in the MeshPartPayload::render()	2015-10-06 01:15:53 -07:00
samcake	fc7f0c77a5	Rename ModelRenderPayload files to ModelRenderItem	2015-10-06 00:20:51 -07:00
samcake	4270b83c0f	Uniform buffer for skeleton joint bind pose	2015-10-05 23:33:58 -07:00
samcake	894c8c0a93	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-05 19:23:30 -07:00
samcake	12fedb6ff0	Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer	2015-10-05 18:31:05 -07:00
Brad Hefta-Gaub	d95fe3ddb7	Merge pull request #5989 from jherico/homer ... Enabling programmatic access to the IPD scale	2015-10-05 17:22:19 -07:00
Brad Hefta-Gaub	d5663ed773	Merge pull request #5946 from jherico/nelson ... Improved procedural surfaces, textures and additional standard uniforms	2015-10-05 17:12:32 -07:00
Clément Brisset	5eda3095bb	Merge pull request #5998 from birarda/qt-5.5 ... suppress warnings for overriden methods in Xcode 7	2015-10-05 17:00:43 -07:00
Stephen Birarda	d48f17e0e1	Merge pull request #5995 from Atlante45/log ... Make log more readable	2015-10-05 16:04:47 -07:00
Stephen Birarda	5989cad054	add override qualifier to suppress warnings in entities-renderer	2015-10-05 15:55:05 -07:00
Stephen Birarda	3ddfcc10c2	override additions to input-plugins	2015-10-05 15:50:35 -07:00
Anthony Thibault	2a406481d4	Merge pull request #5992 from howard-stearns/reset-on-calibration ... Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 15:19:16 -07:00
Stephen Birarda	9bc95a0fc1	fix override warnings in assignment-client	2015-10-05 15:17:10 -07:00
Clément Brisset	70b9b1eb77	Merge pull request #5985 from hyperlogic/tony/anim-warning-fix ... animation lib warning fixes	2015-10-05 15:03:47 -07:00
Atlante45	598aab884e	Make log more readable	2015-10-05 14:59:28 -07:00
Eric Levin	c72c87b59c	Revert "QA for 20699 - Sanitize particle property values when set"	2015-10-05 13:35:58 -07:00
Eric Levin	d0f0aae885	Merge pull request #5987 from ctrlaltdavid/20699 ... QA for 20699 - Sanitize particle property values when set	2015-10-05 13:13:16 -07:00
Howard Stearns	844270e306	Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 12:44:22 -07:00
Andrew Meadows	1ead20683c	Merge pull request #5976 from sethalves/fix-action-deletes ... Fix action deletion/addition when more than one interface are involved	2015-10-05 12:31:01 -07:00
Anthony J. Thibault	75849db867	Changed (float)fabs() to fabsf()	2015-10-05 12:00:02 -07:00
Seth Alves	993111d22f	code review	2015-10-05 11:28:59 -07:00
samcake	9e393ced46	MOving rednering code of Model into ModelRenderPayload.h/cpp	2015-10-05 09:17:16 -07:00
samcake	fd232b7d32	ONe more file to deal with the Model rendering	2015-10-04 22:27:48 -07:00
samcake	1799322c67	Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp	2015-10-04 18:46:35 -07:00
samcake	55f5ab3732	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-04 18:31:56 -07:00
samcake	48416262a1	Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced	2015-10-04 18:31:19 -07:00
Brad Davis	725ed26ac2	Enabling programmatic access to the IPD scale	2015-10-04 16:55:49 -07:00
David Rowe	53e85e8566	Tidying	2015-10-03 09:59:33 -07:00
David Rowe	510065fe5c	Fix particle property maxParticles not being able to be set properly	2015-10-03 09:16:07 -07:00
Brad Davis	c8aea67505	Working on texture compatibility with Shadertoy	2015-10-02 19:09:43 -07:00
David Rowe	88937318d8	Merge branch 'master' into 20699 ... Conflicts: libraries/entities/src/ParticleEffectEntityItem.h	2015-10-02 18:39:50 -07:00
samcake	edaa8f998a	Migrating to the new mesh for rendering and having problems with multi part mesh	2015-10-02 18:12:16 -07:00
David Rowe	67a497cda3	Sanitize particle properties and their use ... Excluding animationSetings because it's unused and will be removed.	2015-10-02 17:37:59 -07:00
Anthony J. Thibault	b6b57de1c6	animation lib warning fixes	2015-10-02 16:42:50 -07:00
Howard Stearns	8153ad7f44	Merge pull request #5967 from AndrewMeadows/collision-group-hack ... allow physical objects to be set collisionless	2015-10-02 16:08:52 -07:00
Brad Hefta-Gaub	627578826b	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-10-02 15:12:02 -07:00
Brad Hefta-Gaub	255689e24f	add GLEW_STATIC to fix link warnings	2015-10-02 15:08:04 -07:00
Andrew Meadows	607cb9652e	Merge pull request #5969 from kencooke/audio-src-sse2 ... SSE2 optimization of new resampler.	2015-10-02 15:07:03 -07:00
Seth Alves	a737b4024d	Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes	2015-10-02 13:57:24 -07:00
Howard Stearns	f6665a4ac6	Merge pull request #5839 from sethalves/transmit-joint-translation ... WARNING protocol change: Transmit joint translation	2015-10-02 13:37:56 -07:00
Seth Alves	67cc944afc	fix double free problem	2015-10-02 13:27:45 -07:00
samcake	a22ee03732	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-02 12:25:09 -07:00
samcake	edb485cb0f	working on getting the Model payload to use model::Mesh	2015-10-02 12:24:41 -07:00
Brad Davis	83c9ebf06c	Fixing Linux build failure	2015-10-02 11:57:14 -07:00
Brad Davis	7d4b680255	PR comments	2015-10-02 11:57:13 -07:00
Brad Davis	de5e95f7dc	Improved procedural surfaces, textures and more standard uniforms	2015-10-02 11:57:13 -07:00
Brad Hefta-Gaub	dce4d94f30	Merge pull request #5941 from ctrlaltdavid/particles-fix ... Fix particle radius, color, and alpha starts/finishes	2015-10-02 11:40:47 -07:00
Anthony J. Thibault	c0be32d359	Fix for model offset when using Rig Animations.	2015-10-02 11:40:46 -07:00