54094 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	ef27d30e85	Fix NetworkTexture self possibly being null when attempting request	2017-04-27 13:35:52 -07:00
Chris Collins	9f688a08cd	Merge pull request #10302 from Atlante45/new-master ... Pull stable back into master	2017-04-27 11:51:46 -07:00
Philip Rosedale	f555291d92	Merge pull request #10296 from Triplelexx/21296 ... 21296 - Move two menu items	2017-04-27 11:37:07 -07:00
Atlante45	4e0780387f	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-04-27 11:20:18 -07:00
anshuman64	04f97431f4	Merge pull request #10287 from highfidelity/update-qt-win-build-guide ... Update Build Guides with Qt 5.6.2	2017-04-27 10:59:16 -07:00
Anshuman Dewangan	521db82ed0	Use generic dir syntax	2017-04-27 10:56:56 -07:00
Seth Alves	0435749f82	Merge pull request #10210 from volansystech/21200 ... 21200 Transfer from far-grab to near grab when close	2017-04-27 10:32:10 -07:00
volansystech	87ceebca82	Merge branch 'master' of https://github.com/highfidelity/hifi into 21200 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-04-27 12:58:18 +05:30
Chris Collins	6ecbaff56e	Merge pull request #10297 from ZappoMan/retrySkeletonURL ... format and spelling changes	2017-04-26 21:58:51 -07:00
ZappoMan	bc2f893294	format and spelling changes	2017-04-26 21:47:54 -07:00
Chris Collins	df7cb09fe4	Merge pull request #10255 from ZappoMan/retrySkeletonURL ... Fix two cases for avatars stuck in T-Pose	2017-04-26 21:38:19 -07:00
Chris Collins	b2870be25c	Merge pull request #10256 from jherico/fix_stored_size ... Fix excessive copying when querying the size of a KTX backed texture	2017-04-26 21:31:19 -07:00
ZappoMan	3e766675c5	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 21:05:28 -07:00
Seth Alves	60453f8748	Merge pull request #10294 from ctrlaltdavid/record-for-marketplace ... Make record script able to be put on the marketplace	2017-04-26 19:34:39 -07:00
Triplelexx	a154879001	change menu item text Audio Noise Reduction to Noise Reduction	2017-04-27 03:25:24 +01:00
Triplelexx	f9c6cb27f4	change menu item for avatar collisions to "Collide with world"	2017-04-27 03:16:04 +01:00
Brad Davis	7be40a48a1	Merge branch 'master' into fix_stored_size	2017-04-26 19:08:04 -07:00
ZappoMan	76902b15d3	remove one last debug log	2017-04-26 18:51:41 -07:00
ZappoMan	c0df82ff69	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 18:49:24 -07:00
ZappoMan	834a447d62	remove debugging code	2017-04-26 18:36:44 -07:00
Ryan Huffman	ac0a738945	Merge pull request #10261 from Atlante45/feat/progressive-load-ktx ... Add progressive load for KTX textures	2017-04-26 18:36:01 -07:00
Ryan Huffman	60ba874e2e	Fix implementation of mutableData in non-File Storage classes	2017-04-26 18:02:23 -07:00
ZappoMan	a26dca73b1	more logging	2017-04-26 18:02:09 -07:00
Ryan Huffman	f5b7feccde	Update AssetClient/Request to use const byteRange	2017-04-26 18:01:56 -07:00
Ryan Huffman	fee36453a3	Move hifi.minMip	2017-04-26 17:53:17 -07:00
Ryan Huffman	cb299695f4	Update imageOffset to size_t	2017-04-26 17:52:53 -07:00
Thijs Wenker	2fd6786225	Merge pull request #10295 from PhilipRosedale/halfDuplex ... Reduce log spam	2017-04-27 02:17:48 +02:00
Brad Davis	fa0fb11329	Remove uneeded memory to memory copy for mip transfers	2017-04-26 17:14:39 -07:00
Brad Davis	960c29edb7	Fix excessive copying when querying the size of a KTX backed texture	2017-04-26 17:12:48 -07:00
Ryan Huffman	47cf44dc60	Store offset to min mip kv in KtxStorage	2017-04-26 17:11:19 -07:00
Triplelexx	f795027ab7	change menu item locations ... AudioNoiseReduction moved under Audio. Avatar Collision under Avatar.	2017-04-27 01:09:04 +01:00
Philip Rosedale	a880ca1262	Reduce log spam	2017-04-26 16:51:26 -07:00
ZappoMan	1f9e07b828	more logging	2017-04-26 16:40:13 -07:00
Ryan Huffman	4395cd7ee1	Update hasPendingTransfers to not touch _pendingTransfers	2017-04-26 16:31:42 -07:00
Ryan Huffman	f509403b25	Update prioritization of memory pressure states	2017-04-26 16:31:42 -07:00
Ryan Huffman	f15a34e145	Cleanup data pointer calculations in assignMipData	2017-04-26 16:31:42 -07:00
Atlante45	19d5414c30	Reduce High Mips request size	2017-04-26 16:23:09 -07:00
David Rowe	9c7353deb2	Make record script able to be put on the marketplace	2017-04-27 11:22:25 +12:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
anshuman64	c088bd6891	Merge pull request #10271 from humbletim/21281 ... CR Job #21281 -- Doppleganger Mirror	2017-04-26 16:18:14 -07:00
Howard Stearns	7654823775	Merge pull request #10292 from thoys/make-connection-fix ... makeUserConnection.js Fix for alternative skeletons	2017-04-26 16:02:16 -07:00
Zach Fox	9ace7a7488	Merge pull request #10279 from andrewd440/21174 ... 21174 Make the Particle Emitter Easier to Use	2017-04-26 15:35:29 -07:00
Andrew Lowry	d3a9114676	Uses spaces instead of tabs for Edit.qml and EditTabView.qml.	2017-04-26 18:29:38 -04:00
humbletim	6e07933356	uncomment UserActivityLogger.logAction	2017-04-26 18:28:54 -04:00
ZappoMan	3de92121e0	more logging	2017-04-26 15:28:10 -07:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
Anshuman Dewangan	54e4eb5eae	Updated downloads to direct links	2017-04-26 15:17:34 -07:00
Ryan Huffman	c7ac82b4e2	Remove magic number for kv and image sizes	2017-04-26 15:09:26 -07:00
Ryan Huffman	e4e554aaea	Remove dead code from Texture.h	2017-04-26 15:09:26 -07:00