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

515 commits

Author SHA1 Message Date
Philip Rosedale
22048aaba5 Merge pull request #2392 from birarda/audio-scaling 
allow Agents to send microphone audio using Sound objects
 2014-03-19 17:00:46 -07:00
Philip Rosedale
e14069c9e3 Merge pull request #2376 from ZappoMan/experimental_scaling 
Voxel Server Performance Improvements
 2014-03-19 16:24:47 -07:00
Stephen Birarda
8c4fad443f allow Agents to microphone audio from Sound objects 2014-03-19 16:14:58 -07:00
ZappoMan
cd6e0f1698 switch to deleteLater to prevent deadlock 2014-03-19 01:02:49 -07:00
ZappoMan
b3f60a068d remove isScheduledForDelete from OctreeQueryNode 2014-03-19 00:17:14 -07:00
ZappoMan
450a9c03a7 revert changes 2014-03-18 23:54:23 -07:00
ZappoMan
499c4bd500 fix octree server crashes on various shutdown corner cases 2014-03-18 17:44:53 -07:00
ZappoMan
220232312d remove unused variables 2014-03-18 16:06:20 -07:00
Andrzej Kapolka
500f9d1485 Merge pull request #2338 from AndrewMeadows/cleanup 
Don't send redundant avatar hand/head data, and cleanup.
 2014-03-18 13:57:30 -07:00
Stephen Birarda
b6a41eeaaa resolve conflicts on merge with upstream master 2014-03-18 10:37:04 -07:00
Andrew Meadows
de67a828cc Merge upstream/master into cleanup project 2014-03-18 09:41:41 -07:00
Andrew Meadows
272cb879f8 change wording of comment 2014-03-18 09:38:49 -07:00
ZappoMan
dfb07e717d removed old debugging code 2014-03-18 09:34:24 -07:00
ZappoMan
86c2b5baa7 removed some debugging, added some comments, more work on optimizaiton 2014-03-18 01:51:30 -07:00
ZappoMan
329d3b37e0 add last know root timestamp property to query node 2014-03-18 01:07:45 -07:00
ZappoMan
beffb6deae clean up stats 2014-03-18 01:04:52 -07:00
ZappoMan
34b2ccb9d7 adding not sent to stats 2014-03-18 00:02:47 -07:00
ZappoMan
fc50cc0604 improving server stats 2014-03-17 23:40:07 -07:00
Stephen Birarda
1fc9ac1815 make the client mix buffer only as large as it needs to be 2014-03-17 17:55:47 -07:00
Stephen Birarda
f3910f8c1a scope clientMixBuffer only to AudioMixer run 2014-03-17 17:54:27 -07:00
ZappoMan
62dabd9c1c formatting of stats 2014-03-17 17:49:50 -07:00
Philip Rosedale
a7f0e41232 Merge pull request #2342 from birarda/master 
switch data for mix samples in AudioMixer
 2014-03-17 17:30:14 -07:00
Stephen Birarda
07a71d8796 use char instead of QByteArray for mix samples in AudioMixer 2014-03-17 17:22:16 -07:00
Stephen Birarda
447f23a1c9 repair _clientSamples copying into _clientMix 2014-03-17 16:56:29 -07:00
Stephen Birarda
d652cec766 some potential fixes to QByteArray crash 2014-03-17 16:30:58 -07:00
Stephen Birarda
61594b9a1e fixes to silent audio frame sending 2014-03-17 16:27:49 -07:00
ZappoMan
e9684c0ee5 added more stats to octree server stats page 2014-03-17 16:11:00 -07:00
Andrew Meadows
679d09610c Merge upstream/master into "no hands" project. 2014-03-17 14:59:14 -07:00
Stephen Birarda
c7e12824a8 clarify check for audio loudness in AudioMixer 2014-03-17 14:35:26 -07:00
Stephen Birarda
bc9deb5db7 handle trivial case of not mixing silent audio streams 2014-03-17 14:29:53 -07:00
Andrew Meadows
ed3cf36045 cleanup: AvatarData doesn't derive from NodeData 
Cleaner Interface since the AvatarData is already not the NodeList.
Reduces overhead/confusing code when parsing packets from AvatarMixer.
 2014-03-17 14:10:42 -07:00
ZappoMan
07adfed6b4 call setLastHeardFromMicrostamp() when we get packets from nodes so NodeList doesn't drop them 2014-03-17 13:47:05 -07:00
Stephen Birarda
288272f051 fix a reversed MMX add 2014-03-17 11:26:35 -07:00
ZappoMan
949678f74a Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-17 11:03:15 -07:00
Brad Hefta-Gaub
927006df91 Merge pull request #2331 from birarda/audio-scaling 
AudioMixer optimizations with MMX intrinsics
 2014-03-17 11:02:44 -07:00
