Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 10:07:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
814 commits 75 branches 59 tags 1.2 GiB
Commit graph

242 commits

Author SHA1 Message Date
stojce
8e6c98661b merge conflicts 2013-03-12 18:12:58 +01:00
Stephen Birarda
e97aba03a3 move StdDev to shared library 2013-03-12 10:09:07 -07:00
Philip Rosedale
e3697f22f8 Merge remote-tracking branch 'origin' 2013-03-11 17:28:05 -07:00
Stephen Birarda
4be337d34b only hold the threshold number of frames for audio output 2013-03-11 17:27:27 -07:00
Philip Rosedale
3e62aa5169 Fixed/improved Standard Deviation code used to get jitter 2013-03-11 17:13:18 -07:00
Philip Rosedale
74452b7cc5 manual merge removed ECHO_SERVER_TEST 2013-03-11 16:24:55 -07:00
Philip Rosedale
9f21c76380 Merge remote-tracking branch 'origin/master' 2013-03-11 16:22:16 -07:00
Philip Rosedale
674bd8d798 transmitter full movement, and audio jitter buffer tweaks/debugging data 2013-03-11 16:19:55 -07:00
Stephen Birarda
5d02d563b3 remove the flange until it's ready for primetime 
This reverts commit 5652d0dcd3.
 2013-03-10 15:04:23 -07:00
Philip Rosedale
79f39483d0 Merge remote-tracking branch 'origin' 2013-03-08 18:17:10 -08:00
Stephen Birarda
5652d0dcd3 add a flange effect when turning head with gyros 2013-03-08 17:18:28 -08:00
Philip Rosedale
5c1bd68580 Merge remote-tracking branch 'origin/master' 2013-03-08 16:00:17 -08:00
Philip Rosedale
f014fcd0ac transmitter tweaks 2013-03-08 15:58:49 -08:00
Stephen Birarda
5535b8a4f5 allow client to request loopback from mixer 2013-03-08 15:37:41 -08:00
Stephen Birarda
686404be2b add a voxel server 2013-03-08 14:32:06 -08:00
Philip Rosedale
26fd44f030 100,000 voxel death star with concentric shells 2013-03-06 16:58:38 -08:00
Philip Rosedale
e7aa142082 Merge remote-tracking branch 'origin' 2013-03-06 15:23:40 -08:00
Philip Rosedale
89d205f304 turn cloud back off 2013-03-06 14:45:24 -08:00
Philip Rosedale
f98f64e8f7 Added red 'laser pointer' to hand 2013-03-06 14:40:24 -08:00
Stephen Birarda
f004479e39 bump up to 300000 voxels, with color 2013-03-06 14:34:14 -08:00
Stephen Birarda
e16cd4ffc3 use vertex buffer objects to speed up voxel rendering 2013-03-06 13:56:11 -08:00
Stephen Birarda
0fbb534566 randomly draw 50000 voxels for glDrawElements test 2013-03-06 12:04:27 -08:00
stojce
2a4a7b4ab8 call gluDeleteQuadric only if sphare is initialised 2013-03-06 08:16:40 +01:00
stojce
3b3ab9f68f set texture binding of first render call only 2013-03-06 08:08:18 +01:00
Philip Rosedale
4203fddb88 Transmitter now controls hand position and rotation. 2013-03-04 18:36:50 -08:00
Philip Rosedale
04bd98cf85 Merge remote-tracking branch 'origin' 2013-03-04 17:01:24 -08:00
Philip Rosedale
2903ff9f73 Adding support for transmitter data 2013-03-04 17:00:30 -08:00
Philip Rosedale
f3d086f6dd Merge pull request #10 from heracek/19095 
Code Review for Job #19095
 2013-03-04 16:59:53 -08:00
Stephen Birarda
4648ce033e remove the flanger that isn't working as expected 
This reverts commit a7deca0ced.
 2013-03-04 10:37:55 -08:00
