Sam Gondelman e4847cc4ae Merge branch 'master' into proceduralMesh		2019-06-24 10:16:45 -07:00
..
animation	Disable handTouch.js to prevent finger twitching	2019-06-20 15:52:36 -07:00
audio
audio-client	push to talk causes fun, removing tttt	2019-06-20 15:12:20 -07:00
auto-updater	check for update for dev-builds, handle semantic version	2018-06-08 17:20:57 -07:00
avatars	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
avatars-renderer
baking	(¬‿¬)	2019-05-15 23:48:04 -07:00
controllers
display-plugins	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
embedded-webserver
entities	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
entities-renderer	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
fbx
gl
gpu	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
gpu-gl
gpu-gl-common
gpu-gles
graphics
graphics-scripting
hfm
image
input-plugins
ktx
material-networking
midi
model-baker	Merge branch 'master' into proceduralMesh	2019-05-23 09:35:14 -07:00
model-networking	merge with master	2019-05-16 20:03:10 -07:00
networking
octree	Add locks to OctreeEditPacketSender to protect various members	2019-06-21 11:42:27 -07:00
oculusMobile
oculusMobilePlugin
physics	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
platform
plugins
pointers
procedural	merge with master	2019-06-10 10:29:39 -07:00
qml	small cleanup to shared object etc.	2019-06-19 16:56:45 -07:00
recording
render	possible fix for do_setPipeline crash and other mac fixes	2019-06-19 16:34:38 -07:00
render-utils	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
script-engine	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
shaders
shared	One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls	2019-06-19 16:52:33 -07:00
task
test-utils
trackers
ui
ui-plugins
workload