Atlante45
|
fbb6a94579
|
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
|
2015-07-14 16:36:28 -07:00 |
|
Stephen Birarda
|
fbd287472d
|
make NodeData parseData take only packet
|
2015-07-14 14:09:00 -07:00 |
|
Atlante45
|
c80df94b06
|
Update includes for moved files
|
2015-07-13 15:28:55 -07:00 |
|
Stephen Birarda
|
ede39515d8
|
update parseData for new network API
|
2015-07-13 14:26:10 -07:00 |
|
Seth Alves
|
ddb907ae5f
|
inline setMaxQueryPacketsPerSecond
|
2015-05-11 12:15:52 -07:00 |
|
Seth Alves
|
83748096ef
|
max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree
|
2015-05-11 11:37:53 -07:00 |
|
Seth Alves
|
34deba7fff
|
undo mistaken change of setting name
|
2015-05-09 17:59:45 -07:00 |
|
Seth Alves
|
8c3a57566b
|
fix name of settings key for max octree pps
|
2015-05-07 16:00:30 -07:00 |
|
Atlante45
|
27459ba861
|
Settings update
|
2015-02-03 12:27:30 -08:00 |
|
Atlante45
|
850f92eae3
|
Don't call Settings::set when you don't need too.
|
2015-01-20 17:54:11 -08:00 |
|
Atlante45
|
8d37f5ae00
|
More setting handles
|
2015-01-20 15:35:22 -08:00 |
|
Atlante45
|
e8a396b08b
|
Moved Octree max pps out of Menu
Moved it to OctreeQuery
|
2015-01-17 23:31:38 -08:00 |
|
ZappoMan
|
daffb00bf2
|
build issues fixed after merge
|
2014-08-18 15:41:20 -07:00 |
|
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 |
|
Stephen Birarda
|
31488e72fe
|
repairs for interface build to succeed
|
2014-08-08 13:17:53 -07:00 |
|
ZappoMan
|
165984ff31
|
clean up includes
|
2014-06-05 16:02:21 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
ZappoMan
|
cbca298717
|
cruft cleanup
|
2014-02-26 00:31:05 -08:00 |
|
Stephen Birarda
|
9b549723d3
|
remove unused UUID from OctreeQuery
|
2014-01-31 13:47:59 -08:00 |
|
Stephen Birarda
|
254a0c0aed
|
remove a double push on UUID in OctreeQuery
|
2014-01-31 13:44:24 -08:00 |
|
Stephen Birarda
|
4103cc1cde
|
packet header changes and beginning of conversion to QByteArray
|
2014-01-28 10:36:08 -08:00 |
|
Stephen Birarda
|
8d2e9823de
|
remove notion of owning node from NodeData
|
2014-01-23 17:06:03 -08:00 |
|
ZappoMan
|
9faef65ccc
|
first cut at splitting out octree base classes
|
2013-12-03 17:32:02 -08:00 |
|