63845 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ZappoMan	8364f64d4d	Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters	2018-01-18 15:08:27 -08:00
ZappoMan	25f5eb6b4f	named property example	2018-01-18 15:08:13 -08:00
Brad Hefta-Gaub	f3dfad6c59	Merge pull request #12155 from ctrlaltdavid/21689 ... Remove unused "anchor" Overlays property	2018-01-18 15:04:41 -08:00
Sam Gateau	aec99db4fc	Merge pull request #12157 from AndrewMeadows/lod-debug-ui ... add scripted/qml debug UI for render LOD	2018-01-18 15:00:50 -08:00
Brad Hefta-Gaub	4485ed8613	Merge pull request #12073 from NissimHadar/QtImageCompare ... Improved functionality	2018-01-18 15:00:35 -08:00
Brad Hefta-Gaub	c9cedcb2c0	Merge pull request #12183 from SamGondelman/pointerCrash ... Destroy PointerManager before PickManager	2018-01-18 14:58:20 -08:00
Brad Hefta-Gaub	77837e2cf0	Merge pull request #12194 from misslivirose/feat/exp-gif ... change ImageOverlay to use AnimatedImage instead of Image	2018-01-18 14:57:39 -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
David Kelly	21cc6ee8dd	fix marketplace txn display (memo only)	2018-01-18 14:28:25 -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
David Rowe	13bbd1fcbf	Update places feed to use new function	2018-01-19 10:10:33 +13:00
David Kelly	2b7576cef5	Merge branch 'master' of github.com:highfidelity/hifi into dk/placesInHfcTransferHistory	2018-01-18 13:00:07 -08:00
amantley	961ed88fb0	fixed coding standards in RenderableModelEntityItem.cpp	2018-01-18 12:56:24 -08:00
Stephen Birarda	35f83ad3cd	Merge pull request #12150 from Atlante45/fix/exit-crash ... Make type name hash static const	2018-01-18 13:45:58 -07:00
David Kelly	9a523ead31	fix link	2018-01-18 12:44:45 -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	29625953f6	update privacy-specific disabled preview image	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
Zach Fox	13d8d643f7	Also rate limit the bubble sound	2018-01-18 12:05:16 -08:00
Zach Fox	1bda3faaf2	Fix the Space Bubble button flash behavior	2018-01-18 11:23:49 -08:00
David Kelly	2cdbc1159e	nearby hfc transfers should send the location too	2018-01-18 11:15:32 -08:00
Dante Ruiz	d88ff701b5	reduce calls to isPointOnDesktopWindow	2018-01-18 10:48:35 -08:00
Stephen Birarda	95d0e8aa56	Merge pull request #12003 from birarda/bug/double-free-in-agent ... remove unecessary parenting of Agent script engine	2018-01-18 11:33:17 -07:00
Atlante45	482ca3f038	Make type name hash static const	2018-01-18 10:28:43 -08:00
David Kelly	f05d650e0b	Merge pull request #12199 from davidkelly/dk/txnHistorySpecialCase ... Don't make links in txn history for highfidelity and marketplace	2018-01-18 10:15:58 -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
Olivier Prat	902bfac380	Merged with master	2018-01-18 18:31:04 +01:00
Anthony J. Thibault	c5efcf5d6a	Bug fix for cocked head after playing an input recording. ... I thought this was the cause of the Manuscript case 11454 but apparently not.	2018-01-18 09:21:15 -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
Andrew Meadows	2c43138e14	slightly faster auto LOD adjust	2018-01-18 08:53:45 -08:00
Andrew Meadows	80c43bd0f7	fix typo in variable name	2018-01-18 08:53:45 -08:00
Andrew Meadows	9a1a10b4e1	remove cruft and use more correct names	2018-01-18 08:53:45 -08:00
Andrew Meadows	82cab5e4a1	add scripted/qml debug UI for render LOD	2018-01-18 08:53:45 -08:00
David Rowe	403dd3d7d0	Only first laser highlights	2018-01-18 22:31:12 +13: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
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
David Rowe	5878e36ea8	Display both lasers	2018-01-18 14:24:23 +13:00
David Kelly	c661bec8fd	whitespace	2018-01-17 17:15:14 -08:00