Stephen Birarda
a7deca0ced add a broken flanger 2013-03-04 10:37:48 -08:00
Stephen Birarda
a42fc47231 relink head to AudioRingBuffer, send source bearing 2013-02-28 15:58:57 -08:00
Stephen Birarda
29df6e6a3e send 256 samples per callback so mixer can reply with two channels 2013-02-28 12:21:38 -08:00
Philip Rosedale
1dd3a9970d Eyebrows driven by audio, mouth doesn't turn red. 2013-02-26 18:44:42 -08:00
Philip Rosedale
27cc3a8ee5 Merge remote-tracking branch 'origin' 2013-02-26 17:34:26 -08:00
Philip Rosedale
fe2f2d5019 Reduce mouse force on hand. 2013-02-26 17:33:40 -08:00
Stephen Birarda
31a164fd19 initial changing of volumne of source based on distance 2013-02-26 16:57:33 -08:00
stojce
7bda2c0581 #19069 Add iris textures to avatar head, change lighting 2013-02-27 01:53:07 +01:00
Stephen Birarda
38cdd615a1 switch back to EC2 DS for sanity check 2013-02-27 01:53:07 +01:00
Stephen Birarda
31b93b036e temporary test against birarda's domain server 2013-02-27 01:53:07 +01:00
Stephen Birarda
04f3398466 send interface client position to audio mixer 2013-02-27 01:53:06 +01:00
Stephen Birarda
9e43868191 refactor Audio.cpp in interface to use parseData in ARB 2013-02-27 01:52:56 +01:00
Stephen Birarda
f55782b968 refactor mixer to use AgentList, AudioRingBuffer as AgentData 2013-02-27 01:52:56 +01:00
Philip Rosedale
eb37d1fbf8 Added ability to drag hand by clicking and dragging on the screen. 2013-02-27 01:52:56 +01:00
Philip Rosedale
888ef2249d Added angular velocity and angular movement to hand, changed hand to block. 2013-02-27 01:52:56 +01:00
Stephen Birarda
34b8a7bbeb use getters and setters for all member variables in AgentList and Agent 2013-02-27 01:52:56 +01:00
Stephen Birarda
5910fdd7b7 AgentList returns agents vector and agentSocket by reference 2013-02-27 01:52:55 +01:00
Stephen Birarda
c123990d7a switch back to EC2 DS for sanity check 2013-02-26 13:59:33 -08:00
Stephen Birarda
c645830809 temporary test against birarda's domain server 2013-02-26 13:43:50 -08:00
Stephen Birarda
1783ee5f85 send interface client position to audio mixer 2013-02-26 13:13:40 -08:00
Stephen Birarda
68c978cfde Merge branch 'master' of github.com:worklist/hifi 2013-02-26 10:12:32 -08:00
Philip Rosedale
26a87b3b43 Added critically damped spring behavior to hand, and added simulateHand() routine to main.cpp that uses mouse to correctly move hand controller. 2013-02-26 09:41:16 -08:00
Stephen Birarda
bf94f1f861 refactor Audio.cpp in interface to use parseData in ARB 2013-02-25 17:13:44 -08:00
Stephen Birarda
abfd3a0168 refactor mixer to use AgentList, AudioRingBuffer as AgentData 2013-02-25 17:07:32 -08:00
Philip Rosedale
f7b20a7c9c Added ability to drag hand by clicking and dragging on the screen. 2013-02-25 15:06:28 -08:00
Philip Rosedale
fff4bac53d Merge remote-tracking branch 'origin' 2013-02-25 14:33:22 -08:00
Philip Rosedale
a22cd3680a Added angular velocity and angular movement to hand, changed hand to block. 2013-02-25 14:31:56 -08:00
Stephen Birarda
d211eb6c84 use getters and setters for all member variables in AgentList and Agent 2013-02-25 12:51:52 -08:00
Stephen Birarda
4541a5fe78 AgentList returns agents vector and agentSocket by reference 2013-02-25 12:24:42 -08:00
Philip Rosedale
d272a7de31 Head: Added roll to lean decoupling constants, appropriate physical limits on angles for head, reduced sensitivity. 2013-02-22 22:37:11 -08:00
Stephen Birarda
d31eeda816 fix previous garbage commit 2013-02-22 16:45:03 -08:00
Stephen Birarda
04186664a3 the proper way to temporarily disable hand render 2013-02-22 16:44:29 -08:00
Stephen Birarda
a20a162502 don't move user view with their gyro, temporarily hide hand 2013-02-22 16:43:41 -08:00
Stephen Birarda
88cac51c0c tweak sensitiviy on pitch and yaw changes 2013-02-22 16:28:58 -08:00
Stephen Birarda
2ab58e00ca revert last change to ignore position changes from self-gyro 2013-02-22 16:25:38 -08:00
Stephen Birarda
7d244bbd45 don't allow gyro to move user head for themselves 2013-02-22 16:17:07 -08:00
Stephen Birarda
af48f4aad2 switch back to EC2 domain server 2013-02-22 15:15:25 -08:00
Tomáš Horáček
4403f726bb Merge branch 'master' into 19095 2013-02-23 00:09:26 +01:00
Stephen Birarda
6a16d6e3bb clean up agent killing/re-adding for interface and domain 2013-02-22 14:54:19 -08:00
Stephen Birarda
b4184562e0 Merge remote-tracking branch 'origin/master' 2013-02-22 13:39:20 -08:00
Stephen Birarda
5d2cba0b2a add silent agent removal to AgentList class 2013-02-22 13:38:33 -08:00
Stephen Birarda
345ec8b938 fix threaded socket joins so that socket has timeout on blocking receive 2013-02-22 13:37:57 -08:00
Philip Rosedale
0453445b13 Render own manipulator hand in front of camera 2013-02-22 12:47:28 -08:00
Philip Rosedale
777a00db3e Adding hand data to head broadcast packet. 2013-02-22 12:28:27 -08:00
Stephen Birarda
200982dddc fix for UDPSocket receive crash in Audio class and main.cpp 2013-02-22 12:20:16 -08:00
Philip Rosedale
014fdcc618 Tweaked hand 'length' 2013-02-22 12:20:01 -08:00
Philip Rosedale
41259f9ae0 Changed Hand to be a floating 'paddle' in front of the head 2013-02-22 12:10:29 -08:00
Tomáš Horáček
7d73ca9b41 code cleanup 2013-02-22 18:46:41 +01:00
Tomáš Horáček
36a558d123 add "Scope" menu functionality 2013-02-22 18:38:25 +01:00
Tomáš Horáček
4741eb869e add Mac OS X "Scope" menu with empty action 2013-02-22 18:22:16 +01:00
Stephen Birarda
e7fc997f78 push and pop when drawing agent heads 2013-02-21 16:55:20 -08:00
Stephen Birarda
aa9f4f966e allow switchover to new audio mixer received from audio server 2013-02-21 15:43:52 -08:00
Stephen Birarda
1e00962fb7 fix crash on match to active socket, remove LD debug 2013-02-21 15:08:23 -08:00
Stephen Birarda
0becd86e6c show correct number of agents nearby 2013-02-21 15:04:17 -08:00
Stephen Birarda
4a60c5a07b switch back to EC2 domain server 2013-02-21 15:02:33 -08:00
Stephen Birarda
27c4702c7e move to agent head position before drawing it 2013-02-21 14:45:33 -08:00
Stephen Birarda
9ec51116d5 fix unecessary copy of Agent, blow away linkedData to rebuild it 2013-02-21 14:36:53 -08:00
Stephen Birarda
ea43988173 resolve conflicts on merge with master 2013-02-21 13:00:02 -08:00
Stephen Birarda
060f4dceca use AgentData class to abstract implemenation of linked data 2013-02-21 12:56:57 -08:00
Philip Rosedale
67115ccad4 First commit of 'Death Star' voxel planet 2013-02-21 11:25:52 -08:00
Philip Rosedale
5f60bf6376 recursive position vector is same as rendering. 2013-02-20 21:42:10 -08:00
Philip Rosedale
15fd9638d6 remove deadhead (of self) at origin. First commit of voxels with LOD, recursive test pattern. 2013-02-20 21:38:42 -08:00
Stephen Birarda
c57380012e hook domain server up to AgentList, pack sockets 2013-02-20 18:32:23 -08:00
Stephen Birarda
7205817476 remove AgentSocket abstraction to use sockaddr struct 2013-02-20 11:44:35 -08:00
Stephen Birarda
42927ec602 implement pingAgents method in AgentList 2013-02-19 17:46:49 -08:00
Stephen Birarda
9a514f56e5 have AgentList control the required UDPSocket instance 2013-02-19 17:34:34 -08:00
Stephen Birarda
9d5a800c6f begin abstraction of Agent communication to shared classes 2013-02-19 16:38:57 -08:00
Stephen Birarda
6c70d264ac fix company name in header comments 2013-02-19 12:50:23 -08:00
Philip Rosedale
fd151fb7bc trivial change for gyro fix 2013-02-18 16:42:19 -08:00
Stephen Birarda
741654e13d don't print RAW packet to stdout 2013-02-18 16:35:45 -08:00
Stephen Birarda
307fa9e5fa point to EC2 domain server instead of local machine 2013-02-18 16:33:31 -08:00