SamGondelman 60db24f2d3 merge with master		2017-11-13 14:36:24 -08: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	code review feedback	2017-11-10 10:25:29 -08:00
baking	Fixed issue with QTextStream	2017-10-24 20:14:02 -07:00
controllers	laserpointers generate pointerevents	2017-10-26 12:01:09 -07:00
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	Merge pull request #11724 from ctrlaltdavid/21580	2017-11-07 10:36:20 -08:00
entities-renderer	merge with master	2017-11-13 14:36:24 -08:00
fbx	First pass at consolidation	2017-10-24 12:01:05 -07:00
gl
gpu	Fixed highlight in stereo mode, including HMD (testing on simulator)	2017-11-08 13:49:18 +01:00
gpu-gl	Removed Mac and Ubuntu warnings	2017-10-23 15:46:11 +02:00
gpu-gles
image
input-plugins
ktx
midi
model	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
model-networking
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 with master	2017-11-13 14:36:24 -08:00
procedural
recording
render	Fixed potential link errors on Mac	2017-11-09 11:26:08 +01:00
render-utils	Merge pull request #11650 from Zvork/outline	2017-11-10 15:45:03 -08:00
script-engine	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
shared	merge with master	2017-11-13 14:36:24 -08:00
trackers
ui	merge with master	2017-11-13 14:36:24 -08:00
ui-plugins