Andrew Meadows a38c1c82d1 use glm::clamp() instead if std::max() and min()		2015-08-10 23:08:36 -07:00
..
animation	use glm::clamp() instead if std::max() and min()	2015-08-10 23:08:36 -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	Merge howard/rig into andrew/caesium	2015-07-29 09:04:32 -07:00
embedded-webserver
entities	Merge pull request #5467 from sethalves/polyvox	2015-08-10 11:12:10 -07:00
entities-renderer	Merge pull request #5467 from sethalves/polyvox	2015-08-10 11:12:10 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	cleaning th ecode	2015-08-06 18:53:21 -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	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-08-07 13:50:22 -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 #5528 from ZappoMan/removeBrokenShadows	2015-08-07 16:09:00 -07:00
script-engine	merge rig into cleanup (removal of legacy shapes)	2015-07-31 13:40:51 -07:00
shared	added some comments to clarify algorithm	2015-08-10 23:08:10 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00