Brad Hefta-Gaub 452c0218da Merge pull request #8358 from AlexanderOtavka/inline-e-script ... Fix parsing of embedded entity scripts		2016-08-05 16:46:02 -07:00
..
animation
audio	implment coded renegotiation in client if for some reason unexpected audio codecs come in to inbound stream	2016-08-02 15:30:03 -07:00
audio-client	implment coded renegotiation in client if for some reason unexpected audio codecs come in to inbound stream	2016-08-02 15:30:03 -07:00
auto-updater
avatars
controllers
display-plugins
embedded-webserver
entities
entities-renderer	merge from upstream, don't hold up enabling of physics if a collision hull fails to load	2016-08-03 10:42:15 -07:00
fbx
gl
gpu
gpu-gl
input-plugins
model
model-networking	make failed geomtetry request not hold physics	2016-08-02 16:32:41 -07:00
networking	add canKick to USI, revert constants to production	2016-08-02 14:35:51 -07:00
octree
physics	adjust ground-to-fly logic	2016-08-04 11:34:42 -07:00
plugins
procedural
recording
render
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-04 09:56:32 -07:00
script-engine	Fix console errors for javascript: urls	2016-08-03 15:55:51 -07:00
shared	back out some uneeded chagnes	2016-08-04 14:09:12 -07:00
steamworks-wrapper
ui	Merge pull request #8334 from ctrlaltdavid/21015	2016-08-03 08:11:40 -07:00
ui-plugins