26065 commits

Author	SHA1	Message	Date
John Conklin II	db5bf68431	Merge pull request #12203 from ctrlaltdavid/21703 ... Display both lasers on tablet and Web surfaces	2018-01-19 15:15:44 -08:00
David Rowe	24dcc8788c	Code review	2018-01-20 10:07:23 +13:00
John Conklin II	c366ed42ab	Merge pull request #12202 from amantley/urlbug ... added a property check in renderableModelEntity for the animation url…	2018-01-19 12:52:43 -08:00
David Rowe	94e6a68d41	Code review	2018-01-20 09:50:24 +13:00
Zach Fox	9d6e62d6bf	Merge pull request #12163 from ElderOrb/FB11109 ... FB11109 Preview disabled image swap (Commerce only)	2018-01-19 11:40:05 -08:00
Sam Gateau	9a8246f2b9	Merge pull request #12215 from Zvork/brdf ... Normalized diffuse & specular for directional, point and spot lights	2018-01-19 11:08:29 -08:00
Seth Alves	63cd472fca	Merge pull request #12185 from AndrewMeadows/physics-shouldnt-set-dirty-flags ... fix race condition whereby physics may incorrectly overwrite script/network property change	2018-01-19 11:06:22 -08:00
Sam Gateau	ce550b4fa6	Merge pull request #12209 from SamGondelman/textures ... Watch for attachment texture loading	2018-01-19 10:08:04 -08:00
Olivier Prat	12c48a38f7	Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials.	2018-01-19 13:58:35 +01:00
David Rowe	fb684909ce	Merge branch 'master' into 21703	2018-01-19 17:25:12 +13:00
David Rowe	e0e6fc711b	Replace Pointers API function setNonHoverItems() with setDoesHover()	2018-01-19 16:05:09 +13:00
Alexander Ivash	67e816756c	make gcc happy	2018-01-19 01:51:41 +00:00
Andrew Meadows	75b5635d2f	less word salad	2018-01-18 17:43:22 -08:00
Andrew Meadows	3d3bfcf7a3	check dirty flags when harvesting physics results	2018-01-18 17:43:22 -08:00
Clément Brisset	37504eca15	Merge pull request #12186 from ctrlaltdavid/21702 ... Add Window.protocolSignature() as a replacement for location.protocolVersion()	2018-01-18 15:20:03 -08:00
Elisa Lupin-Jimenez	42b8c293d6	Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name ... Fixed typo in macro name	2018-01-18 14:44:43 -08:00
Brad Hefta-Gaub	61a5750b09	Merge pull request #12204 from druiz17/fix-dynamic-entities-not-colliding ... Fix dynamic entities not colliding with avatar when a grab action is removed	2018-01-18 14:39:21 -08:00
Clément Brisset	956f45b5af	Merge pull request #11932 from birarda/bug/baking-folder-number ... fix sparse rectification for small textures, export for same model at diff URL	2018-01-18 14:25:33 -08:00
amantley	961ed88fb0	fixed coding standards in RenderableModelEntityItem.cpp	2018-01-18 12:56:24 -08:00
SamGondelman	c8aded0688	watch for attachment texture loading	2018-01-18 12:40:02 -08:00
Alexander Ivash	50217726c0	remove extra qualification from DesktopPreviewProvider::getInstance() in .h	2018-01-18 23:26:43 +03:00
Alexander Ivash	be3789e70a	show warning on attempt to force 'VSYNC' preview reason	2018-01-18 23:26:43 +03:00
Alexander Ivash	576ae227a8	move imagePaths into .h so simplify matching enum values to image files	2018-01-18 23:26:43 +03:00
Alexander Ivash	744da710a3	move VSYNC into 'PreviewDisabledReasons' enum	2018-01-18 23:26:43 +03:00
Alexander Ivash	a74b093b60	FB11109 Preview disabled image swap (Commerce only)	2018-01-18 23:26:43 +03:00
amantley	1c97272767	Cleaned up the code a bit so that there is no need for a new class variable for properties to verify the change of url	2018-01-18 12:09:28 -08:00
David Rowe	8c2427dd58	Rename Window.protocolVersion() to Window.protocolSignature()	2018-01-19 09:06:16 +13:00
Atlante45	482ca3f038	Make type name hash static const	2018-01-18 10:28:43 -08:00
Dante Ruiz	92f8f9d2c0	Merge pull request #12200 from sethalves/fix-avatar-entity-delete-deadlock ... avoid a deadlock when clearing avatar entities	2018-01-18 10:07:07 -08:00
Sam Gateau	dd436229c1	Merge pull request #12193 from SamGondelman/transparent ... Fix black flashing on transparent objects	2018-01-18 09:11:46 -08:00
Dante Ruiz	3e3b3a0a9e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dynamic-entities-not-colliding	2018-01-18 08:56:01 -08:00
Dante Ruiz	93594fb0bb	make dynamic entities collide with avatar when removing grab action	2018-01-18 08:55:51 -08:00
amantley	9f484a7f57	Removed extraneous comments in RenderableItemEntity.cpp and .h	2018-01-18 08:54:05 -08:00
amantley	4eb2a5cf5e	added a property check in renderableModelEntity for the animation url this fixes the bug stopping you from changing animations on an entity	2018-01-17 19:25:20 -08:00
Elisa Lupin-Jimenez	49e72346a4	fixed typo in macro name	2018-01-17 18:08:05 -08:00
Seth Alves	45406177e5	avoid a deadlock when clearing avatar entities	2018-01-17 17:56:25 -08:00
David Rowe	ee2936d133	Add Pointers API function that disables hover events for nominated items	2018-01-18 14:07:07 +13:00
Zach Fox	5ce768f402	Merge pull request #12151 from zfox23/commerce_sendMoney1 ... Commerce: P2P Transfer Iteration 1	2018-01-17 16:41:56 -08:00
SamGondelman	a44c965f56	fix black flashing on transparent objects	2018-01-17 15:59:07 -08:00
Seth Alves	fda4cf10b9	Merge pull request #12159 from Zvork/compactvb ... Fix potential assert exception in FBXMesh_Reader.cpp	2018-01-17 15:16:22 -08:00
Seth Alves	8edded7059	Merge pull request #12164 from ctrlaltdavid/21695 ... Remove old ToolWindow code	2018-01-17 13:43:59 -08:00
Seth Alves	7af90d5429	Merge pull request #12171 from mnafees/21671 ... CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files	2018-01-17 13:42:47 -08:00
Seth Alves	33c586de60	Merge pull request #12188 from hyperlogic/feature/small-anim-refactor ... Remove dangerous "Use Anim Pre and Post Rotations" menu item	2018-01-17 13:41:51 -08:00
Zach Fox	1d747bc0e4	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-17 11:56:00 -08:00
Sam Gateau	0e72197a37	Merge pull request #12179 from Zvork/specular ... Fixed error in Specular shader which gave low key specular highlights	2018-01-17 10:51:25 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
Anthony J. Thibault	bc587bf6d8	Removal of legacy Rig methods	2018-01-16 18:19:35 -08:00
Sam Gateau	d4571bd86a	Merge pull request #12181 from humbletim/rename-model-graphics ... Rename libraries/model -> libraries/graphics	2018-01-16 18:12:25 -08:00
Anthony J. Thibault	576273efe3	Remove Rig::restoreJointPosition and references to it.	2018-01-16 18:01:58 -08:00
Anthony J. Thibault	1027025b5c	remove bind poses from AnimSkeleton.	2018-01-16 17:41:25 -08:00