overte-HifiExperiments/libraries/octree/src
ZappoMan 9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
2014-01-28 20:36:35 -08:00
..
AABox.cpp Fix for AABox::touches(otherBox) 2014-01-27 17:51:05 -08:00
AABox.h Adding AABox::touches(box) 2014-01-24 13:59:03 -08:00
CoverageMap.cpp initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
CoverageMap.h first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
CoverageMapV2.cpp initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
CoverageMapV2.h first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
JurisdictionListener.cpp replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
JurisdictionListener.h handle merge with nodelist-patches branch 2014-01-23 16:01:52 -08:00
JurisdictionMap.cpp fixed type 2014-01-22 15:25:05 -08:00
JurisdictionMap.h added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
JurisdictionSender.cpp replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
JurisdictionSender.h replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
Octree.cpp more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
Octree.h more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
OctreeConstants.h first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
OctreeEditPacketSender.cpp replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
OctreeEditPacketSender.h replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
OctreeElement.cpp Fix GCC warning (string split across lines). 2014-01-16 14:24:19 -08:00
OctreeElement.h clear particles when switching domains 2014-01-24 11:07:27 -08:00
OctreeElementBag.cpp first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
OctreeElementBag.h Merge branch 'master' of https://github.com/worklist/hifi into particle_server 2013-12-04 11:40:54 -08:00
OctreePacketData.cpp add model properties to particles 2014-01-28 11:18:37 -08:00
OctreePacketData.h add model properties to particles 2014-01-28 11:18:37 -08:00
OctreePersistThread.cpp removed commented out debug 2014-01-23 15:07:17 -08:00
OctreePersistThread.h removal of unused OctreePersistThread::_loadCompleted 2014-01-16 09:23:47 -08:00
OctreeProjectedPolygon.cpp initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
OctreeProjectedPolygon.h first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
OctreeQuery.cpp remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
OctreeQuery.h remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
OctreeRenderer.cpp more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
OctreeRenderer.h first cut at particle meshes 2014-01-28 09:26:47 -08:00
OctreeSceneStats.cpp Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
OctreeSceneStats.h adjust flight times correctly in stats tracking 2013-12-19 13:29:45 -08:00
OctreeScriptingInterface.cpp fix crash on shutdown of interface 2014-01-23 17:03:11 -08:00
OctreeScriptingInterface.h fix crash on shutdown of interface 2014-01-23 17:03:11 -08:00
Plane.cpp first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Plane.h first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
ViewFrustum.cpp Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 10:20:21 -08:00
ViewFrustum.h tweaks to some variable names since windows has a problem with them 2014-01-10 18:28:18 -08:00