amantley 55ae08c071 Merge remote-tracking branch 'upstream/master' into integratedStepping		2018-07-09 13:55:59 -07:00
..
avatar	added tweaks to the avatar animation json that speed up the transitions to better match the new step detection	2018-07-02 15:46:58 -07:00
config
controllers	prevent right-click strafe with ctrl	2018-07-06 10:52:53 -07:00
fonts	Restore resources	2018-06-29 15:15:54 -03:00
html	adding updated keyboard mapping .jpg to repo	2018-07-03 16:28:19 -07:00
icons	Restore resources	2018-06-29 15:15:54 -03:00
images	making requested changes	2018-06-07 14:04:39 -07:00
mention-sounds
meshes	emissive maps	2018-06-13 10:41:02 -07:00
qml	Merge pull request #13453 from gcalero/web_overlay_android	2018-07-06 13:02:56 -07:00
QtWebEngine/UIDelegates
serverless	add a default tutorial json for dev interface	2018-03-26 14:32:26 -07:00
shaders	Alternate shader	2018-05-04 16:40:05 -07:00
snapshot/img
sounds	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
styles
visage