14871 commits

Author	SHA1	Message	Date
Seth Alves	5e4a165b4d	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-22 11:23:09 -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
Seth Alves	1d9f3097da	trying to track down why equips fail after a few minutes	2015-12-21 15:16:55 -08:00
Seth Alves	c84fa5f821	cleanups	2015-12-21 14:45:18 -08: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
Seth Alves	76df582a6c	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 14:29:32 -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
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
Seth Alves	68cfda1af9	try again on AACube::operator +=	2015-12-21 11:34:53 -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
Seth Alves	00e0b26f05	fix thinko and whitespace	2015-12-21 11:15:54 -08:00
Seth Alves	3c2dac5cf8	parent query-cube should encompass child query-cube not child max-aa-cube	2015-12-21 11:05:07 -08:00
Seth Alves	abaa329984	parents AACube should encompass all children's	2015-12-21 10:55:07 -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
Seth Alves	1d9a81d5d4	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 09:14:37 -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
Seth Alves	b82559e898	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-19 07:08:25 -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
Seth Alves	4c996885e5	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-18 17:15:29 -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
Seth Alves	f60240e3f3	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-18 16:28:51 -08:00
Seth Alves	d7e08876da	Merge branch 'near-grab-via-parenting' of github.com:sethalves/hifi into near-grab-via-parenting	2015-12-18 16:28:34 -08:00
Seth Alves	701f99d28e	only send a queryAACube for entities to entity-server	2015-12-18 16:28:11 -08:00
samcake	41525a7c4d	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-18 16:20:41 -08:00
Seth Alves	3782c21b45	when a parent moves, check children vs their queryAACubes	2015-12-18 16:06:51 -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
Seth Alves	9b49d9d66b	default parentJointIndex to -1	2015-12-18 15:10:51 -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
Seth Alves	13ad6bf2f7	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-18 14:52:02 -08:00
Seth Alves	69bba4a182	queryAABox wasn't centered on object	2015-12-18 14:46:24 -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