overte/libraries/octree/src
ZappoMan 3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
..
CoverageMap.cpp fixes to source files for code remove in regex replace 2014-04-09 10:16:56 -07:00
CoverageMap.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
CoverageMapV2.cpp repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
CoverageMapV2.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
EditPacketBuffer.cpp pipe satoshi cost down to queuePacketToNodes 2014-07-30 10:05:21 -07:00
EditPacketBuffer.h pipe satoshi cost down to queuePacketToNodes 2014-07-30 10:05:21 -07:00
JurisdictionListener.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
JurisdictionListener.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
JurisdictionMap.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
JurisdictionMap.h Job #19700 BUG: Crash in NodeBounds::draw() fixed. 2014-06-02 05:55:58 -04:00
JurisdictionSender.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
JurisdictionSender.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
Octree.cpp cleanup storage of entity ids on the server, added improved checks for server vs client 2014-07-29 12:52:46 -07:00
Octree.h cleanup storage of entity ids on the server, added improved checks for server vs client 2014-07-29 12:52:46 -07:00
OctreeConstants.h clean up includes 2014-06-05 16:02:21 -07:00
OctreeEditPacketSender.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-04 12:01:23 -07:00
OctreeEditPacketSender.h Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-04 12:01:23 -07:00
OctreeElement.cpp 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
OctreeElement.h 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
OctreeElementBag.cpp try appendElementData() a different way 2014-06-10 10:43:50 -07:00
OctreeElementBag.h first cut at really using partial appendElementData to make models span packets. still needs work 2014-06-10 16:51:49 -07:00
OctreeHeadlessViewer.cpp Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
OctreeHeadlessViewer.h correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
OctreePacketData.cpp fix up lastEdited behavior 2014-07-31 11:41:18 -07:00
OctreePacketData.h first cut at new ModelItem reading, repacking of ModelItem format in case PropertyFlags shrink 2014-06-09 10:39:48 -07:00
OctreePersistThread.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
OctreePersistThread.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
OctreeProjectedPolygon.cpp Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
OctreeProjectedPolygon.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
OctreeQuery.cpp clean up includes 2014-06-05 16:02:21 -07:00
OctreeQuery.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
OctreeRenderer.cpp some various fixes 2014-07-29 13:34:08 -07:00
OctreeRenderer.h add support for changing the model URL of a model 2014-06-18 11:29:56 -07:00
OctreeSceneStats.cpp fixed warnings 2014-06-30 16:10:58 -07:00
OctreeSceneStats.h prune missing set before constructing nack packets; 2014-07-01 12:01:51 -07:00
OctreeScriptingInterface.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
OctreeScriptingInterface.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
Plane.cpp Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
Plane.h manually fix Plane include guard since regex did not catch 2014-04-09 12:03:57 -07:00
ViewFrustum.cpp Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
ViewFrustum.h Changed DEFAULT_FAR_CLIP to TREE_SCALE 2014-07-25 10:55:42 -07:00