21553 commits

Author	SHA1	Message	Date
Brad Davis	3a40fd886f	Fix comparison between GL stamps and GPU stamps	2017-03-22 18:11:20 -07:00
Brad Davis	4868a1618a	Add initialization to sampler stamp	2017-03-22 18:10:54 -07:00
Brad Davis	893fcba283	Return the correct format and internal format combo for depth textures	2017-03-22 17:14:40 -07:00
Brad Davis	9a3686fc1a	Fixing merge conflict	2017-03-22 14:55:11 -07:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Andrew Meadows	a463013d90	Merge pull request #9960 from samcake/blue ... Fix Ambient Lighting equation	2017-03-22 14:13:31 -07:00
Chris Collins	05c40d2930	Merge pull request #9933 from mittens/hotfix/obj-texture-fix ... Fixed the texture assignment for the OBJ loader	2017-03-22 13:19:01 -07:00
Brad Davis	e60108cc8c	PR comments	2017-03-21 17:26:24 -07:00
Brad Davis	a3828ce45c	Fixing comment	2017-03-21 13:42:24 -07:00
Chris Collins	4c789c44aa	Merge pull request #9922 from birarda/bug/stuck-ess ... fix a couple of ESS issues during ES/ESS restart	2017-03-21 12:44:53 -07:00
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
samcake	e05abf2a2f	Fixing the spherical harmonics gneration	2017-03-20 16:41:21 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
samcake	03e1c5e0f2	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-03-20 15:10:09 -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
Stephen Birarda	c63a2c9cda	remove requirement of ScriptEngine in ScriptEngines slots	2017-03-20 13:40:15 -07:00
Stephen Birarda	a4d72c4e67	make AudioScriptingInterface a Dependency	2017-03-20 13:40:15 -07: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
Brad Davis	14c8c3f4db	Return existing textures when matching hash for a previously found live texture	2017-03-20 09:39:29 -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	a804bc723f	Keep pushing and debugging ambient lighting	2017-03-20 00:32:06 -07:00
Sam Cake	3a08611c26	Fix the typo in the assert for isWireframe	2017-03-19 17:33:28 -07:00
Sam Cake	8584d80bb8	KEep exploring the ambient lighting	2017-03-19 17:00:42 -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
samcake	8b8f9d7b1a	Fix a problem of the ambient lighting diffuse beeing too sstrong, we found a nice balance together with Alan	2017-03-17 18:26:48 -07: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
trent	f1e81c34a3	Fixed the texture assignment for the OBJ loader (it wasn't doing anything with the spceular texture)	2017-03-17 14:34:17 -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
Brad Davis	813e3a1bca	Fix issue with scaling prior to KTX serialization	2017-03-17 08:05:52 -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