Gabriel Calero 3117ec9015 Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec		2018-03-12 19:44:24 -03:00
..
avatar	Shoulder puck calibration work in progress	2017-07-24 17:22:48 -07:00
config	Introducing the renderview task	2017-06-06 18:00:41 -07:00
controllers	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
fonts	lots of fun initial progress!	2018-02-22 13:56:46 -08:00
html	Fixed extra " in backup_instructions.html	2018-02-17 18:14:44 +00:00
icons	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
images	Android - Make the virtual pad (joystick) position fixed. Change assets.	2018-02-27 21:24:21 -03:00
mention-sounds
meshes	Merge pull request #12464 from jherico/android_dev	2018-03-01 17:22:34 -08:00
qml	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 19:44:24 -03:00
QtWebEngine/UIDelegates
shaders	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
snapshot/img	new local reference to image model	2018-02-02 10:27:44 -08:00
sounds	Tighter version of sample sound	2017-10-26 11:48:40 -07:00
styles	Some improvements to the log window	2018-02-08 11:26:02 -08:00
visage