ZappoMan
aab2ca826f Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling 2014-03-17 11:01:25 -07:00
ZappoMan
981ab7374a fix crash in client shutdown, clean up some debugging, clean up Q_OBJECT 2014-03-17 11:01:09 -07:00
Stephen Birarda
cc1d309c15 some really trivial magic number replacements 2014-03-17 10:13:29 -07:00
Stephen Birarda
05d6522279 more MMX optimizations to AudioMixer for delayed samples 2014-03-17 10:02:00 -07:00
ZappoMan
bd6b70ee32 use unsigned int vs size_t, since that just seems more correct 2014-03-16 11:07:24 -07:00
ZappoMan
7d7e1ff28a one more crack at this signedness comparisons on unix 2014-03-15 23:37:52 -07:00
ZappoMan
5709a8893e more unix signedness warnings 2014-03-15 23:19:16 -07:00
ZappoMan
08d89a4565 arg windows signedness warnings 2014-03-15 23:17:03 -07:00
ZappoMan
6f85cfdb2f more warnings fixes 2014-03-15 23:00:03 -07:00
ZappoMan
adb6ffe7c4 more warnings fixes 2014-03-15 22:00:44 -07:00
Stephen Birarda
72449fdb6a initial optimizations to AudioMixer with mmx additions 2014-03-14 17:50:57 -07:00
ZappoMan
21458036cc clean up formatting of sending stats 2014-03-14 10:37:41 -07:00
ZappoMan
4c39a891be add more packet sending statistics to server 2014-03-14 10:23:07 -07:00
ZappoMan
8006719fda add new stats to OctreeServer 2014-03-14 00:42:23 -07:00
Stephen Birarda
54d73d4a64 use floor since round is missing on windows 2014-03-12 17:50:58 -07:00
Stephen Birarda
060d8be9f4 Merge branch 'master' of https://github.com/highfidelity/hifi into agent-audio 2014-03-12 17:07:21 -07:00
Stephen Birarda
3b653ca542 add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291 2014-03-12 17:00:12 -07:00
AndrewMeadows
bed8617846 Merge pull request #2277 from ZappoMan/server_scale_testing 
Voxel/Particle Server Scaling Work
 2014-03-12 15:24:29 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
ZappoMan
6173a4d2a7 fix isFullScene correctly 2014-03-12 10:19:21 -07:00
ZappoMan
7e6beba4d2 removed redundant calc of isFullScene 2014-03-12 01:29:41 -07:00
ZappoMan
4d0b762de3 some hacking on full scene debuggin 2014-03-11 20:33:53 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
81e3197751 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 10:03:30 -07:00
Andrzej Kapolka
9e5aae4a39 Remove spanner bits. 2014-03-10 17:01:27 -07:00
ZappoMan
cfa618d694 cleanup constructors 2014-03-08 23:31:23 -08:00
Andrzej Kapolka
0448596e58 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2014-03-05 18:28:25 -08:00
Andrzej Kapolka
63b4a2453b Lots of work on metavoxel LODs and spanners. 2014-03-04 21:27:13 -08:00
ZappoMan
374af9eeb5 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:40:49 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
ZappoMan
ef87fbffac Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	libraries/shared/src/ResourceCache.cpp
 2014-02-28 16:58:43 -08:00
Stephen Birarda
094159eefd make Agent parent of ScriptEngine so they stay on same thread 2014-02-28 16:47:54 -08:00
ZappoMan
c1c41ea2ca handle some shutdown cases and reduce time of locking in octree server 2014-02-28 16:18:02 -08:00
ZappoMan
8d7406461a Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
 2014-02-28 10:54:56 -08:00
ZappoMan
f9718913e2 fix octree-server random spinout sometimes when client disconnects 2014-02-27 16:13:05 -08:00
ZappoMan
cdb0aeb153 some hacking on server performance 2014-02-27 10:47:17 -08:00
ZappoMan
2832c33482 fixed div by zero 2014-02-26 21:38:28 -08:00
ZappoMan
6f1136c417 more status page formatting, and include max total packets in packets per client interval 2014-02-26 21:25:34 -08:00
ZappoMan
85a42849a8 work on current client count 2014-02-26 21:25:15 -08:00
ZappoMan
8c4fdbb1c6 remove dead comments 2014-02-26 21:24:50 -08:00
ZappoMan
a34aef658d cleanup OctreeSendThread correctly 2014-02-26 21:24:32 -08:00
ZappoMan
1603c1f38c work on client stats and max total packets per second 2014-02-26 21:24:12 -08:00
ZappoMan
39ba98f3b1 fixed a comment 2014-02-26 14:23:58 -08:00
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -08:00
Stephen Birarda
937768ae51 add option for fake billboard from URL, closes #2087 2014-02-25 13:51:48 -08:00
ZappoMan
039f9ff1e3 Merge pull request #2088 from birarda/authentication 
always authenticate to default and fix audio-mixer session UUID
 2014-02-25 11:22:54 -08:00
