ZappoMan
70a4ff1e75
fix cmake qt issue
2014-02-07 14:54:50 -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
9441f9ffb7
fix link issues for many targets
2014-01-13 01:01:30 -08:00
Brad Hefta-Gaub
0cc777caa9
fix windows warning about signed unsigned mismatch
2014-01-12 21:30:21 -08:00
Brad Hefta-Gaub
26adabf130
removed voxel addSphere since it wasn't compiling and was old debug code
2014-01-10 21:39:03 -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
ZappoMan
f230eeadab
added decodeOctCode to voxel-edit
2013-11-13 12:37:40 -08:00
ZappoMan
c123e045ad
added --getOctalCode to voxel edit
2013-10-29 16:42:41 -07:00
ZappoMan
e8ce60d275
implement support for three children encoding
2013-10-16 21:42:55 -07:00
ZappoMan
1e5ce8a7e5
first cut at really getting _children UNION to work
2013-10-16 12:54:37 -07:00
ZappoMan
02bc25f797
implement SVO fill down in voxel-edit
2013-09-25 09:51:15 -07:00
ZappoMan
996314012e
fix small build issue in voxel-edit
2013-08-10 11:31:48 -07:00
ZappoMan
0e9e4c8c07
cr feedback
2013-08-08 16:05:30 -07:00
ZappoMan
25350e99a3
fix whitespace
2013-08-08 14:49:16 -07:00
ZappoMan
1bb7d75794
added tool for splitting SVOs on jurisdiction boundaries
2013-08-08 14:36:42 -07:00
Stephen Birarda
021344fb79
link Qt to voxel-edit target now that QDebug is included in shared
2013-07-16 15:56:46 -07:00
Stephen Birarda
afe49bc756
switch calls to printLog to QDebug
2013-07-16 11:07:22 -07:00
ZappoMan
4f3872c18f
CR feedback
2013-06-04 01:13:58 -07:00
ZappoMan
0a9b3bf5ce
changed file name and exention to Sparse Voxel Octree and svo
2013-06-04 01:07:18 -07:00
ZappoMan
cadc07c63d
merge conflict fix
2013-05-08 18:07:33 -07:00
Philip Rosedale
de6627f922
Merge remote-tracking branch 'upstream/master'
2013-05-08 10:40:05 -07:00
ZappoMan
bc55c09ed7
Added more SceneUtils support cleaned up voxel-edit to use scene utils
...
- Added addCornersAndAxisLines() scene
- Added addSurfaceScene() scene
- moved improved addSphereScene() from voxel-edit to SceneUtils.cpp
- added command line options to voxel-edit to create different scenes
2013-05-08 02:15:39 -07:00
ZappoMan
244da2f9a5
code cleanup, new scene
2013-05-08 01:08:05 -07:00
Philip Rosedale
e1645b1158
Testing audio noise generation at client
2013-05-07 12:48:35 -07:00
ZappoMan
f45bb8c455
fix comment
2013-05-06 21:30:47 -07:00
ZappoMan
e05b74f252
cleaned up code in addScene()
2013-05-06 21:08:06 -07:00
ZappoMan
1967526675
adding command options
2013-05-03 19:36:40 -07:00
ZappoMan
2c128fd813
added voxel-edit tool, as well as made voxel file read/write work, disabled voxel persist on server shutdown
2013-05-03 19:19:48 -07:00
