Brad Hefta-Gaub
|
97b0ed2cc5
|
implemented support for PACKET_TYPE_PARTICLE_ERASE
|
2014-01-21 13:24:35 -08:00 |
|
Brad Hefta-Gaub
|
170dbe6e85
|
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
|
2014-01-15 10:20:21 -08:00 |
|
Stephen Birarda
|
987c639e36
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -08:00 |
|
Brad Hefta-Gaub
|
9bc4a3df41
|
switch from pthread mutex to QMutex
|
2014-01-10 18:01:36 -08:00 |
|
Brad Hefta-Gaub
|
5787d3d9e9
|
more cast coding standard fixes
|
2014-01-09 19:00:57 -08:00 |
|
Andrew Meadows
|
6e661e05e5
|
minor cleanup and enforcement of coding standards
|
2013-12-31 09:30:01 -08:00 |
|
ZappoMan
|
d71bc248f4
|
support adjusting particles based on clockSkew
|
2013-12-19 14:49:58 -08:00 |
|
ZappoMan
|
e2b7e08398
|
revert back to timestamps, fix a couple other bugs
|
2013-12-19 09:50:53 -08:00 |
|
ZappoMan
|
8f1fbec057
|
added versioning to SVO files and Particle inHand support
|
2013-12-16 19:49:22 -08:00 |
|
ZappoMan
|
7a4f9cf722
|
particle to particle collisions
|
2013-12-13 10:23:37 -08:00 |
|
ZappoMan
|
f94e000e6b
|
Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions
|
2013-12-12 17:52:33 -08:00 |
|
ZappoMan
|
5830f1134e
|
add particle collisions with voxels
|
2013-12-12 17:52:22 -08:00 |
|
ZappoMan
|
c9da89cde7
|
fix compiler warning
|
2013-12-12 15:50:25 -08:00 |
|
ZappoMan
|
18cbb2d00f
|
particle tree pruning on update
|
2013-12-12 15:09:30 -08:00 |
|
ZappoMan
|
072ced0185
|
first cut at PACKET_TYPE_PARTICLE_ADD implementation
|
2013-12-05 15:38:36 -08:00 |
|
ZappoMan
|
188d52c06e
|
get client working in refactored mode
|
2013-12-04 10:05:37 -08:00 |
|
ZappoMan
|
d7ae023492
|
make addChildAtIndex() use createNewElement() so we get our correct classes
|
2013-12-03 20:40:40 -08:00 |
|
ZappoMan
|
9faef65ccc
|
first cut at splitting out octree base classes
|
2013-12-03 17:32:02 -08:00 |
|