Triplelexx fd4d9761ce merge master and resolve conflicts ... * remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping		2016-06-24 03:34:39 +01:00
..
animation	got rid of comparison warning	2016-06-17 14:17:32 -07:00
audio	cleanup	2016-06-09 16:31:09 -07:00
audio-client	PR comments	2016-03-31 13:19:26 -07:00
auto-updater
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-21 16:39:25 -07:00
controllers	Working on touch	2016-06-13 14:40:15 -07:00
display-plugins	feedback re magic numbers and variable name.	2016-06-22 16:40:10 -07:00
embedded-webserver
entities	remove override to avoid new Jenkins OSX warnings	2016-06-23 10:38:46 -07:00
entities-renderer	revert compound hull shape generation	2016-06-22 09:30:44 -07:00
fbx	Merge pull request #7889 from samcake/color	2016-06-08 17:38:45 -07:00
gl	merge master and resolve conflicts	2016-06-24 03:34:39 +01:00
gpu	remove mutable	2016-06-20 11:11:54 -07:00
gpu-gl	first pass at preventing repeated compileShader error prints	2016-06-17 17:49:27 -07:00
input-plugins	merge master and resolve conflicts	2016-06-24 03:34:39 +01:00
model	merge master and resolve conflicts	2016-06-24 03:34:39 +01:00
model-networking	Merge branch 'master' of https://github.com/highfidelity/hifi into color	2016-06-02 10:38:40 -07:00
networking	Merge pull request #8070 from AndrewMeadows/triangle-soup-4	2016-06-23 12:17:32 -07:00
octree	Fix reporting of JSON export failure	2016-06-15 14:12:49 +12:00
physics	Merge pull request #8070 from AndrewMeadows/triangle-soup-4	2016-06-23 12:17:32 -07:00
plugins	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-22 15:58:53 -07:00
procedural	Merge pull request #8076 from ZappoMan/reduceLogSpam	2016-06-16 18:25:54 -07:00
recording	Remove delayLoad	2016-05-09 18:09:48 -07:00
render	still trying to fix cmake errors	2016-06-10 17:01:22 -07:00
render-utils	fix comment	2016-06-20 17:29:20 -07:00
script-engine	Fixing issues with unclosed groups in settings persistence	2016-06-14 09:49:38 -07:00
shared	Merge pull request #8070 from AndrewMeadows/triangle-soup-4	2016-06-23 12:17:32 -07:00
steamworks-wrapper	Initial Steamworks integration	2016-06-14 16:29:50 -07:00
ui	Delete comment	2016-06-16 08:48:30 +12:00
ui-plugins	CR feedback	2016-06-21 12:49:42 -07:00