amantley 3ce65ece87 Merge remote-tracking branch 'upstream/master' into character_entity_fixes ... this is just to synch this branch with the upstream master		2017-11-09 10:38:34 -08:00
..
animation	coding standard	2017-11-02 10:34:57 -07:00
audio	Cleaning	2017-10-25 19:09:37 -07:00
audio-client
auto-updater
avatars	Remove checking of empty model url and add sanity for checking modelUrl field existing	2017-11-08 21:23:50 +01:00
avatars-renderer	merge with upstream, and clean code	2017-11-06 17:02:10 -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	Merge remote-tracking branch 'upstream/master' into character_entity_fixes	2017-11-09 10:38:34 -08:00
entities-renderer	Merge remote-tracking branch 'upstream/master' into character_entity_fixes	2017-11-09 10:38:34 -08:00
fbx	First pass at consolidation	2017-10-24 12:01:05 -07:00
gl
gpu	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
gpu-gl
gpu-gles
image
input-plugins
ktx
midi
model	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
model-networking
networking	Merge pull request #11138 from Nex-Pro/21466	2017-11-03 11:58:15 -07:00
octree	allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU	2017-11-04 13:40:41 -07:00
physics	Merge pull request #11336 from 1P-Cusack/21389_PR2	2017-10-25 10:41:21 -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	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
render-utils	fixes from code review	2017-11-08 11:45:40 -08:00
script-engine	Removed references to Haze from Stage.	2017-10-30 10:49:08 -07:00
shared	Migrate the DS config version to the config file	2017-10-31 17:35:23 -07:00
trackers
ui	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
ui-plugins