Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 23:29:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
9610 commits 74 branches 59 tags 1.2 GiB
Commit graph

276 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
0c55447809 fix windows build 2014-01-20 09:26:49 -08:00
Stephen Birarda
6670ff6ee5 fix linking of webserver for octree-server 2014-01-17 14:27:24 -08:00
Stephen Birarda
5fdf310a45 hook OctreeServer up to embedded-webserver 2014-01-17 14:21:15 -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
9441f9ffb7 fix link issues for many targets 2014-01-13 01:01:30 -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
Brad Hefta-Gaub
1358f68868 try to get this to work 2014-01-10 22:58:42 -08:00
Brad Hefta-Gaub
908b5e1de7 hack test externals 2014-01-10 22:38:16 -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
f2d0d445c2 yet another merge after competing pull requests 2014-01-10 16:03:48 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Stephen Birarda
1c3259c8cf remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -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
Andrzej Kapolka
f10dccb1b8 Fix for menu shortcuts; just include widget library rather than using awkward 
workaround.
 2013-12-18 17:28:21 -08:00
ZappoMan
f469553b8c CR feedback 2013-12-17 14:27:54 -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
43054ad893 cleanup 2013-12-17 13:56:07 -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
ZappoMan
c2d5accbc9 implement OctreeScriptingInterface base class to share common behavior for particle and voxel scripting 2013-12-14 13:25:33 -08:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
Stephen Birarda
f17ee1af7a cleanup AudioRingBuffer API 2013-12-12 13:37:18 -08:00
Stephen Birarda
6fab49b1b7 change ring buffer to interleaved for stereo 2013-12-11 12:02:22 -08:00
ZappoMan
542019a491 add script to the particle wire and disk format 2013-12-10 15:28:59 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
ZappoMan
4df2f2189d moved voxels scripting interface 2013-12-06 16:07:59 -08:00
ZappoMan
91ffb5b167 added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Stephen Birarda
b3d6c18902 reset buffer pointers in between sending to nodes 2013-12-05 13:54:46 -08:00
Stephen Birarda
7fab3ea269 don't use static packets in AvatarMixer 2013-12-05 13:50:44 -08:00
Stephen Birarda
5ae30bc1a0 cast integer sample rate so BUFFER_SEND_INTERVAL is correct 2013-12-05 13:12:49 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
ZappoMan
0acd9d0fce tweak to cause rebuild 2013-12-04 21:10:01 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
bfa8038f18 removed scripts 2013-12-04 19:51:16 -08:00
ZappoMan
5ff12ab8d1 first cut at getting voxel server based on octree server 2013-12-04 17:41:52 -08:00
ZappoMan
37466251d4 added some scripts, latest particle server work 2013-12-04 13:25:50 -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
Stephen Birarda
457c3cc8d9 remove unneeded VoxelTree in VoxelScriptingInterface 2013-12-04 11:19:16 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -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
3d14fba7ab have AssignmentFactory return a ThreadedAssignment 2013-12-03 12:14:24 -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
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
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
Stephen Birarda
d21583d9c5 make AssignmentClient use event loop, closes #1291 2013-11-26 16:26:41 -06:00
Stephen Birarda
1e3ab1a201 remove cURL from Agent code 2013-11-26 10:36:34 -06:00
Stephen Birarda
7e1a823a25 add AssignmentClient to be correct subclass of QCoreApplication 2013-11-25 16:39:33 -06:00
Andrzej Kapolka
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
ZappoMan
977b730fc0 add support for tuning the size of packets used by VoxelEditPacketSender 2013-11-10 12:44:20 -08:00
ZappoMan
eb73de6b67 added a couple more JS APIs and removed some debug code 2013-11-10 12:33:54 -08:00
ZappoMan
43a4253689 added interface points to VoxelScriptingInterface to access stats from _voxelPacketSender 2013-11-10 12:23:44 -08:00