14837 commits

Author	SHA1	Message	Date
Seth Alves	84bcfb7d71	hook up a way for scripts to set model-entity joint state	2015-12-22 17:43:01 -08:00
Brad Davis	88d36487f8	Merge pull request #6727 from samcake/hdr ... Clean up shaders removing glowIntensity and alphaThreshold legacy	2015-12-22 15:41:08 -08:00
samcake	f9070ee989	Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore	2015-12-22 12:41:31 -08:00
ericrius1	6fc98bd577	fixed ravestick, merged	2015-12-22 12:03:03 -08:00
ericrius1	fdb909ca31	merged	2015-12-22 09:40:42 -08:00
Brad Hefta-Gaub	3dfc48e205	Merge pull request #6687 from jherico/marketplace ... Support the marketplace in QML	2015-12-21 17:55:55 -08:00
samcake	757e94ed98	Merge pull request #6715 from zzmp/refactor/scene-render-js ... Clean up interfaces for JS Scene/Render	2015-12-21 16:50:41 -08:00
Brad Davis	95c524fba1	Fixing authentication token for followed links	2015-12-21 15:44:35 -08:00
Zach Pomerantz	4df8fa4ac3	Create Render/Scene unique_ptr without C++14 make_unique	2015-12-21 15:39:49 -08:00
Stephen Birarda	ba89c8a97a	remove some extra debug that isn't needed	2015-12-21 16:23:23 -07:00
Stephen Birarda	8c6449a886	fix for stopping a nullptr QTimer	2015-12-21 16:20:06 -07:00
Zach Pomerantz	d8022aa5b0	Add back deferred debugging and combine context init	2015-12-21 14:32:06 -08:00
Zach Pomerantz	c6a2f5b20d	Nest JS props in RenderScriptingInterface	2015-12-21 14:32:06 -08:00
Zach Pomerantz	5a86f0c23f	Nest JS props in SceneScriptingInterface	2015-12-21 14:32:06 -08:00
Brad Hefta-Gaub	111a8caa3c	Merge pull request #6701 from highfidelity/graphics ... Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool	2015-12-21 13:54:50 -08:00
ericrius1	1cdee11784	Merge branch 'master' into polylineOptimizations	2015-12-21 12:49:00 -08:00
samcake	4f54b85c92	Remove warnings	2015-12-21 12:05:19 -08:00
samcake	ae124ebede	Tuning the proedural shader support to work with the current default: gamma corrected emissive	2015-12-21 12:00:30 -08:00
Brad Davis	6ef77bc46a	Support the marketplace in QML	2015-12-21 11:34:03 -08:00
samcake	492572df45	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-21 11:26:15 -08:00
Brad Davis	05b7fcc957	Remove script -> qt::webchannel dependency	2015-12-21 11:19:05 -08:00
samcake	6bbc94badc	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-21 10:48:55 -08:00
samcake	4c2d5c54c4	Merge branch 'hdr' of https://github.com/samcake/hifi into hdr	2015-12-21 10:43:41 -08:00
samcake	aef748b894	Adding linear color in Particule system	2015-12-21 10:40:29 -08:00
Brad Davis	46a4a469e9	Merge pull request #6689 from ZappoMan/rightClickMenu ... Some early work to support hand driven reticle	2015-12-20 17:49:50 -08:00
Seth Alves	d71cecbc61	Merge pull request #6675 from AndrewMeadows/crash-fix ... fix crash when visiting new domain with gun in hand	2015-12-20 06:24:44 -08:00
samcake	1e8e3fec87	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-19 11:38:20 -08:00
Brad Hefta-Gaub	e929e3f789	more work on angular velocity tests	2015-12-18 19:20:32 -08:00
Brad Davis	6098c4a1d6	Revert "Revert "Migrate QML based web views to Qt WebEngine"" ... This reverts commit 1f3adeb666.	2015-12-18 17:18:46 -08:00
samcake	7e66515beb	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 17:13:48 -08:00
Brad Davis	1f3adeb666	Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:38 -08:00
samcake	41525a7c4d	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 16:20:41 -08:00
Brad Hefta-Gaub	4075f355a3	more work on hand movement	2015-12-18 15:44:01 -08:00
samcake	f24800cf10	Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script	2015-12-18 15:35:01 -08:00
Brad Hefta-Gaub	868d10651a	Merge pull request #6651 from jherico/webengine ... Migrate QML based web views to Qt WebEngine	2015-12-18 14:56:35 -08:00
Brad Davis	88b88a3306	Fixing warnings	2015-12-18 14:32:35 -08:00
Brad Hefta-Gaub	42764426ce	Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu	2015-12-18 14:30:16 -08:00
Andrew Meadows	aa3d1c6e4c	Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix ... ModelEntityItem: Fix for incorrect animations with preTranslations	2015-12-18 14:16:35 -08:00
Seth Alves	154bf5978b	Merge pull request #6697 from samcake/hdr ... Graphics: Adding gamma correction to color vertex attribute	2015-12-18 14:11:14 -08:00
Andrew Meadows	eb3210071e	Merge pull request #6664 from hyperlogic/tony/idle-to-walk-transition ... Improved idle to walk forward transition	2015-12-18 13:59:03 -08:00
samcake	19769ddd8f	Merge pull request #6691 from zzmp/refactor/scene-render ... Split JS global Scene into Scene and Render	2015-12-18 13:57:25 -08:00
samcake	0492bb1c6d	Final cleans and tests using R11G11B10 for lighting buffer	2015-12-18 13:50:28 -08:00
Eric Levin	2e4df5f859	Merge pull request #6692 from ctrlaltdavid/20758 ... Update particlesTest.js per current particles implementation	2015-12-18 13:35:19 -08:00
samcake	f6c80e01e9	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-18 13:23:09 -08:00
samcake	5a4d028573	Merge pull request #6699 from samcake/graphicsMaster ... Graphics : merge upstream master into upstream graphics	2015-12-18 13:23:05 -08:00
samcake	0482a2a7f7	Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr	2015-12-18 13:20:46 -08:00
samcake	d22811a771	Merge pull request #6698 from zzmp/fix/check-locations-pipeline ... Stop modelMesh render if pipeline is not found	2015-12-18 13:20:12 -08:00
samcake	dff4327f7d	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 13:18:30 -08:00
Zach Pomerantz	2c2b794683	Stop modelMesh render if pipeline is not found	2015-12-18 13:16:05 -08:00
samcake	3014b3bd5b	Adding Gamma correction to all the Color coming for the attribute stream if used as color	2015-12-18 12:50:21 -08:00