Brad Davis 171b6d18d0 Merge branch 'master' into plugins ... Conflicts: interface/src/ui/ApplicationOverlay.cpp		2015-05-28 10:31:20 -07:00
..
animation
audio	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
audio-client	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
avatars	recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity	2015-05-27 14:44:23 -07:00
embedded-webserver
entities	Merge pull request #4982 from howard-stearns/unowned-object-sounds	2015-05-27 21:07:49 -07:00
entities-renderer	Play still sound for still objects and those just created in a script.	2015-05-27 16:25:11 -07:00
environment	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
fbx	don't allow buildModelMesh to spam logs when it encounters flawed models	2015-05-14 10:24:02 -07:00
gpu	Moving the load of the texture and the generation of the cube map irradiance in the same thread	2015-05-15 11:28:59 -07:00
model	fixes Sam made in my branch while trying to get a mesh to render	2015-05-21 18:20:52 -07:00
networking	Fix Windows C4351 build warning	2015-05-27 11:49:00 -07:00
octree	Working on display plugins	2015-05-26 17:32:41 -07:00
physics	Merge pull request #4978 from sethalves/fix-4973	2015-05-27 21:11:28 -07:00
render-utils	Working on display plugins	2015-05-26 17:32:41 -07:00
script-engine	Uglify conditional returns. :-)	2015-05-26 11:38:36 -07:00
shared	merge upstream/master into andrew/bispinor	2015-05-22 11:35:02 -07:00
ui	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00