David Kelly 061f084d9f Get marketplaceID into imported entities ... Rather than doing this on the backend, we can do it here at the time we import. Later we will have some support for getting an entities identity hash and querying the backend to get a marketplaceID for them as needed. However for now this is enough to get us moving forward.		2017-07-17 15:08:30 -07:00
..
animation	Merge pull request #10881 from hyperlogic/feature/smooth-ik-chains	2017-07-14 16:59:30 -07:00
audio	remove unneeded <>	2017-07-12 13:14:32 -07:00
audio-client	more const ref	2017-07-11 19:56:34 -07:00
auto-updater
avatars	Revert "Revert "fix for invisible avatars after radius ignore""	2017-07-12 10:36:53 -07:00
avatars-renderer	try again on putting result of Avatar::getJointNames in index order	2017-07-12 20:36:37 -07:00
controllers	Merge branch 'master' into 21396	2017-06-26 12:07:25 +12:00
display-plugins	Fixes hmd preview when resizing	2017-07-12 16:49:26 -07:00
embedded-webserver
entities	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
entities-renderer	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +02:00
fbx	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
gl	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
gpu	Apply the projection and deferred transform fixes found while working on spectator camera	2017-06-28 15:44:17 +02:00
gpu-gl	Apply the projection and deferred transform fixes found while working on spectator camera	2017-06-28 15:44:17 +02:00
image
input-plugins
ktx	Merge pull request #10689 from Atlante45/fix/ktx	2017-06-19 14:44:52 -07:00
model	PR feedback	2017-06-27 19:22:07 -07:00
model-networking	Fixes hmd preview when resizing	2017-07-12 16:49:26 -07:00
networking	set file url as higher priority	2017-07-14 18:17:13 +01:00
octree	Get marketplaceID into imported entities	2017-07-17 15:08:30 -07:00
physics	supply minimum shape rather than null	2017-07-06 10:37:44 -07:00
plugins	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
procedural	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
recording	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
render	fix linux compilation maybe	2017-07-13 09:30:04 +02:00
render-utils	don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready	2017-07-13 13:18:21 -07:00
script-engine	stopAndDeleteLater is now just stop	2017-07-11 21:21:42 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
trackers	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
ui	Merge pull request #10959 from druiz17/bug/wrong-tablet-state	2017-07-14 14:31:04 -07:00
ui-plugins	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00