Stephen Birarda
a24366fcd7 populate packet header only once session UUID is received 2014-02-25 11:16:19 -08:00
Stephen Birarda
b09ed1dff1 present a login window on app start 2014-02-25 10:53:13 -08:00
ZappoMan
17e4426b50 Merge pull request #2086 from PhilipRosedale/master 
Add stochastic falloff for sending other avatar’s data
 2014-02-25 10:52:43 -08:00
Philip Rosedale
176cb103dc Add stochastic falloff for sending other avatar’s data 2014-02-25 10:41:33 -08:00
Stephen Birarda
61fcfd17e3 add org and app info to AC for settings ini 2014-02-24 15:16:56 -08:00
Stephen Birarda
050d223b3a add domain connection reset to NodeList reset 2014-02-24 13:33:52 -08:00
Stephen Birarda
27c779666b add auth to assignment-client, fix refresh of static assignments 2014-02-24 13:29:32 -08:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Andrzej Kapolka
8745ca3139 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-23 20:13:23 -08:00
Andrzej Kapolka
68fea8de1e More merge fixes. 2014-02-21 18:32:05 -08:00
Andrzej Kapolka
e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-02-21 18:26:40 -08:00
Andrzej Kapolka
ac02609bc2 The basic billboard behavior, closes #1864. 2014-02-21 15:38:49 -08:00
Stephen Birarda
340248ac43 resolve conflicts on merge with upstream master 2014-02-21 15:16:15 -08:00
Andrzej Kapolka
8d01527d93 Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 12:16:33 -08:00
Andrzej Kapolka
10ce2cb3f0 Working on sending the billboards over the network. 2014-02-21 11:49:29 -08:00
ZappoMan
a12e1ef18f Merge pull request #2043 from birarda/metavoxel-fix 
fixes for extra characters in logging target names
 2014-02-21 10:24:29 -08:00
Andrzej Kapolka
d8321bd419 Merge pull request #2034 from birarda/master 
fixes for scripted avatars
 2014-02-21 10:14:41 -08:00
