26031 commits

Author	SHA1	Message	Date
Ken Cooke	e2e4e7f423	Re-implement collision sound pitch shifting	2018-01-19 16:03:59 -08:00
Ken Cooke	a421ba7649	Add "pitch" parameter to scriptable audio injector options. ... Used in playSound() to pitch-shift the audio when injector is created.	2018-01-19 14:50:51 -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
Seth Alves	45406177e5	avoid a deadlock when clearing avatar entities	2018-01-17 17:56:25 -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
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
Anthony J. Thibault	51ea2632c0	Remove Avatar UseAnimPreAndPostRotations option. ... This should always be true and can lead to hard to diagnose bugs if it is ever set to false.	2018-01-16 17:27:19 -08:00
NissimHadar	9a382ebb86	Merge pull request #12177 from NissimHadar/defaultAmbientFix ... Set ambient mode to inherit if no URLs have been entered.	2018-01-16 14:40:08 -08:00
MiladNazeri	d356f4faf9	Merge pull request #12143 from ctrlaltdavid/21679 ... location API JSDoc	2018-01-16 12:32:25 -08:00
Clément Brisset	858221d4db	Merge pull request #12118 from Atlante45/fix/avatar-mixer-crash ... Fix concurrent access crash in avatar mixer	2018-01-16 11:07:59 -08:00
David Rowe	f836a5f2b6	Fix typo	2018-01-17 08:06:04 +13:00
Mohammed Nafees	885801c5ca	Fix copying to clipboard from JS scripts	2018-01-16 13:17:47 -05:00
Sam Gondelman	3879626205	Merge pull request #12176 from SamGondelman/rendering ... Fix animation crash, make last frame inclusive	2018-01-16 10:05:48 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Seth Alves	b17913366a	Merge pull request #12178 from ctrlaltdavid/21694 ... Support FBX files that have nodes with non-XYZ rotation order	2018-01-16 07:50:11 -08:00
Olivier Prat	6686b328c7	Fixed error in Specular shader which gave low key specular highlights	2018-01-16 10:47:46 +01:00
David Rowe	02179e3efd	Doc review	2018-01-16 17:14:30 +13:00
David Rowe	f319fa70cb	Merge branch 'master' into 21679	2018-01-16 16:22:34 +13:00
Nissim Hadar	f2d272b6fe	Merge branch 'master' of https://github.com/highfidelity/hifi into defaultAmbientFix	2018-01-15 17:56:19 -08:00
Nissim Hadar	daa6409936	Improved comments.	2018-01-15 17:33:48 -08:00
David Rowe	67218a697b	Support FBX files that have nodes with non-XYZ rotation order	2018-01-16 14:01:20 +13:00
Nissim Hadar	a1415e28ff	If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit.	2018-01-15 15:11:10 -08:00
SamGondelman	f1253e3c6c	fix crash on last frame = first frame, make last frame inclusive	2018-01-15 15:01:17 -08:00
Ryan Huffman	9b7520ddba	Merge pull request #12173 from sethalves/atp-get-mapping ... expose GetMappingRequest to js	2018-01-15 13:42:19 -08:00
Sam Gateau	2f5d2bef49	Merge pull request #12028 from Zvork/roughness_metal ... Lighting model update for better specular	2018-01-15 10:51:18 -08:00
Seth Alves	76048f3c30	error handling	2018-01-15 10:48:12 -08:00
Dante Ruiz	645f608814	fixing merge conflict	2018-01-15 10:45:51 -08:00
Dante Ruiz	c76fdd1f5f	adding scale	2018-01-15 10:43:26 -08:00
Zach Fox	f7ed8c10fa	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-15 10:13:07 -08:00
Seth Alves	3e7d303661	export atp GetMappingRequest to js	2018-01-15 09:56:46 -08:00
Anthony Thibault	0a54241fe3	Merge pull request #12092 from hyperlogic/feature/dual-quat ... Fix tootsie roll wrists and shoulders with dual quaternion skinning	2018-01-12 16:30:03 -08:00
Dante Ruiz	283b9a8003	fix softEntity edge cases	2018-01-12 15:31:54 -08:00
Brad Hefta-Gaub	68de7f864e	Merge pull request #12162 from kencooke/audio-stereo-mic ... Support for stereo audio input/mic	2018-01-12 13:29:28 -08:00
David Rowe	1fa31d3c10	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
NissimHadar	e580a19677	Merge pull request #12147 from NissimHadar/noBackgroundModeFix ... Dealing with legacy domains.	2018-01-12 12:42:11 -08:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Anthony J. Thibault	088f227df2	Pass model offset from avatar skeletonModel to attached entity	2018-01-12 10:26:02 -08:00