Brad Davis 9fafc920ee Merge branch 'homer' into plugins ... Conflicts: interface/src/Application.cpp libraries/render-utils/src/AmbientOcclusionEffect.cpp		2015-07-20 13:53:15 -07:00
..
animation	CR	2015-07-14 15:16:00 -07:00
audio	Fix https://app.asana.com/0/30233891560551/41734486809354/f	2015-07-17 11:28:25 -07:00
audio-client	Merge pull request #5161 from PhilipRosedale/master	2015-06-22 12:09:08 -07:00
auto-updater	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 14:07:32 -07:00
display-plugins	Merge branch 'master' into plugins	2015-07-20 13:33:24 -07:00
embedded-webserver
entities	proper fix for incorrect render of scaled entities	2015-07-17 15:21:02 -07:00
entities-renderer	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
environment
fbx	Fix https://app.asana.com/0/32622044445063/39927009585710	2015-07-14 13:15:24 -07:00
gpu	Merge branch 'master' into plugins	2015-07-20 13:33:24 -07:00
model	Cleanup	2015-07-14 12:36:18 -07:00
networking	delete dead code	2015-07-14 16:49:22 -07:00
octree	delete dead code	2015-07-14 16:49:22 -07:00
physics	this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit	2015-07-12 13:43:21 -07:00
plugins	Working on plugin menu items	2015-07-01 09:05:26 -07:00
render	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
render-utils	Merge branch 'homer' into plugins	2015-07-20 13:53:15 -07:00
script-engine	on script shutdown, wait to process all pending edit messages before ending the script engine	2015-07-09 15:01:16 -07:00
shared	Fixing invalid vector usage and strange picking crash	2015-07-19 23:03:46 -07:00
ui	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00