Thijs Wenker 68521e11a7 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml # interface/resources/qml/hifi/avatarPackager/InfoBox.qml		2019-01-03 22:13:04 +01:00
..
avatar	Tweak transit animation	2018-11-05 19:14:40 -07:00
config	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
controllers	adding tablet bg/no movement in login state	2018-12-04 16:50:01 -08:00
fonts	adding oculus to login dialog/adding focus wip	2018-11-26 15:10:04 -08:00
html	don't trigger virtual keyboard scroll on non input focus.	2018-11-19 21:08:21 +01:00
icons	Update icons in avatar packager	2018-12-27 12:43:43 -08:00
images	Update avatar packager styling	2018-12-27 00:13:45 -08:00
mention-sounds
meshes	keyboard touch ups	2018-11-16 14:20:17 -08:00
qml	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-03 22:13:04 +01:00
QtWebEngine/UIDelegates	update imports for utilities / all other qml files found	2018-11-06 14:21:14 +05:30
serverless	new location drop - unparent overlays	2018-09-26 15:12:48 -07:00
shaders	replicate default skybox	2018-11-19 19:14:07 -05:00
snapshot/img	new local reference to image model	2018-02-02 10:27:44 -08:00
sounds	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
styles	Some improvements to the log window	2018-02-08 11:26:02 -08:00
visage