Seth Alves 9b37b83eb6 Merge pull request #5320 from AndrewMeadows/barium ... fix grab.js when using the spring action		2015-07-14 11:02:42 -07:00
..
animation	fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change	2015-07-10 12:43:35 -07:00
audio	Allow scripted audio injectors to have options set.	2015-06-23 21:01:34 -07:00
audio-client	Merge pull request #5161 from PhilipRosedale/master	2015-06-22 12:09:08 -07:00
auto-updater	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	Qt5.5 fixes	2015-07-12 18:52:15 -07:00
embedded-webserver
entities	filter action updates during simulation ownership	2015-07-14 09:24:37 -07:00
entities-renderer	Merge pull request #5308 from venkatn93/avatar	2015-07-14 09:06:49 -07:00
environment
fbx	fix syntax	2015-06-19 17:13:29 +02:00
gpu	FIxing th ecompilation issue on mac, ready to ship	2015-07-13 19:17:09 -07:00
model	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
networking	Qt5.5 fixes	2015-07-12 18:52:15 -07:00
octree	CR feedback	2015-07-04 19:13:35 -07:00
physics	this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit	2015-07-12 13:43:21 -07:00
render	quiet compiler	2015-07-12 10:29:43 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00
script-engine	on script shutdown, wait to process all pending edit messages before ending the script engine	2015-07-09 15:01:16 -07:00
shared	quiet compiler	2015-07-12 10:29:43 -07:00
ui	preventing unused warnings	2015-07-14 10:16:06 -07:00