Stephen Birarda
a6c1e3e87f tweaks to domain-server authentication flow 2014-02-20 16:31:50 -08:00
Stephen Birarda
3bace43aae Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-20 12:08:47 -08:00
Stephen Birarda
cfec1e583e fix logging target-name extra characters 2014-02-20 12:02:23 -08:00
Stephen Birarda
4022d9f4c4 fix metavoxel interest list, keep node alive with ping 2014-02-20 11:36:16 -08:00
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
Stephen Birarda
4ee416ba96 fixes for scripted avatars, closes #2033 2014-02-19 16:55:24 -08:00
Stephen Birarda
7c69028dc5 hook up domain request for node to authenticate 2014-02-18 10:54:45 -08:00
Stephen Birarda
37f1f7ba4f add a DomainInfo class to hold domain information 2014-02-18 09:59:22 -08:00
Andrzej Kapolka
9c91d3c2e7 Use the existing session stuff for metavoxels rather than a separate system. 2014-02-13 10:25:10 -08:00
Stephen Birarda
a1a4a3db8a HifiSockAddr to SharedNodePointer changes in MetavoxelServer 2014-02-07 14:27:10 -08:00
Stephen Birarda
dd4d944dea ping inactive nodes in conjunction with domain server check in 2014-02-07 14:06:42 -08:00
Stephen Birarda
a5636d2dc0 make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895 2014-02-07 12:25:43 -08:00
Stephen Birarda
66d4eeb805 enforce both a version and hash match for packets 2014-02-07 11:10:38 -08:00
Stephen Birarda
997bea708d fix a PacketTypeVoxelQuery typo 2014-02-07 10:32:48 -08:00
Stephen Birarda
d39cccde77 add a method to find a node and upate based on packet 2014-02-07 10:32:16 -08:00
Stephen Birarda
fa1825fa32 repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID 2014-02-07 10:20:50 -08:00
Stephen Birarda
c1132726bf use SharedNodePointer in place of Node where appropriate 2014-02-06 14:58:03 -08:00
Stephen Birarda
97a7369c76 remove senderWithAddress from NodeList 2014-02-06 14:43:46 -08:00
Stephen Birarda
a823722d27 add writeDatagram helper to NodeList to insert md5 hash 2014-02-06 14:28:58 -08:00
Stephen Birarda
e72f6d16cc rename NodeList ownerUUID to sessionUUID 2014-02-06 11:43:23 -08:00
Stephen Birarda
f92f9ec0c2 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-06 09:28:03 -08:00
Stephen Birarda
f4fe2bb754 move octree-server libs to assignment-client 2014-02-05 16:04:23 -08:00
Stephen Birarda
9694a622b5 update placeholder and give edit packet senders to Agent 2014-02-05 15:35:13 -08:00
Stephen Birarda
53170d3fe2 fix skeleton setting on parsing of identity packet 2014-02-04 16:49:21 -08:00
Stephen Birarda
adaa36a51d repairs to key-framed URL sending through avatar-mixer 2014-02-04 15:28:27 -08:00
Stephen Birarda
7e3442cbd0 repair to PacketType so interface parses AM packet 2014-02-04 14:57:14 -08:00
Stephen Birarda
3959209bc2 complete movement of URLs to AvatarData for re-usability 2014-02-04 14:49:56 -08:00
Stephen Birarda
2b80a5fbb8 move face/skeleton model URLs to AvatarData 2014-02-04 14:40:41 -08:00
Stephen Birarda
26c961dc66 send identity packets when changes occur between keyframes 2014-02-04 14:24:13 -08:00
Stephen Birarda
33305ad111 have the avatar-mixer broadcast identity packets every 5 seconds 2014-02-04 13:42:22 -08:00
Stephen Birarda
31bd5f7ce8 add parsing of PacketTypeAvatarIdentity to AvatarMixer 2014-02-04 13:27:05 -08:00
ZappoMan
579c601ff7 Merge pull request #1810 from birarda/master 
scripting nomenclature changes
 2014-01-31 17:14:07 -08:00
Stephen Birarda
c754663582 force queued connection for readyRead on node socket in case it moves, closes #1685 2014-01-31 17:09:08 -08:00
Stephen Birarda
dd83ff0538 move isAvatar property access to Agent object 2014-01-31 14:36:50 -08:00
Stephen Birarda
2cc6d22181 fix push bytesRead when creating dummy Avatar packets, closes #1794 2014-01-31 12:44:09 -08:00
Stephen Birarda
4573eaebc6 fix multiple avatar parsing in AvatarManager 2014-01-31 12:02:24 -08:00
Stephen Birarda
55049eeb6b fix assignment packing and unpacking from DS to AC 2014-01-30 14:54:52 -08:00
Andrzej Kapolka
e99b7ea92c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-01-29 13:34:19 -08:00
Stephen Birarda
2dd71435ee fix build breakers for new packet type 2014-01-29 12:25:05 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
85ebad979f repair assignment flow errors from packet changes 2014-01-28 11:15:38 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
Andrzej Kapolka
9a892ea51a Let's actually close our sessios on exit. 2014-01-27 17:03:35 -08:00
Andrzej Kapolka
d5695395c4 Basic editing with delta streaming up and running. 2014-01-27 15:49:50 -08:00
ZappoMan
5e4813ab11 more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
ZappoMan
c5ba92d73e first part of getting local particle tree in agent 2014-01-27 11:10:59 -08:00
Andrzej Kapolka
1ef6f5f7b3 MetavoxelDataPointer -> MetavoxelData, grid spacing as power of 2. 2014-01-26 13:23:10 -08:00
AndrewMeadows
ea681f0d8f Merge pull request #1669 from birarda/avatar-list 
add an AvatarManager to house a separate list of Avatars from NodeList
 2014-01-24 09:54:17 -08:00
