Brad Hefta-Gaub
|
a16b3a34e4
|
fix stutter while spinning
|
2014-02-06 02:18:28 -08:00 |
|
ZappoMan
|
b0c41b086d
|
fix voxel packet corruption
|
2014-02-04 22:54:55 -08:00 |
|
Stephen Birarda
|
4de270b832
|
cleanup Node types, closes #1726
|
2014-01-28 13:38:33 -08:00 |
|
Stephen Birarda
|
cda06d1cb3
|
replace uint64_t with quint64 for Qt friendlyness
|
2014-01-28 12:35:42 -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 |
|
Philip Rosedale
|
a4f13e8bdd
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-16 15:01:57 -08:00 |
|
Brad Hefta-Gaub
|
a76f5a088c
|
fixed comment
|
2014-01-16 13:19:21 -08:00 |
|
Brad Hefta-Gaub
|
a960330f34
|
fix voxel randomly disappearing bug
|
2014-01-16 13:17:41 -08:00 |
|
Philip Rosedale
|
46bd677a4a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-16 11:51:54 -08:00 |
|
Philip Rosedale
|
aa2ee2526e
|
name file correctly
|
2014-01-16 11:51:46 -08:00 |
|
Brad Hefta-Gaub
|
7bfda0d60e
|
removed pthread.h
|
2014-01-15 10:30:05 -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
|
599e3bb9e5
|
resolve conflicts on merge with upstream master
|
2014-01-14 16:15:58 -08:00 |
|
Stephen Birarda
|
8676ac38f9
|
foreach spacing and reference repairs
|
2014-01-14 15:54:09 -08:00 |
|
Stephen Birarda
|
987c639e36
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -08:00 |
|
Stephen Birarda
|
7d1a64ca8c
|
change NodeList container to QHash with QSharedPointer
|
2014-01-13 17:09:21 -08:00 |
|
Brad Hefta-Gaub
|
55babbf7b6
|
windows type mismatch warning fixes
|
2014-01-13 00:30:23 -08:00 |
|
Brad Hefta-Gaub
|
a94e371e5c
|
fix more windows warnings
|
2014-01-12 21:27:25 -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 |
|
Brad Hefta-Gaub
|
9bc4a3df41
|
switch from pthread mutex to QMutex
|
2014-01-10 18:01:36 -08:00 |
|
Brad Hefta-Gaub
|
6e95c52444
|
make local voxel cache properly switch to different cache file when switching domains
|
2014-01-09 14:51:04 -08:00 |
|
Brad Hefta-Gaub
|
c181d0a849
|
first cut at local voxel cache
|
2014-01-09 12:05:09 -08:00 |
|
Stojce Slavkovski
|
ee1eb25dfa
|
replace LogDisplay with File logger
- added abstract logger interface
|
2013-12-22 18:56:53 +01:00 |
|
ZappoMan
|
2b27c91550
|
Merge branch 'master' of https://github.com/worklist/hifi into particle_server
Conflicts:
interface/src/VoxelSystem.cpp
interface/src/VoxelSystem.h
|
2013-12-04 11:40:54 -08:00 |
|
ZappoMan
|
bc715085a9
|
Merge pull request #1304 from PhilipRosedale/master
Voxel drumming, search function to find leaf voxel containing a point
|
2013-12-04 11:28:39 -08:00 |
|
ZappoMan
|
188d52c06e
|
get client working in refactored mode
|
2013-12-04 10:05:37 -08:00 |
|
ZappoMan
|
4e18eaa6c5
|
make addChildAtIndex() use createNewElement() so we get our correct classes
|
2013-12-03 20:40:48 -08:00 |
|
ZappoMan
|
9faef65ccc
|
first cut at splitting out octree base classes
|
2013-12-03 17:32:02 -08:00 |
|
Philip Rosedale
|
8fdd78dc26
|
Added drum sounds and voxel collision detection
|
2013-12-03 16:25:23 -08:00 |
|
ZappoMan
|
76b3bd4e6e
|
Move Hide/Show local voxels to a dedicated thread so that it doesn't slow performance of voxel packet processing
|
2013-12-02 12:08:45 -08:00 |
|
ZappoMan
|
dac211cebd
|
pack more compressed sections into wire packets if there is room
|
2013-11-26 22:18:24 -08:00 |
|
ZappoMan
|
b7ee2ea2db
|
add section size to compressed packets to allow packing of multiple sections
|
2013-11-26 19:47:14 -08:00 |
|
ZappoMan
|
77590b5b87
|
cleanup debug, readd fix to not recurse subtrees when node is colored
|
2013-11-26 19:23:21 -08:00 |
|
ZappoMan
|
2ce9937126
|
major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item
|
2013-11-26 17:27:08 -08:00 |
|
ZappoMan
|
d13ebf6095
|
more menu cleanup removing developer options that are now defunct
|
2013-11-25 14:44:34 -08:00 |
|
ZappoMan
|
70213630e1
|
Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets
|
2013-11-25 13:38:22 -08:00 |
|
ZappoMan
|
25511f99ec
|
cleanup for coding standard
|
2013-11-24 15:22:44 -08:00 |
|
ZappoMan
|
e2f5069e6a
|
more VoxelPacket compression tuning
|
2013-11-24 14:41:50 -08:00 |
|
ZappoMan
|
e65f74e06b
|
moved compression into VoxelPacket class. works, but too slow for larger sizes
|
2013-11-23 21:40:50 -08:00 |
|
Andrzej Kapolka
|
f0e5872b89
|
Lighten the shadows, remove some debug code.
|
2013-11-21 12:29:22 -08:00 |
|
ZappoMan
|
6c640752cd
|
make compression optional
|
2013-11-21 12:04:13 -08:00 |
|
Andrzej Kapolka
|
4bcc6fdc0d
|
More progress on shadows.
|
2013-11-20 18:27:59 -08:00 |
|
ZappoMan
|
c2cb6df61c
|
first cut at compresses voxel packets
|
2013-11-18 09:46:32 -08:00 |
|
ZappoMan
|
64d5ccf91e
|
add menu option for voxel server fade in/out and dont remove local voxels when server shuts down
|
2013-11-07 14:10:09 -08:00 |
|
ZappoMan
|
9bd27e2b2a
|
fix stutter on rotating
|
2013-11-03 21:11:08 -08:00 |
|
ZappoMan
|
c18de72dd4
|
work on debugging stutter behavior, mostly debugging and cleanup
|
2013-11-03 19:06:06 -08:00 |
|
ZappoMan
|
c4a2b3c49b
|
fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel
|
2013-11-03 11:10:00 -08:00 |
|
ZappoMan
|
13b558c033
|
removed dead code
|
2013-11-01 14:40:58 -07:00 |
|
ZappoMan
|
b3aac56d29
|
first cut a variable point size point rendering
|
2013-11-01 14:33:06 -07:00 |
|