49578 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ZappoMan	c9c311e275	checkpoint for distance joints	2017-01-15 11:47:48 -08:00
ZappoMan	c884b276e2	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-14 22:15:22 -08:00
Brad Hefta-Gaub	98699885f4	Merge pull request #9385 from kencooke/audio-mixformat-invalid ... Fix audio failures	2017-01-14 14:53:01 -08:00
Ken Cooke	42e13d1e97	Fix audio failures on systems that return incorrect/unsupported mixFormat	2017-01-14 10:26:13 -08:00
samcake	584feef56d	Merge pull request #9371 from jherico/fbx_parse_optimizations ... Improve FBX parsing performance	2017-01-13 13:44:54 -08:00
Seth Alves	f9a36d68ad	Merge pull request #9363 from ctrlaltdavid/21127 ... Make Clara.io downloads convert textures to PNG	2017-01-13 10:14:43 -08:00
ZappoMan	3a9a6e8283	local position tweaks	2017-01-13 09:09:29 -08:00
Zach Fox	71f0e02210	Merge pull request #9373 from zfox23/PAL_ScrollbarRefinement ... PAL: Scrollbar refinement & visual updates	2017-01-12 20:41:18 -08:00
ZappoMan	ee4df20df3	duh	2017-01-12 19:27:28 -08:00
ZappoMan	2e48444422	hack	2017-01-12 19:03:58 -08:00
ZappoMan	aed1b69ee0	make the avatar bounding box be avatar local and only change when it actually changes	2017-01-12 17:19:06 -08:00
Brad Davis	29b160d685	Reduce temp qvariant creation and qvariant conversion	2017-01-12 16:17:03 -08:00
Brad Davis	2383592678	Improve FBX parsing performance by bulk loading of arrays	2017-01-12 16:17:02 -08:00
samcake	90151b67c4	Merge pull request #9339 from jherico/min_threadpool ... Reduce min threads in threadpool to 1	2017-01-12 15:37:17 -08:00
David Rowe	d7ab7316a8	Tidying	2017-01-13 12:28:53 +13:00
David Rowe	ad5822d96d	Fix first progress message box not closing	2017-01-13 12:26:42 +13:00
David Rowe	632989e031	Fix progress messages not displaying in HMD	2017-01-13 12:09:22 +13:00
Brad Davis	659badd8bf	Change minimum threadpool size 1	2017-01-12 14:43:31 -08:00
samcake	ca53235d54	Merge pull request #9358 from AndrewMeadows/model-cleanup ... minor cleanup for Model rendering code	2017-01-12 14:30:16 -08:00
samcake	b9e8f7ee14	Merge pull request #9359 from jherico/cached_qml_surfaces ... Eagerly cache QML surfaces for Web3D overlays	2017-01-12 14:28:35 -08:00
David Rowe	6f2386eabd	Fix processing of Clara.io status messages	2017-01-13 11:20:00 +13:00
Zach Fox	b7e95a3486	Updates from Alan	2017-01-12 14:14:28 -08:00
Brad Davis	e8f6f3787b	Merge pull request #9364 from jherico/trace_cpu_usage ... Add process and system CPU usage to traces	2017-01-12 13:50:29 -08:00
David Rowe	4dee0efdd3	Use more reliable Clara.io API parameters	2017-01-13 09:12:49 +13:00
Zach Fox	8e1a70891d	Checkpoint after cherry-picking from existing PR	2017-01-12 10:59:28 -08:00
Howard Stearns	606e0c382d	Merge pull request #9337 from davidkelly/dk/letsHover ... add hover effect to PAL	2017-01-12 10:14:28 -08:00
Brad Davis	01cdbb5721	Merge pull request #9334 from elmanytas/add_libssl_dev ... Add dependency to Ubuntu documentation	2017-01-12 10:04:49 -08:00
Brad Davis	2de83d42bc	Add process and system CPU usage to traces	2017-01-12 09:19:08 -08:00
ZappoMan	dd85cd9558	one more shot at kens way	2017-01-12 08:48:33 -08:00
ZappoMan	0e600fc8fd	more audio loudness tweaks	2017-01-12 07:56:09 -08:00
David Kelly	e36f6b6521	Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover	2017-01-12 08:40:04 -07:00
David Rowe	d45e6f00cb	Prepare only one download at a time	2017-01-12 22:35:42 +13:00
David Rowe	288c069687	Make cancelling downloads more robust	2017-01-12 22:31:09 +13:00
David Rowe	6e622b3719	Don't request model be centered as work-around for downloads failing	2017-01-12 21:35:24 +13:00
David Rowe	cbe8ce0c19	Improve handling of zip file generation failing	2017-01-12 21:33:32 +13:00
David Rowe	9587b6a80e	Fix initial marketplace URL	2017-01-12 20:53:57 +13:00
Howard Stearns	48304a3cc2	Merge pull request #9361 from howard-stearns/fix-laser-vs-mouse-again ... Fix laser vs mouse again	2017-01-11 19:38:54 -08:00
ZappoMan	fe06dfdca7	tweak audioLoudness packing	2017-01-11 18:58:43 -08:00
David Rowe	8cd7e1b377	Improve user messages	2017-01-12 15:48:25 +13:00
David Rowe	37da800a14	Display Clara model preparation progress	2017-01-12 15:47:41 +13:00
David Rowe	b41f8c754d	Add updateable message box to JavaScript API	2017-01-12 15:46:53 +13:00
ZappoMan	0661531e3a	try another version of an 8bit audio loudness	2017-01-11 17:51:12 -08:00
Andrew Meadows	c060fd6a68	restore updateClusterMatrices() in render()	2017-01-11 17:33:30 -08:00
howard-stearns	88c2c534ad	don't set bogus values	2017-01-11 17:01:46 -08:00
howard-stearns	9298bcf628	remove log spam	2017-01-11 16:32:15 -08:00
howard-stearns	5c06841732	use update signal instead of timer	2017-01-11 16:24:05 -08:00
Andrew Meadows	e2130d33d9	speedup cauterizedClusterMatrices math	2017-01-11 15:10:44 -08:00
Andrew Meadows	b3e336de3d	remove cruft: unused function arguments	2017-01-11 15:02:18 -08:00
Brad Davis	27293c342c	Change present rate to be an average over 1/10th of a second	2017-01-11 14:27:46 -08:00
Brad Davis	e256f7cccc	Remove sendqueue spam in traces	2017-01-11 14:27:27 -08:00