Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 17:36:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/octree
History
Andrew Meadows 3fd2f12a73 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntitySimulation.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/SimpleEntitySimulation.cpp
	libraries/entities/src/SimpleEntitySimulation.h
	libraries/entities/src/SphereEntityItem.cpp
2014-12-09 12:41:53 -08:00
..
src make collision callbacks work 2014-12-08 14:15:03 -08:00
CMakeLists.txt moving Shape* back into shared lib 2014-12-01 16:03:14 -08:00