Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 18:33:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7650 commits 25 branches 0 tags 1.1 GiB
Commit graph

7650 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
80e1b5a4bc some logic and spacing fixes in the audio mixer 2013-12-05 13:05:29 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Philip Rosedale
5d510148c6 Merge pull request #1320 from birarda/cleanup 
fix 100% CPU usage in DS and VS
 2013-12-05 11:57:44 -08:00
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
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
Philip Rosedale
0c4b66ef54 Merge pull request #1312 from ZappoMan/more_on_particle_server 
First cut at basic Particle Server
 2013-12-05 11:29:01 -08:00
Stephen Birarda
6765ce2f1f some spacing cleanup in Audio 2013-12-05 10:23:06 -08:00
Stephen Birarda
6bbd944b6a wait for audio thread to quit on application exit 2013-12-05 10:21:30 -08:00
Stephen Birarda
7613f3d00c fix VoxelServer to be correctly event-driven, closes #1314 2013-12-05 10:08:41 -08:00
Stephen Birarda
a376ebbca2 make DomainServer a proper QCoreApplication instance, closes #1313 2013-12-05 10:00:20 -08:00
ZappoMan
50833cf04c add --particleServerConfig to domain server 2013-12-04 21:37:31 -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
0acd9d0fce tweak to cause rebuild 2013-12-04 21:10:01 -08:00
ZappoMan
821b490ff1 added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:17 -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
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