ZappoMan 2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities ... Conflicts: examples/sit.js interface/src/Application.cpp libraries/models/src/ModelItem.cpp libraries/models/src/ModelsScriptingInterface.cpp		2014-07-15 10:04:40 -07:00
..
audio	fixed more small bugs with AudioRingBuffer constructor	2014-07-03 12:06:18 -07:00
metavoxels	Use congestion control on server.	2014-07-08 15:10:05 -07:00
networking	Merge pull request #3107 from wangyix/master	2014-07-03 13:32:31 -07:00
octree	more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe	2014-07-10 13:42:49 -07:00
physics	fixed some windows warnings	2014-06-24 20:07:47 -07:00
shared	added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg	2014-07-09 15:38:03 -07:00
CMakeLists.txt	complete quoting of varous Cmake commands, closes #1999	2014-03-03 12:15:05 -08:00