22380 commits

Author	SHA1	Message	Date
Chris Collins	0351ac1575	Merge pull request #10401 from jherico/fix_benny_hill_animations ... Fix sped up animations	2017-05-08 09:11:23 -07:00
Chris Collins	b4118e5619	Merge pull request #10394 from zzmp/fix/local-audio-prep ... Guard against local audio crashes	2017-05-08 09:04:41 -07:00
Brad Davis	b63015eaea	Fix sped up animations	2017-05-06 14:34:28 -07:00
Chris Collins	820ed5049b	Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire ... Fix -- dont send non-entity edits to entity-server	2017-05-05 16:37:27 -07:00
Zach Pomerantz	7db404eba0	recast avoid overwriting buffer logic	2017-05-05 18:16:48 -04:00
Zach Pomerantz	ed3fc004a6	avoid assignment-as-test	2017-05-05 18:15:56 -04:00
Clément Brisset	479e810173	Merge pull request #10364 from huffman/fix/ktx-skybox-loading ... Fix progressive loading of KTX skybox textures	2017-05-05 14:11:03 -07:00
Zach Pomerantz	48af83a960	guard against audio injector and local buffer datarace	2017-05-05 17:05:40 -04:00
Zach Pomerantz	cdf6c332a6	prevent overflow of local injectors buffer	2017-05-05 16:29:52 -04:00
Zach Pomerantz	e882e7b648	rm extra lock in audio read	2017-05-05 15:37:01 -04:00
Chris Collins	fd836dcd68	Merge pull request #10366 from Atlante45/feat/normal-map-compression ... Feat/normal map compression	2017-05-05 10:03:01 -07:00
Seth Alves	7f4399b0a3	fix name in entity-edit-an-overlay warning	2017-05-04 19:16:15 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	a7c684e007	entity scripting call to get the nestable-type of an object, by id	2017-05-04 19:05:29 -07:00
Seth Alves	51cb579773	function to turn nestable-type into a string	2017-05-04 19:05:01 -07:00
Seth Alves	d25db099b9	be more effecient about ignoring edits to unknown entities	2017-05-04 18:49:46 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
Clément Brisset	d80704bfbf	Merge pull request #10375 from Atlante45/feat/store-irradiance ... Store irradiance in cached KTX files	2017-05-04 16:00:44 -07:00
Chris Collins	7c36dd3282	Merge pull request #10359 from samcake/ambient ... Fixing the by region update transfer of the compressed texture	2017-05-04 15:52:38 -07:00
Chris Collins	98085b6d26	Merge pull request #10386 from ZappoMan/MyAvatarAttachmentsNotVisibleBug ... fix issue with not seeing your own attachments	2017-05-04 15:51:46 -07:00
Chris Collins	7d1ffe181f	Merge pull request #10340 from huffman/fix/obj-atp ... Fix OBJ material loading not working over ATP	2017-05-04 15:50:52 -07:00
ZappoMan	43a177cf9a	CR feedback	2017-05-04 15:22:44 -07:00
Atlante45	ecda313223	Add runtime access to compression settings	2017-05-04 15:07:59 -07:00
ZappoMan	0e3b65abde	Merge branch 'master' of https://github.com/highfidelity/hifi into MyAvatarAttachmentsNotVisibleBug	2017-05-04 15:06:31 -07:00
Brad Davis	9def788956	Merge pull request #10314 from jherico/avatars-renderer ... Migrate Avatar rendering code to library	2017-05-04 14:23:49 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Ryan Huffman	87a685c4f9	Fix OSX warning in TextureCache	2017-05-04 13:41:20 -07:00
Atlante45	f728ae7955	Remove unecessary normalize	2017-05-04 12:38:27 -07:00
Brad Davis	fb995bebf1	Prevent crash on switching to 3D display twice	2017-05-04 12:04:21 -07:00
Atlante45	542923839d	Change name to VEC2NU8_XY	2017-05-04 10:33:34 -07:00
Atlante45	10289f5423	Format non compressed normal maps to new format.	2017-05-04 10:33:34 -07:00
Atlante45	ea2b188b64	Recompute Y from X/Z for normal maps	2017-05-04 10:33:34 -07:00
Andrew Meadows	7cb2bff4c5	Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash ... Fix vr 2d vr tablet crash	2017-05-04 10:08:55 -07:00
Seth Alves	74a82f92df	return null uuid for failure	2017-05-04 10:05:17 -07:00
Seth Alves	9ab2a61a4b	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 10:04:18 -07:00
Seth Alves	19327ef5a7	Merge pull request #10354 from zzmp/fix/tablet-deadlock ... Fix deadlock from accessing an initializing tablet	2017-05-04 09:52:50 -07:00
Seth Alves	9171995ed3	add a comment	2017-05-03 21:41:00 -07:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
Seth Alves	f61ca1c8ac	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-03 20:34:37 -07:00
Seth Alves	03f416ff4d	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-03 20:32:08 -07:00
Seth Alves	c693687927	react to very small vectors instead of just zero-length ones	2017-05-03 20:23:10 -07:00
Seth Alves	f867a8e718	guard against bad hinge-constraint settings	2017-05-03 20:12:42 -07:00
Atlante45	5e36bebc96	Store irradiance in the KTX files.	2017-05-03 19:46:17 -07:00
Seth Alves	0fff7678bf	code review	2017-05-03 19:07:46 -07:00
Seth Alves	a259d00b63	Merge pull request #10332 from sethalves/bullet-constraints-5 ... Bullet constraints	2017-05-03 16:30:34 -07:00
Seth Alves	c09009ad8b	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-03 16:21:58 -07:00
samcake	26441dbf2f	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-03 14:54:11 -07:00
Sam Gateau	8507fffcc2	Merge pull request #10313 from samcake/ambient-bis ... Fixing the the mip gpu copy for compressed format texture in GL41Backend	2017-05-03 14:50:55 -07:00
Seth Alves	e96c3e84b4	if a script attempts to edit a non-entity, don't send the edit packet over the wire	2017-05-03 13:58:49 -07:00
Chris Collins	c4c62e790b	Merge pull request #10341 from jherico/texture_transfer_crash ... Prevent possible crash in texture buffering thread	2017-05-03 15:50:49 -05:00