Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 05:20:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries
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
..
animation remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
audio Merge pull request #3270 from chansensturm/audio-filter 2014-08-11 12:22:40 -07:00
avatars Merge pull request #3268 from birarda/take-out-the-trash 2014-08-11 09:15:38 -07:00
embedded-webserver remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
entities Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
fbx remove ROOT_DIR param in include_glm, remove ROOT_DIR from root CMakeLists 2014-08-08 13:22:00 -07:00
metavoxels Deflated JPEG encoding for blocks above 16x16. 2014-08-14 19:21:32 -07:00
networking Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
octree Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
particles Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
script-engine Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
shared Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
voxels Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00