889 commits

Author	SHA1	Message	Date
Brad Davis	029251f293	More render performace testing work	2016-07-12 11:51:58 -07:00
Brad Hefta-Gaub	bcee128de0	Merge pull request #6959 from Triplelexx/20769 ... CR for Job #20769 - Touchscreen camera input for Interface	2016-07-11 14:24:52 -07:00
Brad Davis	dfdc1ca1c6	Ensuring render thread is highest priority	2016-07-07 11:14:56 -07:00
Brad Davis	5be238db08	Suppressing glew link warnings	2016-07-07 11:10:59 -07:00
Brad Davis	09f2a10613	Add rendering performance tool	2016-07-07 11:10:58 -07:00
Brad Davis	b16812aa4d	Adding GL 4.5 backend	2016-06-28 18:55:24 -07:00
Triplelexx	90cd335bda	missed a brace	2016-06-24 10:48:25 +01:00
Triplelexx	fd4d9761ce	merge master and resolve conflicts ... * remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping	2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub	da74114b32	Merge pull request #8070 from AndrewMeadows/triangle-soup-4 ... support btBvhTriangleMeshShape for static mesh entities	2016-06-23 12:17:32 -07:00
howard-stearns	8421931c56	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub	c322317878	rework plugins to not depend on PluginContainer unless they want to	2016-06-21 12:07:05 -07:00
Andrew Meadows	d64729372a	ShapeInfo name changes	2016-06-20 17:29:20 -07:00
Brad Davis	37e9f66639	Additional toolbar work	2016-06-20 15:41:21 -07:00
Bradley Austin Davis	ec615caa80	Support toolbar API	2016-06-17 13:06:42 -07:00
Brad Davis	b9ee0c087e	Add a constant hud toggle button to the UI	2016-06-07 13:45:23 -07:00
Brad Davis	4e49f3f942	Fix browser and update dialogs	2016-06-02 19:54:25 -07:00
Brad Davis	8c13ff4ee1	Pinned UI support	2016-06-02 17:24:25 -07:00
Brad Hefta-Gaub	06cb625d09	Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision ... Improved Avatar Mixer Rotation Precision	2016-05-25 17:14:12 -07:00
David Rowe	b9aa667c55	Fix QML test environment	2016-05-25 10:37:30 +12:00
Brad Hefta-Gaub	b8b39b962d	Merge pull request #7868 from jherico/entity_shape ... Add a generic shape primitive	2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub	49ded9c4df	Merge pull request #7873 from ctrlaltdavid/20917 ... restyle file browser	2016-05-24 08:40:38 -07:00
David Rowe	504516b627	Merge branch 'master' into 20917	2016-05-24 08:03:54 +12:00
Anthony J. Thibault	a1c32f8c44	Merge branch 'master' into tony/improved-avatar-mixer-precision	2016-05-23 10:24:52 -07:00
Brad Davis	2c703e963c	More shapes	2016-05-22 19:48:59 -07:00
Brad Davis	cd1e910844	Add a generic shape primitive	2016-05-21 23:46:44 -07:00
Seth Alves	40e862cf9e	quiet gcc 5 warnings	2016-05-21 16:53:01 -07:00
Brad Davis	07562f72af	Doing a pass over the input plugins and controller code	2016-05-20 14:50:23 -07:00
David Rowe	17b3101ca5	Merge branch 'master' into 20917	2016-05-20 18:50:01 +12:00
Atlante45	8be6bc6460	Add missing overrides	2016-05-19 22:00:22 -07:00
Anthony J. Thibault	818d1f4601	Added six byte quaternion compression routines & tests	2016-05-16 17:48:54 -07:00
Brad Davis	5ba8372c21	Moving GL backend out of GPU	2016-05-16 12:54:17 -07:00
David Rowe	88130ee5c8	Merge branch 'master' into 20917	2016-05-14 12:13:39 +12:00
Brad Davis	85272a87ba	Merge pull request #7859 from samcake/lemon ... Introduce the "Unlit" shading model support and apply it to Web Enitities	2016-05-12 15:09:50 -07:00
David Rowe	8f214a6b14	Merge branch 'master' into 99997	2016-05-12 17:50:34 +12:00
Brad Hefta-Gaub	d656f61c64	Merge pull request #7759 from jherico/app_plugin_type ... Don't expose raw pointer to the display plugin	2016-05-11 14:49:22 -07:00
samcake	1ec9ef560e	Fixing the srgb color format conversion for web entities	2016-05-11 10:46:54 -07:00
David Rowe	b8c0ec86af	Hide file filter if only 1 file type	2016-05-10 15:09:13 +12:00
David Rowe	6e59abc8f6	Switch file selection dialog over to using UI Toolkit files	2016-05-10 12:13:46 +12:00
Brad Davis	c54d0bc993	Don't expose raw pointer to the display plugin	2016-05-08 10:35:31 -07:00
Atlante45	df2683d989	Fix compile error	2016-05-05 16:09:45 -07:00
Anthony J. Thibault	d9063b199e	GeometryUtils: coneSphereAngle test	2016-04-26 13:31:06 -07:00
Brad Hefta-Gaub	c410242fb2	Merge pull request #7688 from jherico/texture_derez ... Reducing GPU texture memory footprint	2016-04-22 13:20:54 -07:00
David Rowe	a7b82e8cae	Decouple ui and shared libraries	2016-04-22 12:58:47 +12:00
Brad Davis	6c30194916	Support lowering the minimum mip of a texture at runtime	2016-04-21 14:46:12 -07:00
Brad Davis	b50f835d35	Warning and error fixes	2016-04-17 10:22:26 -07:00
Brad Davis	75c99fe416	Working on GPU library test code	2016-04-17 10:20:01 -07:00
Atlante45	afdfef1482	Make sure we don't use raw resource ptr	2016-04-12 13:51:11 -07:00
Zach Pomerantz	be489e8728	Codify qt qml version in one header	2016-04-07 17:35:31 -07:00
Triplelexx	11af0a421b	Merge branch 'master' into 20769	2016-04-03 22:57:55 +01:00
David Rowe	2ac9f282c7	Merge branch 'master' into 20855	2016-03-31 17:00:09 +13:00