22257 commits

Author	SHA1	Message	Date
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 ... more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
Seth Alves	b82a333a5e	Merge pull request #10196 from ZappoMan/poseFilters ... support for input controller pose filters	2017-05-02 09:46:22 -07:00
druiz17	67daa4b0a9	Merge pull request #10335 from druiz17/webview-js ... Implemented of a web app to bring up the tablet webView	2017-05-01 15:03:55 -07:00
Atlante45	4f368cc867	Load High Mips before Fbx after skybox	2017-05-01 13:35:14 -07:00
Seth Alves	a75544a9fb	Merge pull request #10319 from hyperlogic/feature/head-standard-action ... Head, Hips and Chest IK can now be controlled from Controller inputs	2017-05-01 13:03:23 -07:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor ... Remove Faceshift	2017-05-01 12:14:55 -07:00
anshuman64	5731242e7f	Merge pull request #10321 from ZappoMan/fixFrozenBots ... fix frozen bots	2017-05-01 09:33:33 -07:00
druiz17	2bf7b12c7d	open webview from tabletwebscreen	2017-04-30 15:27:34 -07:00
Brad Davis	2b43a1989f	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
1st-BrainStormer	953a3f7a6f	Update EntityDynamicInterface.cpp ... Grammar correction.	2017-04-28 20:14:01 -07:00
Stephen Birarda	fed747a545	Merge pull request #10325 from huffman/atp-range-caching ... Fix for stuck ATP downloads	2017-04-28 16:54:21 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Ryan Huffman	89fb0a917b	Fix poorly indented if in AssetRequest	2017-04-28 16:27:44 -07:00
Ryan Huffman	765a061086	Fix stuck ATP downloads ... Occasionally ATP requests would get stuck because of a race inside AssetClient::handleAssetReply. This was more likely to happen to small resources.	2017-04-28 16:26:03 -07:00
Stephen Birarda	c518aa55be	Merge pull request #10312 from birarda/upload-new-models-to-entity ... add an entity file replacement via domain-server content page	2017-04-28 16:06:05 -07:00
ZappoMan	bace47af7c	CR review	2017-04-28 14:46:27 -07:00
ZappoMan	086941356a	fix frozen bots	2017-04-28 14:36:38 -07:00
Anthony J. Thibault	108cd80bb5	Merge branch 'master' into feature/head-standard-action	2017-04-28 10:41:29 -07:00
Stephen Birarda	b44a56db80	don't save ATP requests to cache if they are range requests	2017-04-28 10:32:06 -07:00
Andrew Meadows	32c367b644	use 'using' rather than 'typedef'	2017-04-28 10:18:15 -07:00
Stephen Birarda	9bc0609b1e	address code review comments	2017-04-28 10:17:48 -07:00
Anthony J. Thibault	c61e6a8a9e	AnimInverseKinematics: reduce number of magic constants	2017-04-27 18:24:21 -07:00
Anthony J. Thibault	b80270400f	Merge branch 'master' into feature/hips-ik-target	2017-04-27 18:15:12 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
Anthony J. Thibault	764f6c69ea	Head input action will override the HMD for IK.	2017-04-27 17:39:25 -07:00
Stephen Birarda	a21a34a4a4	add entities file replacement to DS and ES	2017-04-27 16:56:27 -07:00
Andrew Meadows	75b563d598	restore rendering of avatar receive stats	2017-04-27 13:16:50 -07:00
Andrew Meadows	442080dec7	remove unused RenderArgs::_cameraMode hack	2017-04-27 13:16:50 -07:00
Andrew Meadows	2441536de3	remove Avatar dependency on AvatarMotionState	2017-04-27 13:16:49 -07:00
Andrew Meadows	aceac12398	use 'using' instead of 'typedef'	2017-04-27 13:11:57 -07:00
ZappoMan	829fa2b323	Merge branch 'master' of https://github.com/highfidelity/hifi into poseFilters	2017-04-27 08:17:59 -07:00
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
Brad Davis	7be40a48a1	Merge branch 'master' into fix_stored_size	2017-04-26 19:08:04 -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
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
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