49677 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Chris Collins	2557c797af	Merge pull request #9300 from zzmp/graphics/forward-opaque ... Add opaques/skinned to forward rendering path	2017-01-16 08:48:18 -08:00
Seth Alves	050a7e87d2	load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled.	2017-01-15 17:04:51 -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
David Kelly	baed3bc3b3	Manage audio interval timer in PAL ... Now, it is only running when PAL is up. Was running (but doing nothing before. Somewhat more efficient this way.	2017-01-14 12:57:00 -07:00
Ken Cooke	42e13d1e97	Fix audio failures on systems that return incorrect/unsupported mixFormat	2017-01-14 10:26:13 -08:00
Zach Fox	a5343d9aa9	Final tweaks before PR!	2017-01-13 17:20:29 -08:00
Zach Fox	a89868dcad	Make sliders appear only when row is selected	2017-01-13 15:41:17 -08:00
Zach Fox	8343769352	NameCard improvements & user feedback	2017-01-13 15:25:07 -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
Zach Fox	a69a10b8e4	Cleanup after rebase	2017-01-13 13:15:01 -08:00
Zach Fox	a9226e303c	Pull out visual changess & move them to other PR	2017-01-13 13:00:23 -08:00
Zach Fox	b0b6aeac6c	Ken's feedback	2017-01-13 13:00:03 -08:00
Zach Fox	b9cddc31a9	Checkpoint before implementing Ken's suggestions	2017-01-13 13:00:03 -08:00
Zach Fox	8c3766dfe8	Fixme	2017-01-13 12:59:24 -08:00
Zach Fox	503468e49b	Style changes	2017-01-13 12:59:23 -08:00
Zach Fox	dcff873cd4	Modify slider function	2017-01-13 12:57:35 -08:00
Zach Fox	8bb200902f	First pass	2017-01-13 12:57:35 -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
Zach Fox	71f0e02210	Merge pull request #9373 from zfox23/PAL_ScrollbarRefinement ... PAL: Scrollbar refinement & visual updates	2017-01-12 20:41:18 -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
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
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
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