David Rowe 1a745094e2 Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp libraries/gl/src/gl/OffscreenQmlSurface.h		2016-10-06 09:29:09 +13:00
..
avatar	Updated default idle and turn animations.	2016-05-09 18:43:30 -07:00
config
controllers	Merge remote-tracking branch 'upstream/master' into demo_movement	2016-08-18 13:43:54 -07:00
fonts	New glyph for "has transparent"	2016-09-10 14:37:09 +12:00
html	Set alphabetic/numeric keyboard per field entered	2016-09-30 11:54:32 +13:00
icons	New art.	2016-07-01 10:34:13 -07:00
images	remove obsolete file	2016-09-22 16:49:38 -07:00
info
mention-sounds
meshes	replace the default avatar with the being of light	2016-04-22 13:48:30 -07:00
qml	Merge branch 'master' into 21055	2016-10-06 09:29:09 +13:00
QtWebEngine/UIDelegates	Fix UI elements triggered by WebViews	2016-07-21 15:13:07 -07:00
shaders	Remove oglplus usage from OpenVR	2016-10-02 11:44:33 -07:00
sounds
styles
visage