Seth Alves 66f595f4b2 Merge pull request #5520 from howard-stearns/single-animation-vs-blend ... Don't let individual startAnimation get messed up by blend/fade.		2015-08-06 18:55:14 -07:00
..
animation	Don't let individual startAnimation get messed up by blend/fade.	2015-08-06 11:30:18 -07:00
audio	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
audio-client	Fix https://app.asana.com/0/32622044445063/43589567731045	2015-08-02 21:46:39 -07:00
auto-updater
avatars	Merge howard/rig into andrew/caesium	2015-07-29 09:04:32 -07:00
embedded-webserver
entities	Merge pull request #5494 from sethalves/gzip-json-entity-persist-files	2015-08-05 10:56:03 -07:00
entities-renderer	remove glLineWidth completely because it s not available anymore for wide lines in core	2015-08-04 11:57:20 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	merge master into cleanup of legacy shapes	2015-08-03 11:19:29 -07:00
gpu	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00
model	Merge remote-tracking branch 'upstream/master' into core	2015-08-01 20:01:59 -07:00
networking	correct the unique_ptr char allocations	2015-07-31 14:29:05 -07:00
octree	Fix warning and remove unused headers	2015-08-05 16:46:44 -07:00
physics	fix crash for convex hull of co-planar points	2015-07-22 15:06:10 -07:00
render	removing dead code	2015-08-04 16:37:01 -07:00
render-utils	Merge pull request #5517 from samcake/punk	2015-08-06 15:13:08 -07:00
script-engine	merge rig into cleanup (removal of legacy shapes)	2015-07-31 13:40:51 -07:00
shared	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00