ZappoMan
|
bde2146b1b
|
whitespace cleanup
|
2014-03-23 18:14:36 -07:00 |
|
ZappoMan
|
9c7ffffbae
|
fix some windows issues
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
|
2014-03-23 18:10:22 -07:00 |
|
Stephen Birarda
|
cfec1e583e
|
fix logging target-name extra characters
|
2014-02-20 12:02:23 -08:00 |
|
ZappoMan
|
a0789d3a29
|
clean up bad edit packet warnings to help reduce log clutter
|
2014-02-10 11:21:27 -08:00 |
|
Andrzej Kapolka
|
d3b005112e
|
Changes from Philip's code review.
|
2014-02-07 10:03:23 -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
|
44893b0a8c
|
hackery to get windows to build
|
2014-01-10 19:58:10 -08:00 |
|
Brad Hefta-Gaub
|
5725a92cfe
|
get rid of arpa/inet.h and netdb.h
|
2014-01-10 18:13:23 -08:00 |
|
Stephen Birarda
|
141394a664
|
replace UDPSocket with QUDPSocket
|
2013-12-02 13:34:29 -08:00 |
|
Stephen Birarda
|
5b505bcc95
|
just use default to catch unknown Qt message types
|
2013-10-31 14:16:30 -07:00 |
|
Stephen Birarda
|
bfe7c82232
|
add default and QtTraceMsg to switch to avoid warnings
|
2013-10-31 14:10:08 -07:00 |
|
Stephen Birarda
|
613334074f
|
leverage qDebug and custom message handler for verbose logging
|
2013-09-09 15:11:11 -07:00 |
|
Stephen Birarda
|
b0c9dfeddc
|
more leveraging of standardized logging
|
2013-09-09 14:47:15 -07:00 |
|
Stephen Birarda
|
fe8fabee38
|
add a static method to the Logging class to change target name
|
2013-09-09 14:31:27 -07:00 |
|
Stephen Birarda
|
8077963bb1
|
add standardized logging and leverage forked assignment clients
|
2013-09-09 14:21:33 -07:00 |
|