Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 21:20:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
bfa8038f18 removed scripts 2013-12-04 19:51:16 -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
46804f4002 Merge pull request #1310 from PhilipRosedale/master 
Improved drumming, (maybe) lower latency hands
 2013-12-04 19:00:32 -08:00
Philip Rosedale
8d518f85fe Turn off Sixense (kalman?) filtering, cleanup code 2013-12-04 17:55:32 -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
Stephen Birarda
0e3cb11863 use invokeMethod for Audio reset 2013-12-04 16:58:21 -08:00
Stephen Birarda
ab1cd7bd2c fix red/green display in audio debug rendering 2013-12-04 16:24:14 -08:00
Philip Rosedale
c1f96ab6b4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-04 15:49:30 -08:00
Philip Rosedale
0c32f94116 Better drums 2013-12-04 15:48:41 -08:00
Stephen Birarda
d722e0bf6a repairs to Audio class after merge with upstream master 2013-12-04 14:24:07 -08:00
Stephen Birarda
277aa9dd89 handle conflicts on merge with upstream master 2013-12-04 14:21:00 -08:00
Stephen Birarda
7df6210ba0 Merge remote-tracking branch 'upstream/master' into qt-for-portaudio 2013-12-04 14:20:44 -08:00
Stephen Birarda
560844c138 re-enable rendering and fix sampling algorithim 2013-12-04 13:55:27 -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
Philip Rosedale
24fd94eb07 Merge pull request #1305 from ZappoMan/particle_server 
Splitting our Octree and OctreeElement functionality from VoxelTree and VoxelNode
 2013-12-04 13:20:15 -08:00
Stephen Birarda
e339155328 replace missing PortAudio with Qt audio 2013-12-04 12:54:33 -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
ff14e86a5a Merge pull request #1302 from birarda/cleanup 
Make AssignmentClient a proper QCoreApplication instance
 2013-12-04 11:26:06 -08:00
Stephen Birarda
457c3cc8d9 remove unneeded VoxelTree in VoxelScriptingInterface 2013-12-04 11:19:16 -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
Philip Rosedale
2dfbaf605e Stars a bit dimmer, have horizon 2013-12-03 23:01:13 -08:00
ZappoMan
4e18eaa6c5 make addChildAtIndex() use createNewElement() so we get our correct classes 2013-12-03 20:40:48 -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
Andrzej Kapolka
70ca1106b1 Working on testing the Leap/Hydra hands against the avatar body. 2013-12-03 17:28:36 -08:00
Philip Rosedale
b04d48a7b8 Longer drum sticks 2013-12-03 17:19:00 -08:00
Philip Rosedale
423b2e8e0f Highlight voxel being touched 2013-12-03 16:52:38 -08:00
Philip Rosedale
8fdd78dc26 Added drum sounds and voxel collision detection 2013-12-03 16:25:23 -08:00
Stephen Birarda
40a1517108 remove PortAudio entirely 2013-12-03 12:38:26 -08:00
Stephen Birarda
da580ecbaf fix inclusion of QThread in Assignment 2013-12-03 12:31:39 -08:00
Stephen Birarda
969f782a9b simplify index access of QByteArray in processDatagram 2013-12-03 12:29:31 -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
182c69c7b8 re-write Agent to use new QCA infrastructure 2013-12-03 11:34:54 -08:00
Andrzej Kapolka
905320a963 That didn't really help. What did help was simply ignoring the wrist 
constraints.
 2013-12-03 11:30:47 -08:00