Seth Alves 45643a3aad try, try again		2015-08-04 14:36:16 -07:00
..
animation	Prototype blend. Just equal weighting for now.	2015-07-30 17:01:48 -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	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	Cleanup false starts.	2015-07-27 13:42:18 -07:00
embedded-webserver
entities	Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.	2015-08-04 07:23:24 -07:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-31 10:08:30 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	Merge pull request #5438 from howard-stearns/rig	2015-08-03 11:14:21 -07:00
gpu	remove QUADS from GLBackendShared and Format	2015-08-01 17:26:38 -07:00
model	change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive	2015-08-01 11:29:28 -07:00
networking	correct the unique_ptr char allocations	2015-07-31 14:29:05 -07:00
octree	adjust comments	2015-08-04 08:25:33 -07:00
physics	fix crash for convex hull of co-planar points	2015-07-22 15:06:10 -07:00
render	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
render-utils	Merge pull request #5438 from howard-stearns/rig	2015-08-03 11:14:21 -07:00
script-engine	fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine	2015-07-29 10:02:06 -07:00
shared	try, try again	2015-08-04 14:36:16 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00