Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 08:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface/src/voxels
History
ZappoMan 32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
..
OctreePacketProcessor.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
OctreePacketProcessor.h VoxelPacketProcessor -> OctreePacketProcessor 2014-06-10 11:05:51 -07:00
PrimitiveRenderer.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
PrimitiveRenderer.h Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-15 20:36:50 -04:00
VoxelFade.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
VoxelFade.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
VoxelHideShowThread.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
VoxelHideShowThread.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
VoxelImporter.cpp importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
VoxelImporter.h importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
VoxelSystem.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:04:40 -07:00
VoxelSystem.h Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:04:40 -07:00