SamGondelman 7686948daf resolve conflicts and cleanup		2017-10-20 15:23:17 -07:00
..
animation	fix local t pose	2017-10-03 12:51:37 -07:00
audio	Merge pull request #11538 from kencooke/audio-mac-bugfix2	2017-10-17 11:02:55 -07:00
audio-client
auto-updater
avatars	Merge pull request #11326 from cain-kilgore/21537	2017-10-06 08:51:42 -07:00
avatars-renderer
baking	Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker	2017-10-12 16:16:02 -05:00
controllers
display-plugins	build error	2017-10-09 11:48:54 -07:00
embedded-webserver
entities	Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread	2017-10-12 17:37:05 -07:00
entities-renderer	fixing the zone entity not rendering when created or when avatar appears in one	2017-10-13 15:03:23 -07:00
fbx
gl
gpu	Merge pull request #11542 from SamGondelman/bubbleBoy	2017-10-10 14:26:20 -07:00
gpu-gl	Merged with master	2017-10-10 12:11:23 +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	Merged with master	2017-10-10 12:11:23 +02:00
midi
model
model-networking	Merge pull request #11571 from huffman/fix/ktx-thrashing	2017-10-13 11:53:24 -07:00
networking	Merge pull request #10956 from birarda/feat/update-default-avatar	2017-10-13 15:57:37 -07:00
octree	clarify some comments	2017-09-29 11:34:35 -07:00
physics
plugins
pointers	resolve conflicts and cleanup	2017-10-20 15:23:17 -07:00
procedural
recording
render	build error	2017-10-09 11:48:54 -07:00
render-utils	fix warning about implicit cast from 64 to 32 bits	2017-10-11 06:07:07 -07:00
script-engine	remove unused HFMetaEvents	2017-10-11 14:37:23 -07:00
shared	one global pickmanager	2017-10-19 16:55:24 -07:00
trackers
ui	Merge pull request #11613 from jherico/feature/qml_whitelist	2017-10-17 17:34:22 -07:00
ui-plugins