Ryan Huffman
|
68665e6b25
|
Fix JurisdictionMap not initializing correctly
|
2016-05-17 15:12:45 -07:00 |
|
Ryan Huffman
|
475d881b04
|
Fix logging of shared_ptr
|
2016-05-17 10:59:51 -07:00 |
|
Ryan Huffman
|
368eded8ee
|
Remove unnecessary type in Jurisdictionmap
|
2016-05-17 10:59:51 -07:00 |
|
Ryan Huffman
|
5fc18eafda
|
Rename OctalCodePtr related functions
|
2016-05-17 10:59:51 -07:00 |
|
Ryan Huffman
|
35f147f557
|
Cleanup use of OctalCodePtrList and add allocateOctalCodePtr
|
2016-05-17 10:59:51 -07:00 |
|
Ryan Huffman
|
e819ab8475
|
Add mutex protection around octal code getters
|
2016-05-17 10:59:51 -07:00 |
|
Ryan Huffman
|
ef6d758e7f
|
Fix JurisdictionMap multithreading issues
Make octal code pointers use shared_ptr, add locks around access.
|
2016-05-17 10:59:51 -07:00 |
|
Atlante45
|
d3224bfde3
|
More warning fixes
|
2015-12-11 16:03:44 -08:00 |
|
Atlante45
|
ce51350b65
|
Fix warnings on windows 64bit
|
2015-12-11 15:42:15 -08:00 |
|
Ryan Huffman
|
9ddcfdf94d
|
Cleanup PacketReceier and ReceivedMessage
|
2015-10-16 09:21:10 -07:00 |
|
Ryan Huffman
|
7682ab00e3
|
Add ReceivedMessage and receive progress
|
2015-10-15 14:09:53 -07:00 |
|
Atlante45
|
b4121eb464
|
Remove unnecessary move
|
2015-07-16 13:14:17 -07:00 |
|
Stephen Birarda
|
05dde9d8f5
|
resolve conflicts on merge with upstream/master
|
2015-07-15 16:18:47 -07:00 |
|
Ryan Huffman
|
44c99ef89a
|
Replace bytesAvailable with bytesLefToRead
|
2015-07-15 10:44:51 -07:00 |
|
ZappoMan
|
bc251de43c
|
delete dead code
|
2015-07-14 16:49:22 -07:00 |
|
Atlante45
|
fbb6a94579
|
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
|
2015-07-14 16:36:28 -07:00 |
|
Atlante45
|
c80df94b06
|
Update includes for moved files
|
2015-07-13 15:28:55 -07:00 |
|
Stephen Birarda
|
3d62162812
|
cleanup octree networking code to use new API
|
2015-07-13 09:40:26 -07:00 |
|
Stephen Birarda
|
c162d53908
|
fix writes in JurisdictionMap
|
2015-07-08 16:38:17 -07:00 |
|
Stephen Birarda
|
d8b03189e3
|
fixes for writes with new API
|
2015-07-08 14:21:26 -07:00 |
|
Atlante45
|
fef51682d5
|
Jurisdiction map uses new packet API
|
2015-07-08 11:19:57 -07:00 |
|
Atlante45
|
7713219718
|
Compile fixes
|
2015-07-08 10:40:35 -07:00 |
|
Stephen Birarda
|
74940a2132
|
replace lingering PacketTypes in old format
|
2015-07-08 10:18:13 -07:00 |
|
Stephen Birarda
|
6b3cf1ba4a
|
remove dependency of PacketHeaders on NodeList
|
2015-05-05 12:19:42 -07:00 |
|
Seth Alves
|
91861e9e5a
|
split out octree logging
|
2015-04-06 17:04:49 -07:00 |
|
Atlante45
|
967028e5cf
|
Removed more QSettings references
|
2015-01-18 19:29:27 -08:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Andrew Meadows
|
1b2db1f7ab
|
fix for warnings about signed/unsigned comparison
|
2014-03-04 11:07:15 -08:00 |
|
Stephen Birarda
|
4de270b832
|
cleanup Node types, closes #1726
|
2014-01-28 13:38:33 -08:00 |
|
Stephen Birarda
|
4103cc1cde
|
packet header changes and beginning of conversion to QByteArray
|
2014-01-28 10:36:08 -08:00 |
|
Brad Hefta-Gaub
|
e0f68bedc1
|
fixed type
|
2014-01-22 15:25:05 -08:00 |
|
Brad Hefta-Gaub
|
6e9e21051d
|
first cut at move JurisdicionListener and JuridictionSender into non-mulitply derived classes
|
2014-01-22 14:05:31 -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
|
a290017746
|
more type mismatch warning fixes
|
2014-01-13 00:46:43 -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
|
aec0e9f4aa
|
added basic particle server renamed voxel packet names to fit standard
|
2013-12-04 21:00:00 -08:00 |
|
ZappoMan
|
9faef65ccc
|
first cut at splitting out octree base classes
|
2013-12-03 17:32:02 -08:00 |
|