Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 17:26:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/tests
History
ZappoMan 2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
2014-08-28 21:19:56 -07:00
..
audio merge with upstream 2014-08-13 11:09:55 -07:00
jitter merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
metavoxels repair build of various tools 2014-08-08 13:17:54 -07:00
networking repair build of various tools 2014-08-08 13:17:54 -07:00
octree build issues fixed after merge 2014-08-18 15:41:20 -07:00
physics sometimes swap order of shapes for simpler code 2014-08-22 18:07:11 -07:00
shared merge with upstream 2014-08-13 11:09:55 -07:00
CMakeLists.txt library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00