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 |
|
ZappoMan
|
b7e258519b
|
fix entity delete message by not adjusting clock skew on it, since there's no clock times in the packet
|
2014-08-13 17:12:03 -07:00 |
|
Stephen Birarda
|
17df6484d4
|
remove ssize_t and replace with size_t or int where appropriate
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Stephen Birarda
|
4103cc1cde
|
packet header changes and beginning of conversion to QByteArray
|
2014-01-28 10:36:08 -08:00 |
|
Brad Hefta-Gaub
|
9231c1d80a
|
remove ParticleEditHandle, and change ParticleCollisionSystem to use new particle edit API
|
2014-01-22 15:21:58 -08:00 |
|
Brad Hefta-Gaub
|
278ca02595
|
remove debug code
|
2014-01-21 14:06:55 -08:00 |
|
Brad Hefta-Gaub
|
d831f9df5e
|
first cut at using partial property info in particle edits
|
2014-01-20 16:34:45 -08:00 |
|
ZappoMan
|
d71bc248f4
|
support adjusting particles based on clockSkew
|
2013-12-19 14:49:58 -08:00 |
|
ZappoMan
|
03e892d4fd
|
make shootParticle() work better
|
2013-12-10 17:42:55 -08:00 |
|
ZappoMan
|
91ffb5b167
|
added node type to jurisdiction messages and more work on particle editing
|
2013-12-06 15:56:51 -08:00 |
|
ZappoMan
|
426c89b639
|
First cut at new ParticleEditPacketSender class
|
2013-12-05 18:00:56 -08:00 |
|