Dante Ruiz 735ff04fad fixing merge conflicts		2018-09-11 12:10:19 -07:00
..
animation	Fix for glitch when entering inAir state from takeoff.	2018-09-04 14:36:56 -07:00
audio	Cleanup	2018-09-03 14:00:30 -07:00
audio-client	first round of requested changes	2018-09-11 12:01:55 -07:00
auto-updater
avatars	use different XORed instance ID for replicas	2018-08-31 16:59:24 -07:00
avatars-renderer	cycle avatar entity IDs for new avatar mixer	2018-08-31 16:53:58 -07:00
baking
controllers	Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode	2018-09-05 10:57:21 -07:00
display-plugins
embedded-webserver
entities	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-09-06 09:59:51 -07:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-09-06 09:59:51 -07:00
fbx	Fixed compilation error (within #ifdef)	2018-08-30 15:06:05 -07:00
gl
gpu
gpu-gl
gpu-gl-common	Working on pauses in tomb domain	2018-08-27 13:28:49 -07:00
gpu-gles
graphics	CR	2018-08-31 11:25:17 -07:00
graphics-scripting
image
input-plugins	remove [ camera key, allow F to enter camera without selection	2018-08-29 11:56:37 -07:00
ktx
midi
model-networking
networking	adding inlines	2018-09-10 17:10:13 -07:00
octree	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-30 12:12:24 -07:00
physics	Merge pull request #13920 from AndrewMeadows/dont-bid-for-locked	2018-09-04 13:26:21 -07:00
plugins
pointers	Merge pull request #13873 from sabrina-shanman/stt_parenting	2018-08-31 14:43:55 -07:00
procedural
qml
recording
render	clening up the code in LODmanager and the associated js/qml	2018-08-30 18:09:11 -07:00
render-utils	Merge pull request #13947 from SamGondelman/perf	2018-09-06 14:21:18 -07:00
script-engine	fix script engine(s) cleanup from ESS	2018-08-22 13:52:37 -07:00
shaders
shared	Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode	2018-09-05 10:57:21 -07:00
task
test-utils
trackers
ui	restore window parent on presentationMode switch	2018-09-05 20:13:48 +02:00
ui-plugins
workload	enable workload regulation by default	2018-09-04 08:49:19 -07:00