David Kelly 009e6b252a Merge pull request #11814 from AndrewMeadows/fix-cylinders ... fix cylinder collision shape		2017-11-15 15:24:29 -07:00
..
animation	Merge branch 'master' into bug-fix/div-by-zero	2017-11-10 10:15:26 -08:00
audio	Cleaning	2017-10-25 19:09:37 -07:00
audio-client
auto-updater
avatars	Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack	2017-11-12 10:59:19 -08:00
avatars-renderer	Bug fix for MyAvatar.getEyeHeight()	2017-11-15 11:27:42 -08:00
baking	Fixed issue with QTextStream	2017-10-24 20:14:02 -07:00
controllers
display-plugins	Merge pull request #11671 from ElderOrb/case8553	2017-10-25 10:31:31 -07:00
embedded-webserver	Update most DS API forwarding APIs to use a single forwarding function	2017-10-27 15:53:50 -07:00
entities	fix typo making cylinders collide as sphere	2017-11-15 09:04:04 -08:00
entities-renderer	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-10 10:19:32 +01:00
fbx	First pass at consolidation	2017-10-24 12:01:05 -07:00
gl
gpu	Merged with master	2017-11-13 14:33:59 +01:00
gpu-gl	Removed Mac and Ubuntu warnings	2017-10-23 15:46:11 +02:00
gpu-gles
image	Fixed cube map conversion from equirectangular maps when done after HDR conversion	2017-10-13 11:05:27 +02:00
input-plugins
ktx
midi
model	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
model-networking	Merge pull request #11571 from huffman/fix/ktx-thrashing	2017-10-13 11:53:24 -07:00
networking	Merge pull request #11138 from Nex-Pro/21466	2017-11-03 11:58:15 -07:00
octree	Remove hack for missing inttypes.h header on VS2010	2017-11-09 10:34:01 -08:00
physics	cleanup ShapeFactory implementation	2017-10-27 08:56:26 -07:00
plugins	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
pointers	Merge branch 'pointers' of https://github.com/highfidelity/hifi into pointers	2017-10-17 13:23:08 -07:00
procedural
recording
render	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
render-utils	Merge pull request #11744 from Zvork/shadow	2017-11-15 09:49:39 -08:00
script-engine	Removed references to Haze from Stage.	2017-10-30 10:49:08 -07:00
shared	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
trackers
ui	Merge pull request #11794 from ElderOrb/FB4684_3	2017-11-14 12:22:42 -08:00
ui-plugins