Stephen Birarda
9d71671a52 add extra debugging to packet mismatch 2014-01-24 09:10:27 -08:00
Stephen Birarda
8d2e9823de remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
Stephen Birarda
da26f43499 broadcast node kills to agent, not avatar-mixer 2014-01-23 16:44:32 -08:00
Stephen Birarda
7762ea9f94 repair calls to broadcast to nodes 2014-01-23 16:28:35 -08:00
Stephen Birarda
ba7a73e347 add a missing break, don't double activate sockets 2014-01-23 15:11:09 -08:00
Stephen Birarda
09cd8eb0fd add a missing break, don't double activate sockets 2014-01-23 15:05:09 -08:00
Stephen Birarda
9ab1fc4c2c resolve conflicts on merge with upstream/master 2014-01-23 14:43:04 -08:00
Stephen Birarda
1f95d0c017 have avatar-mixer report avatar kills to all avatars 2014-01-23 12:47:27 -08:00
Stephen Birarda
6979135fe3 move some of the node interest additions to correct spots 2014-01-22 16:23:24 -08:00
Stephen Birarda
ec04d5450b Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set 2014-01-22 16:16:47 -08:00
Stephen Birarda
e9e2557576 change node types of interest to a QSet 2014-01-22 14:47:04 -08:00
Stephen Birarda
d57aec9793 don't use separate NodeList owner UUID and Avatar UUID 2014-01-22 11:48:04 -08:00
Stephen Birarda
6b44172467 hook the user's avatar object into the Interface ScriptEngine 2014-01-22 09:13:25 -08:00
Stephen Birarda
f9b38af96f remove processing of Avatar URLs from AvatarMixer 2014-01-21 16:56:00 -08:00
Stephen Birarda
417aa7ad59 re-expose an Avatar to the ScriptEngine 2014-01-21 15:59:55 -08:00
Andrzej Kapolka
a16d38ced6 Removed joints from avatar state messages. 2014-01-16 15:07:09 -08:00
Stephen Birarda
9095874844 fix moveToThread for AssignmentClient NodeList, fixes #1551 2014-01-16 12:30:23 -08:00
Brad Hefta-Gaub
bd6e30070d Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
 2014-01-15 13:18:25 -08:00
Stephen Birarda
1912ed0d9e have the Agent ask for an audio-mixer for audio scripting 2014-01-15 13:14:13 -08:00
Brad Hefta-Gaub
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -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
fa01383f3f move the NodeList to the thread used for a ThreadedAssignment 2014-01-14 11:26:26 -08:00
Stephen Birarda
9de098b4d9 fix logging name for metavoxel server 2014-01-14 10:55:18 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
9afe6eaa25 more windows build fixes 2014-01-11 00:56:48 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
ZappoMan
6345eff3ae Merge pull request #1501 from birarda/qprocess 
switch to QProcess instead of fork in AssignmentClient
 2014-01-10 17:36:24 -08:00
Stephen Birarda
248754e63e make sure STDOUT from child assignment-client bubbles up to parent 2014-01-10 17:03:13 -08:00
Stephen Birarda
ceb8ca7a23 changes to AssignmentClient architecture to fix fork behaviour 2014-01-10 16:59:01 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Brad Hefta-Gaub
0252e7f95e use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:17:02 -08:00
Stephen Birarda
339ef93fc4 remove no longer needed QDebug includes 2014-01-03 09:41:01 -08:00
Stephen Birarda
443c94a88f repairs to AudioMixer and audio injection flow 2014-01-02 17:15:46 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
Stephen Birarda
87e5579e52 reinstate delete for starved but started audio ring buffers 2013-12-19 15:51:14 -08:00
Stephen Birarda
80a2bd0844 move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector 2013-12-19 15:44:04 -08:00
Stephen Birarda
bdf8c4b9b2 implement threaded send for AudioInjector 2013-12-19 15:17:03 -08:00
Stephen Birarda
2409b5f784 complete inital test of AudioInjector API 2013-12-19 13:46:37 -08:00
ZappoMan
88c319a0da remove dead code 2013-12-17 14:15:34 -08:00
ZappoMan
7b3a778fb4 get Agent working with ScriptEngine 2013-12-17 14:13:16 -08:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
ZappoMan
5c946090db Merge branch 'master' of https://github.com/worklist/hifi into agent_script_engine_refactor 2013-12-17 13:34:13 -08:00
Stephen Birarda
bbe525412f fix pulling of delayed samples in audio mixer 2013-12-17 11:22:34 -08:00
ZappoMan
95639c7ce7 first cut, not working yet 2013-12-17 10:58:36 -08:00
Philip Rosedale
03869e81fd Merge pull request #1380 from birarda/qt-for-portaudio 
move from 44.1 to 48 on audio
 2013-12-16 17:58:41 -08:00
Stephen Birarda
6b644eb130 repair upsampling and local loopback by correcting for limits 2013-12-16 15:15:25 -08:00
Stephen Birarda
0970ed55a8 re-instate positional audio in the audio-mixer 2013-12-16 12:36:55 -08:00
Stephen Birarda
1f9ca00317 drive input from buffer callback and output from network 2013-12-16 11:58:23 -08:00