Stephen Birarda
|
baae2a3e41
|
fix reference to NodeList in OctreeServer destructor
|
2013-12-05 11:44:11 -08:00 |
|
Stephen Birarda
|
5b6c2531a4
|
use correct cleanup calls in OctreeServer destructor
|
2013-12-05 11:43:48 -08:00 |
|
Stephen Birarda
|
aac01ee70d
|
rename in OctreeServer destructor debug
|
2013-12-05 11:42:34 -08:00 |
|
Stephen Birarda
|
5e429250d3
|
merge with upstream/master
|
2013-12-05 11:41:28 -08:00 |
|
Stephen Birarda
|
7613f3d00c
|
fix VoxelServer to be correctly event-driven, closes #1314
|
2013-12-05 10:08:41 -08:00 |
|
ZappoMan
|
9654f025b4
|
fix build buster
|
2013-12-04 21:33:59 -08:00 |
|
ZappoMan
|
2930ae0f9b
|
attempt to fix build buster
|
2013-12-04 21:29:25 -08:00 |
|
ZappoMan
|
33b3cbaa43
|
fix cmake
|
2013-12-04 21:18:40 -08:00 |
|
ZappoMan
|
aec0e9f4aa
|
added basic particle server renamed voxel packet names to fit standard
|
2013-12-04 21:00:00 -08:00 |
|
ZappoMan
|
3ca7dc7196
|
added CMakeLists.txt
|
2013-12-04 20:19:49 -08:00 |
|
ZappoMan
|
eb66064a18
|
tweak
|
2013-12-04 20:04:26 -08:00 |
|
ZappoMan
|
1b1f9cbf3b
|
actually added the octree-server base class library
|
2013-12-04 19:46:42 -08:00 |
|
ZappoMan
|
d9e60f502c
|
clean up server name
|
2013-12-04 19:46:03 -08:00 |
|
ZappoMan
|
b3e9d369e4
|
removed all dead VoxelServer code, now mostly handled by OctreeServer
|
2013-12-04 19:20:11 -08:00 |
|
ZappoMan
|
fad3a5957d
|
removing dead code
|
2013-12-04 17:50:42 -08:00 |
|
ZappoMan
|
5ff12ab8d1
|
first cut at getting voxel server based on octree server
|
2013-12-04 17:41:52 -08:00 |
|
ZappoMan
|
2119f0da7d
|
Merge branch 'master' of https://github.com/worklist/hifi into more_on_particle_server
Conflicts:
libraries/particle-server/CMakeLists.txt
libraries/particle-server/src/ParticleServer.h
libraries/particles/src/ParticleTree.cpp
|
2013-12-04 13:27:44 -08:00 |
|
ZappoMan
|
37466251d4
|
added some scripts, latest particle server work
|
2013-12-04 13:25:50 -08:00 |
|
ZappoMan
|
c24e32ce06
|
basic ParticleTree and ParticleTreeElement classes
|
2013-12-04 12:32:46 -08:00 |
|
ZappoMan
|
bc5317f20b
|
removed not yet ready for prime time libraries
|
2013-12-04 12:09:05 -08: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 |
|
Stephen Birarda
|
eb316a450a
|
Merge pull request #1298 from ZappoMan/move_hideshow_to_thread
Move Hide/Show local voxels to a dedicated thread
|
2013-12-04 11:27:14 -08:00 |
|
ZappoMan
|
2cb46c3447
|
added DEADBEEF support to debug class
|
2013-12-04 10:37:10 -08:00 |
|
ZappoMan
|
188d52c06e
|
get client working in refactored mode
|
2013-12-04 10:05:37 -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 |
|
Philip Rosedale
|
8fdd78dc26
|
Added drum sounds and voxel collision detection
|
2013-12-03 16:25:23 -08:00 |
|
Stephen Birarda
|
da580ecbaf
|
fix inclusion of QThread in Assignment
|
2013-12-03 12:31:39 -08:00 |
|
Stephen Birarda
|
8fbd1e4cfb
|
repairs after merge with upstream master
|
2013-12-03 12:28:44 -08:00 |
|
Stephen Birarda
|
3277cb49a6
|
Merge remote-tracking branch 'upstream/master' into cleanup
|
2013-12-03 12:21:03 -08:00 |
|
Stephen Birarda
|
3d14fba7ab
|
have AssignmentFactory return a ThreadedAssignment
|
2013-12-03 12:14:24 -08:00 |
|
Stephen Birarda
|
bdf9f9eb22
|
remove extra debugging line
|
2013-12-03 12:11:31 -08:00 |
|
Stephen Birarda
|
5143c68b91
|
fix packet sending from VoxelScriptingInterface
|
2013-12-03 12:09:47 -08:00 |
|
Stephen Birarda
|
6f7e16dc22
|
hook VS to new QCA infrastructure
|
2013-12-03 11:11:08 -08:00 |
|
Stephen Birarda
|
606eaa579a
|
switch node pinging to QTimer in QCoreApplication instance
|
2013-12-03 10:57:31 -08:00 |
|
Stephen Birarda
|
c3b6a7b24c
|
setup subclass for threaded assignments
|
2013-12-03 10:22:13 -08:00 |
|
Philip Rosedale
|
a84e97c54a
|
Removed obsolete HandControl class, files
|
2013-12-03 08:29:17 -08:00 |
|
Stephen Birarda
|
330eff72ce
|
repair usage of DS as STUN server
|
2013-12-02 17:18:07 -08:00 |
|
Stephen Birarda
|
1e279cf99c
|
hook AudioMixer to new event-driven assignment setup
|
2013-12-02 16:34:38 -08:00 |
|
Stephen Birarda
|
49191826af
|
add check for pending datagrams before read
|
2013-12-02 14:08:49 -08:00 |
|
Stephen Birarda
|
141394a664
|
replace UDPSocket with QUDPSocket
|
2013-12-02 13:34:29 -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 |
|
Philip Rosedale
|
7ab9cc9c14
|
Voxel editing with hands, flying and rotation with hands
|
2013-12-02 00:17:06 -08:00 |
|
Philip Rosedale
|
a9139b05e8
|
Drive with trigger pointing
|
2013-11-29 20:46:16 -08:00 |
|
Philip Rosedale
|
65ec91ec13
|
Add hand thrusters
|
2013-11-29 17:49:35 -08:00 |
|
Philip Rosedale
|
abca79ea3e
|
Add button detection for hydra controller to palmData
|
2013-11-29 16:20:43 -08:00 |
|
Philip Rosedale
|
9680941500
|
Add palm velocity
|
2013-11-29 14:50:18 -08:00 |
|
Philip Rosedale
|
14129cd86d
|
Merge pull request #1295 from ZappoMan/compressed_packets
Major improvements to Voxel Packet "packing" and compression
|
2013-11-29 10:06:36 -08:00 |
|
ZappoMan
|
a3b69c1e75
|
bumb version number of PACKET_TYPE_VOXEL_QUERY
|
2013-11-27 15:55:49 -08:00 |
|