21403 commits

Author	SHA1	Message	Date
Andrew Meadows	b2abe5aa04	Merge pull request #9956 from mittens/master ... Tweaks to the Physics Simulation Ownership Icon Rendering	2017-03-21 09:29:50 -07:00
Brad Hefta-Gaub	ac309df3d1	Merge pull request #9946 from sethalves/model-scripting-1 ... Model scripting	2017-03-21 09:26:32 -07:00
Chris Collins	3f30909579	Merge pull request #9961 from Atlante45/feat/delete_dead_code ... Delete old sitting points code	2017-03-21 08:03:46 -07:00
Zach Pomerantz	b6d111369f	Merge pull request #9935 from zzmp/fix/audio-initialization ... Fix data race in audio output initialization	2017-03-21 00:23:28 -04:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Atlante45	73dd2abdaf	Delete old sitting points code	2017-03-20 17:29:44 -07:00
trent	3b8636b75c	Doubled-ish the size of the physics status icons, fixed texture coordinates to be right-side up.	2017-03-20 17:55:52 -04:00
Andrew Meadows	92e3f8768c	Merge pull request #9921 from jherico/menu_fix ... Fix possible crash in Menu::removeSeparator	2017-03-20 13:38:36 -07:00
Brad Hefta-Gaub	bc5d7d8698	Merge pull request #9851 from AndrewMeadows/simulation-ownership-2 ... zero velocity of deactivated dynamic entities	2017-03-20 10:20:11 -07:00
Brad Hefta-Gaub	ccce4b4d29	Merge pull request #9948 from sethalves/fix-obj-with-no-material ... fix obj sans material	2017-03-20 10:09:36 -07:00
Chris Collins	509057c6d8	Merge pull request #9941 from Triplelexx/21232 ... 21232 - Remove Mini Mirror from View menu	2017-03-20 09:55:37 -07:00
Chris Collins	308c134119	Merge pull request #9686 from humbletim/21114-part3 ... CR 21114 -- Implement modules/require support into hifi	2017-03-20 06:22:35 -07:00
Sam Cake	3a08611c26	Fix the typo in the assert for isWireframe	2017-03-19 17:33:28 -07:00
Seth Alves	b876d22e46	fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels	2017-03-18 22:36:24 -07:00
Seth Alves	b945d9c4cb	fix a bug that caused obj models with no material to randomly use the materials of other things in the view	2017-03-18 14:34:19 -07:00
Seth Alves	35c38b8130	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1	2017-03-18 10:18:27 -07:00
Seth Alves	488ed081dd	Mesh::forEach and Mesh::map	2017-03-18 10:18:04 -07:00
Triplelexx	8b845658e2	remove redundant declarations	2017-03-18 05:00:05 +00:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
samcake	e1a0984fed	Merge pull request #9906 from samcake/red ... Expose rendering in wireframe mode	2017-03-17 17:09:44 -07:00
Seth Alves	b3603ce8b3	Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now	2017-03-17 16:52:56 -07:00
Brad Hefta-Gaub	a75acd139b	Merge pull request #9885 from sethalves/model-scripting ... Model scripting	2017-03-17 13:13:17 -07:00
Zach Pomerantz	a68146e7d9	mv audio output init to output thread	2017-03-17 15:31:00 -04:00
Ken Cooke	652c80057e	Merge pull request #9924 from zzmp/fix/noise-delay ... Use single frame buffer for local audio injectors	2017-03-17 11:24:02 -07:00
Seth Alves	16c3eb62b1	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1	2017-03-17 08:54:32 -07:00
Seth Alves	bbad6a0eb7	mesh-append works, mesh-transform doesn't?	2017-03-16 17:26:07 -07:00
Seth Alves	0e8d62c11e	delete dead code	2017-03-16 15:24:39 -07:00
Seth Alves	200550aba9	ModelScriptingInterface::appendMeshes	2017-03-16 15:22:34 -07:00
Zach Pomerantz	db956f4cc3	use single frame buffer for local audio	2017-03-16 18:06:18 -04:00
Brad Hefta-Gaub	3fe4d6e733	Merge pull request #9910 from jherico/vs2017 ... Fix build problems on VS 2015 and VS 2017	2017-03-16 14:41:33 -07:00
humbletim	87d62ad1eb	Merge branch 'master' into 21114-part3	2017-03-16 16:39:37 -04:00
Stephen Birarda	a69cf76d06	Merge pull request #9879 from birarda/bug/no-unload ... make sure deleted entities are unloaded first	2017-03-16 13:29:36 -07:00
Brad Davis	e265a0a1f8	Fix possible crash in Menu::removeSeparator	2017-03-16 13:12:30 -07:00
Seth Alves	eba2417f41	Merge pull request #9912 from AndrewMeadows/model-cleanup-4 ... minor cleanup of render pipeline for models and avatars	2017-03-16 10:39:43 -08:00
humbletim	758c07c7d4	Merge branch 'master' into 21114-part3	2017-03-16 14:29:17 -04:00
samcake	4ef7fc61f0	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2017-03-16 10:43:07 -07:00
Seth Alves	a3fadbc367	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1	2017-03-16 09:38:56 -07:00
Seth Alves	31e0cfe296	Merge pull request #9825 from thoys/record-fixes ... Avatar Recorder and Playback Fixes	2017-03-16 07:27:42 -08:00
humbletim	366c90ef6a	add Q_ASSERT to IS_THREADSAFE_INVOCATION	2017-03-16 01:28:50 -04:00
humbletim	52a571558c	* changes per CR feedback ... * revert JSON content-type workaround * add specific error check / advice for unanchored module ids * update unit tests	2017-03-16 01:23:23 -04:00
samcake	0399249a03	Expeand the wireframe to the primitive entities and the polyvox	2017-03-15 16:58:31 -07:00
Seth Alves	693aee0628	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting	2017-03-15 16:54:40 -07:00
Andrew Meadows	d3fa28d4bc	remove cruft and fix indentation	2017-03-15 16:17:59 -07:00
Brad Davis	2837ae9183	More VS 2017/2015 fixes	2017-03-15 16:13:15 -07:00
Andrew Meadows	cf848d73e4	don't updateClusterMatrices() in render()	2017-03-15 16:03:36 -07:00
Brad Davis	b8ded015c6	Fix packetlist compilation on VS 2017	2017-03-15 15:20:41 -07:00
Andrew Meadows	f250c0d298	simpler bindTransform() for ModelMeshPartPayload	2017-03-15 14:41:13 -07:00
Brad Davis	3e68018a12	Fix node persmissions hash	2017-03-15 14:33:32 -07:00
Brad Hefta-Gaub	ed380a7738	Merge pull request #9895 from zzmp/clean/noise-gate ... Strip AudioNoiseGate of dead code	2017-03-15 13:21:56 -07:00
samcake	ea2f1359bc	Expose rendering in wireframe mode	2017-03-15 12:23:44 -07:00