Stephen Birarda
|
71aca69410
|
fix rendered scope for new Qt Audio
|
2013-12-05 11:36:45 -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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Stephen Birarda
|
3301796997
|
change const HifiSockAddr in DataServerClient to remove error
|
2013-12-03 11:20:12 -08:00 |
|
Stephen Birarda
|
6f7e16dc22
|
hook VS to new QCA infrastructure
|
2013-12-03 11:11:08 -08:00 |
|
Stephen Birarda
|
ed854dcb7b
|
re-work AvatarMixer to new QCA infrastructure, closes #1300
|
2013-12-03 10:58:04 -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 |
|
Stephen Birarda
|
6ce8c12cb7
|
remove timing debug for DS check in
|
2013-12-03 10:09:38 -08:00 |
|
Stephen Birarda
|
6d162ff7a7
|
process any new events at beginning of Assignment while loop
|
2013-12-03 10:07:40 -08:00 |
|
Stephen Birarda
|
02732e9a2e
|
cleanup memory leaks and timing on assignment threading
|
2013-12-03 10:03:56 -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
|
113ef1b386
|
fix cleanup of finished assignment
|
2013-12-02 16:45:13 -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
|
6d04d0cee1
|
replace a missing capture of received bytes
|
2013-12-02 13:37:43 -08:00 |
|
Stephen Birarda
|
141394a664
|
replace UDPSocket with QUDPSocket
|
2013-12-02 13:34:29 -08:00 |
|