63700 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
John Conklin II	ba06e4f633	Merge pull request #12197 from SamGondelman/hotfix ... Hotfix: Fix black flashing on transparent objects	2018-01-18 09:41:53 -08: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
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
David Rowe	ee2936d133	Add Pointers API function that disables hover events for nominated items	2018-01-18 14:07:07 +13:00
David Kelly	1dde25e38f	Don't make links in txn history for highfidelity and marketplace	2018-01-17 16:51:38 -08: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
Zach Fox	c63453175e	Merge pull request #12196 from zfox23/commerce_robustReceiveAt ... Make the call to receiveAt more robust	2018-01-17 16:41:07 -08:00
SamGondelman	46a2090370	fix black flashing on transparent objects	2018-01-17 16:08:12 -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
Zach Fox	16d51986a9	Make the call to receiveAt more robust	2018-01-17 15:11:58 -08:00
Dante Ruiz	8f22c719b3	Merge pull request #12099 from sethalves/run ... allow avatar walk-speed to be set from javascript	2018-01-17 13:53:13 -08:00
Liv Erickson	88ba5e5a00	change ImageOverlay to use AnimatedImage instead of Image to support .gif files in image overlay objects	2018-01-17 13:45:56 -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
Stephen Birarda	c90cdf52b4	remove unecessary parenting of Agent script engine	2018-01-17 11:02:56 -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
David Back	92c0fd4877	Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS ... Merge Account & GlobalServices follow-up	2018-01-17 10:50:54 -08:00
Seth Alves	1e847cf32e	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-17 08:08:13 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
Seth Alves	d3084dc0df	defang	2018-01-17 07:11:27 -08:00
Seth Alves	bfccb52b7a	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-17 07:02:14 -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