1751 commits

Author	SHA1	Message	Date
Seth Alves	47ea32f4d3	vertex color support in ModelScriptingInterface	2017-07-23 08:06:26 -07:00
Seth Alves	72e5fecb4e	do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex	2017-07-20 16:34:34 -07:00
Seth Alves	a8698c2fbc	EntityScriptingInterface::getMeshes support for Model entities	2017-07-19 08:59:09 -07:00
Zach Fox	974dff36b0	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00
Zach Fox	147474e19a	Logging category and filter	2017-07-17 11:17:59 -07:00
Zach Fox	e602d3610e	Initial commit for HoverOverlayInterface	2017-07-14 17:26:53 -07:00
Sam Gateau	5394ac8672	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +02:00
Sam Gateau	49779754ff	Remove unecessary shaders and apply the custom shader pipeline to polyvox	2017-07-12 15:50:06 +02:00
Sam Gateau	98cc8c0683	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
Sam Gateau	0c3755483b	adding assert or checks whenever getting a scene stage	2017-07-10 12:37:26 +02:00
Sam Gateau	c3dd25e499	Drafting the mechanism to add shape pipeline	2017-07-07 18:26:10 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Sam Gateau	ca7e782566	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-29 10:54:27 +02:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Brad Davis	28d727153b	PR feedback	2017-06-27 19:22:07 -07:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
Sam Gateau	904f22985c	CLeaning up comments	2017-06-26 16:43:04 +02:00
samcake	17e2140826	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-23 13:28:58 -07:00
samcake	20d8c11e28	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
Sam Cake	07e18eb3a8	Keep cleaning up the DeferredLightingEffect , removing stage s from there...	2017-06-22 01:12:32 -07:00
Atlante45	49623fefd8	Fix Skyboxes sometimes not showing	2017-06-21 11:40:32 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
howard-stearns	3d4f9be05b	fix teleport vs stuck-in-floor work	2017-06-12 17:01:13 -07:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Brad Davis	171d3212fe	Merge pull request #10623 from jherico/qml_engine_singleton ... Migrate to single QML engine	2017-06-06 15:00:43 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Howard Stearns	3d62900daf	When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works.	2017-06-03 16:49:16 -07:00
samcake	14f9a9848e	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-01 18:05:47 -07:00
samcake	9c1e99fe3f	Removing cruft and organizing the stencil config	2017-06-01 13:06:22 -07:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
samcake	cba913c068	Fixing the case when the bound changes without the rest of the properties	2017-05-25 13:01:54 -07:00
Zach Fox	f2fab57187	Update conditional to handle 'other unowned' case	2017-05-25 13:01:40 -07:00
Zach Fox	be39874999	Changes after discussion with Brad	2017-05-25 13:01:40 -07:00
Zach Fox	f6195cdb1e	Committing checkpoint changes, then testing	2017-05-25 13:01:40 -07:00
Zach Fox	4d791211ee	Make the changes - big thanks to Andrew!	2017-05-25 13:01:40 -07:00
Sam Cake	3eb95d2d19	cleaning the commented code	2017-05-25 01:16:45 -07:00
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -07:00
samcake	c256893575	some clean up:	2017-05-23 18:00:22 -07:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00
Sam Gateau	589bcc19ce	Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer	2017-05-19 17:50:19 -07:00
Andrew Meadows	f80e7a3743	less obfuscation	2017-05-19 15:58:54 -07:00
Andrew Meadows	bb4d366c40	use SmartPointer for Zone _model	2017-05-19 15:33:23 -07:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -07:00
samcake	2cd2c95940	Adding more debugging tool	2017-05-16 16:12:31 -07:00