Commit graph

14 commits

Author SHA1 Message Date
ZappoMan
1a67d946d8 more warnings fixes 2014-01-02 16:33:58 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
ZappoMan
1badc8dc5d first pass at removing timestamps from particles removed _lastUpdated/getLastUpdated() 2013-12-18 16:59:36 -08:00
ZappoMan
3d2a00b732 Merge branch 'master' of https://github.com/worklist/hifi into particle_details
Conflicts:
	animation-server/src/main.cpp
2013-12-06 16:03:02 -08:00
ZappoMan
91ffb5b167 added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Stephen Birarda
baae2a3e41 fix reference to NodeList in OctreeServer destructor 2013-12-05 11:44:11 -08:00
Stephen Birarda
5b6c2531a4 use correct cleanup calls in OctreeServer destructor 2013-12-05 11:43:48 -08:00
Stephen Birarda
aac01ee70d rename in OctreeServer destructor debug 2013-12-05 11:42:34 -08:00
Stephen Birarda
5e429250d3 merge with upstream/master 2013-12-05 11:41:28 -08:00
ZappoMan
2930ae0f9b attempt to fix build buster 2013-12-04 21:29:25 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
eb66064a18 tweak 2013-12-04 20:04:26 -08:00
ZappoMan
1b1f9cbf3b actually added the octree-server base class library 2013-12-04 19:46:42 -08:00