54208 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Thijs Wenker	bf81ae78b9	Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix ... # Conflicts: # scripts/system/makeUserConnection.js	2017-04-26 22:52:57 +02:00
David Rowe	a68ee02e8d	Log script start-up	2017-04-27 08:41:29 +12:00
Zach Pomerantz	532284f779	fix tablet resolve typo	2017-04-26 16:28:42 -04:00
Anshuman Dewangan	ed6211fcb7	First commit	2017-04-26 13:26:14 -07:00
Chris Collins	11c21cc871	Merge pull request #10291 from jherico/hotfix_back_merge ... Stable - Master hotfix merge back	2017-04-26 13:25:16 -07:00
Brad Hefta-Gaub	f1bd371fbe	Merge pull request #10175 from PhilipRosedale/springHold ... New Tutorial and entity scripts	2017-04-26 13:16:17 -07:00
Triplelexx	e295ab2778	change location of menu item Create Entities As Grabbable	2017-04-26 21:13:39 +01:00
Thijs Wenker	d05229d3b4	fix conversion	2017-04-26 22:11:56 +02:00
Andrew Meadows	fd874429c1	remove unused cruft	2017-04-26 12:51:16 -07:00
Andrew Meadows	ac751029c0	remove identity cache code	2017-04-26 12:51:16 -07:00
Andrew Meadows	4511156d7b	cache avatar identity info forever	2017-04-26 12:50:48 -07:00
Andrew Meadows	08972da843	remove unused Node::_isAlive cruft	2017-04-26 12:47:56 -07:00
Andrew Meadows	75c2776836	remove keep-alive packet from avatar-mixer	2017-04-26 12:47:27 -07:00
Thijs Wenker	20a9b60e7b	this might make it work	2017-04-26 21:42:36 +02:00
ZappoMan	7840377109	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 12:39:30 -07:00
ZappoMan	5dd6daaad7	send identity on nodeActivated not nodeAdded	2017-04-26 11:42:38 -07:00
Andrew Meadows	ac6d4969d6	Merge pull request #10270 from Atlante45/fix/unload ... Fix entity script unloads	2017-04-26 11:42:14 -07:00
Ryan Huffman	1555fc3088	Update Resource to only clear load priorities if successful	2017-04-26 11:37:48 -07:00
Ryan Huffman	01724c9c90	Update default load priority to be 0	2017-04-26 11:37:47 -07:00
Ryan Huffman	0f461a2188	Fix priority being reset when requesting low mips	2017-04-26 11:37:47 -07:00
Ryan Huffman	3184ddb29f	Fix duplicate low mip calculation in NetworkTexture	2017-04-26 11:32:36 -07:00
Ryan Huffman	29641ba69a	Fix min mip not being written to ktx correctly	2017-04-26 11:32:36 -07:00
Ryan Huffman	4f16eb9bcc	Cleanup KTX logging and add fragment to resource url to indicate mip level	2017-04-26 11:32:35 -07:00
ZappoMan	517bbc795f	interface/	2017-04-26 11:29:42 -07:00
Ryan Huffman	b9ec573c8b	Update gl41 an gl45 texture backends to take into account min avail mip	2017-04-26 11:21:43 -07:00
Dante Ruiz	4df953d510	fixed text issue	2017-04-26 19:14:14 +01:00
Brad Davis	0a1f8ead25	Merge remote-tracking branch 'upstream/stable' into hotfix_back_merge ... Conflicts: libraries/gpu-gl/src/gpu/gl45/GL45BackendVariableTexture.cpp	2017-04-26 11:06:33 -07:00
samcake	2d4ac0fc43	Bringing a fix to the ImageReader::read crash to stable	2017-04-26 11:04:48 -07:00
Triplelexx	06b3b84145	changes from CR	2017-04-26 18:50:15 +01:00
Ryan Huffman	674e767513	Remove MipInterestListener	2017-04-26 10:49:49 -07:00
Ryan Huffman	9505bf746c	Fix lower mips not being downloaded after initial mips	2017-04-26 10:49:23 -07:00
Ryan Huffman	4d48cb2e80	Remove extraneous glTextureParameteri logging	2017-04-26 10:49:23 -07:00
Ryan Huffman	f5bb42b19f	Remove request of mip from GL45BackendVariableTexture	2017-04-26 10:49:23 -07:00
Ryan Huffman	65d30d1d0b	Remove lowestRequestMip from gltexture	2017-04-26 10:49:23 -07:00
Ryan Huffman	51ee058c0b	Update GLTexture to not promote if we can't populate	2017-04-26 10:49:23 -07:00
Ryan Huffman	382fe5d38d	Update gpu backend to only transfer if it can populate	2017-04-26 10:49:23 -07:00
Ryan Huffman	d338ccac26	Update NetworkTexture to automatically download all mips	2017-04-26 10:49:23 -07:00
Atlante45	a2f7a88433	Start drawing models before we get the textures	2017-04-26 10:49:23 -07:00
Ryan Huffman	e4c21627f9	Remove unused newHeader from Writer.cpp	2017-04-26 10:49:23 -07:00
Ryan Huffman	c10e394ad7	Fix unfailable condition in for loop	2017-04-26 10:49:23 -07:00
Ryan Huffman	430edb1560	Fix loss-of-precision warning in TextureCache	2017-04-26 10:49:23 -07:00
Ryan Huffman	e768b720ea	Fix load priority for ktx loading	2017-04-26 10:49:23 -07:00
Atlante45	043c587395	Fix byte range for file resource requests	2017-04-26 10:49:23 -07:00
Atlante45	194541b2d0	remove temp code	2017-04-26 10:49:23 -07:00
Atlante45	8269e01474	Fix atp-get compile error	2017-04-26 10:49:23 -07:00
Atlante45	6fb074715e	Fix alpha rendering bug	2017-04-26 10:48:57 -07:00
Stephen Birarda	3928e11611	fix valid byte range check and send asset from 0	2017-04-26 10:48:57 -07:00
Stephen Birarda	d9c5997b63	fix references to TextureCache in NetworkTexture	2017-04-26 10:48:57 -07:00
Stephen Birarda	814970c4e2	cleanup invalid byte range handling	2017-04-26 10:48:57 -07:00
Stephen Birarda	7a3219d8f9	force a negative to in ATP byte range to be invalid	2017-04-26 10:48:57 -07:00