Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 15:14:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries
History
Andrew Meadows 82a4b7a4d1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/Application.cpp
2014-01-29 13:20:42 -08:00
..
audio cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
avatars Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-29 13:20:42 -08:00
embedded-webserver serve a 301 redirect when trailing slash is missing, closes #1712 2014-01-28 16:25:04 -08:00
metavoxels packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
octree resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
octree-server cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
particle-server cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
particles fix Particle update signature 2014-01-29 12:30:20 -08:00
script-engine resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
shared resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
voxel-server cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
voxels cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00