569 commits

Author	SHA1	Message	Date
Brad Davis	a61d9501c8	Add polyvox to shader tests and clean up test code	2015-08-17 02:04:23 -07:00
Brad Hefta-Gaub	f76c663bb5	Merge pull request #5558 from AndrewMeadows/chromium ... coalesce scattered unit-test helper functions	2015-08-14 18:12:03 -07:00
Brad Hefta-Gaub	31a49a551a	Merge pull request #5556 from jherico/bart ... QML framerate improvments	2015-08-14 11:11:14 -07:00
Andrew Meadows	f64ab8e6b0	add QCOMPARE_QUATS macro for easier tests	2015-08-12 17:52:54 -07:00
Brad Davis	0fa3044231	QML framerate improvments	2015-08-12 16:24:34 -07:00
Andrew Meadows	f4e77b8200	remove another dupe unit-test util	2015-08-12 14:15:49 -07:00
Andrew Meadows	6dfbf7f70a	coalesce scattered dupes of unit-test utilities	2015-08-12 14:13:28 -07:00
Andrew Meadows	cae77cfd76	move GLMTestUtils.h where all tests can find it	2015-08-12 13:51:40 -07:00
Andrew Meadows	ba5346aee7	move GlmTestUtils.h to GLMTestUtils.h	2015-08-12 13:37:59 -07:00
David Rowe	e6473fc8b9	Merge branch 'master' into 20639 ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Menu.h tests/ui/src/main.cpp	2015-08-11 12:34:28 -07:00
Brad Hefta-Gaub	b726769f15	Merge pull request #5402 from highfidelity/plugins ... New plugins architecture	2015-08-11 11:11:27 -07:00
David Rowe	84feaeb703	Merge branch 'master' into 20639	2015-08-11 10:33:17 -07:00
Howard Stearns	295d655eec	Merge pull request #5545 from AndrewMeadows/chlorine ... rotation constraints in preparation for inverse kinematics	2015-08-11 09:19:16 -07:00
Andrew Meadows	23c92662ee	relaxed error, more rigor for using fabsf()	2015-08-10 23:09:11 -07:00
Brad Davis	19d31938d3	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-10 21:25:35 -07:00
David Rowe	80e296edd0	Merge branch 'master' into 20639	2015-08-10 19:25:12 -07:00
Andrew Meadows	75ab6a00aa	add unit tests for RotationConstraints	2015-08-10 14:48:46 -07:00
Andrew Meadows	f9a4b82edd	add swing-twist decomposition util with unit-tests	2015-08-10 14:47:15 -07:00
Andrew Meadows	4a8baafdd2	fix QCOMPARE_WITH_ABS_ERROR for floats	2015-08-10 14:45:57 -07:00
Andrew Meadows	6db47e773f	removing ShapeColliderTests.*	2015-08-10 14:35:36 -07:00
ericrius1	0f7c21ddd7	rearranged entity props and added check in setNormals to avoid uninitialized binormal values	2015-08-10 11:55:47 -07:00
David Rowe	051a398fa2	Merge branch 'master' into 20639	2015-08-07 18:26:56 -07:00
Bradley Austin Davis	fb2c84484e	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-07 15:26:43 -07:00
Seth Alves	b1e69537f3	Merge pull request #5524 from howard-stearns/cleanup-jointstate ... Clean Up JointState	2015-08-07 13:50:02 -07:00
David Rowe	b70c1a4960	Merge branch 'master' into 20639	2015-08-07 12:33:13 -07:00
Howard Stearns	145b730f80	Clean up instantiation.	2015-08-07 12:27:26 -07:00
ericrius1	d735c85806	moving polyLineEntity over to core profile	2015-08-07 11:41:55 -07:00
Howard Stearns	42cc34cd64	JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx.	2015-08-06 16:54:09 -07:00
Bradley Austin Davis	7e60aee1bf	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/avatar/Head.cpp interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/devices/3DConnexionClient.cpp interface/src/ui/overlays/Overlays.cpp	2015-08-06 11:03:37 -07:00
David Rowe	d7b42e264e	Merge branch 'master' into 20639 ... Conflicts: interface/CMakeLists.txt	2015-08-05 16:49:06 -07:00
Atlante45	3dc8bd47ae	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00
Bradley Austin Davis	89cc2ccfa5	More merge comments	2015-08-05 13:53:19 -07:00
David Rowe	0c174e27c3	Merge branch 'master' into 20639	2015-08-04 18:36:53 -07:00
David Rowe	fae26d901c	Add menu option to render look-at targets	2015-08-04 18:34:56 -07:00
Bradley Austin Davis	4f759ee46a	Merge remote-tracking branch 'upstream/master' into core	2015-08-04 16:26:16 -07:00
Bradley Austin Davis	3c76c0d4b6	Merge remote-tracking branch 'upstream/master' into core	2015-08-04 10:23:54 -07:00
Bradley Austin Davis	53ccbfc4fa	Merge branch 'core' into plugins	2015-08-03 22:25:50 -07:00
Sam Gondelman	d182199c71	adding the rest of the shaders to shaders-test	2015-08-03 12:08:14 -07:00
samcake	85077604dc	Merge pull request #5478 from jherico/marge ... CORE BRANCH - More shader fixes	2015-08-03 10:25:33 -07:00
Brad Davis	53feaf2ab6	More shader fixes	2015-08-01 20:17:57 -07:00
Bradley Austin Davis	f19653f3e2	Integrate glew	2015-08-01 20:08:19 -07:00
Brad Davis	b84eef93c9	Core profile shader work and test code	2015-08-01 14:43:52 -07:00
Brad Davis	1712ab322f	Fixing includes in test code	2015-07-31 17:46:47 -07:00
Sam Gateau	ca4dbdb996	Merging with upstream and compiling on windows	2015-07-31 16:14:53 -07:00
Brad Davis	aea07fe671	Merge branch 'master' into gl4_1 ... Conflicts: libraries/gpu/src/gpu/Config.slh libraries/render-utils/src/deferred_light_limited.slv libraries/render-utils/src/simple.slf libraries/render-utils/src/simple_textured.slf tests/render-utils/src/main.cpp tools/scribe/src/main.cpp	2015-07-31 15:08:37 -07:00
Andrew Meadows	661a916ebd	merge rig into cleanup (removal of legacy shapes) ... Conflicts: interface/src/avatar/Avatar.h tests/physics/src/ShapeColliderTests.cpp tests/physics/src/ShapeColliderTests.h	2015-07-31 13:40:51 -07:00
Brad Davis	155f88e267	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/devices/TV3DManager.h libraries/gpu/src/gpu/GPUConfig.h	2015-07-31 10:28:06 -07:00
Howard Stearns	b685378ab0	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-31 10:08:30 -07:00
Sam Gateau	14f4c9c6c0	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
Brad Davis	f7a2513f26	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/MyAvatar.h tests/ui/src/main.cpp	2015-07-30 12:55:22 -07:00