Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-01 00:16:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14225 commits 71 branches 56 tags 1.2 GiB
Commit graph

7170 commits

Author SHA1 Message Date
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
Stephen Birarda
dcb0e5add2 copy resources to OS X application bundle 2013-02-18 11:39:29 -08:00
Stephen Birarda
9774dd5874 don't kill serial when polling too quickly 2013-02-18 10:37:00 -08:00
Stephen Birarda
fd73b8de82 always store ports as unsigned short ports 2013-02-18 09:50:15 -08:00
Stephen Birarda
c3c0793ddc mixer needs to send port as unsigned short 2013-02-18 09:39:52 -08:00
Stephen Birarda
612662c475 actually allocate memory for the agent private address 2013-02-18 09:36:47 -08:00
Stephen Birarda
0cea1e80ff fix memory overwrite in domain server 2013-02-18 09:30:50 -08:00
Philip Rosedale
c0968e9967 Merge remote-tracking branch 'origin' 2013-02-18 09:17:54 -08:00
Stephen Birarda
615f04982c quick fix to allow mixer on machine with domain server 2013-02-18 09:11:57 -08:00
Philip Rosedale
87b52b5d90 Merge remote-tracking branch 'origin' 2013-02-18 09:00:06 -08:00
Philip Rosedale
bd45740dc6 Partial progress on new voxel model. 2013-02-18 08:59:44 -08:00
Stephen Birarda
c6a8f6415e switch back to EC2 domain server for test 2013-02-18 08:56:32 -08:00
Stephen Birarda
d1433aa2bd a bad version of UDP hole punching for local agents 2013-02-18 08:53:16 -08:00
Philip Rosedale
b05909cf00 More avatar look changes 2013-02-15 17:12:52 -08:00
Philip Rosedale
31ce33f3a3 Fly turn and strafe faster 2013-02-15 17:02:10 -08:00
Philip Rosedale
01767719eb Merge remote-tracking branch 'origin' 2013-02-15 16:46:23 -08:00
Philip Rosedale
514a373acd Partial commit with head render angle fixes 2013-02-15 16:45:50 -08:00
Stephen Birarda
8e4e5d049b fix bad conditional serial pairing 2013-02-15 15:08:05 -08:00
Stephen Birarda
660630e981 discard initial garbage reads, reset properly on disconnect 2013-02-15 15:06:09 -08:00
Stephen Birarda
d0203158c8 initial setup of polling for newly connected headset 2013-02-15 14:58:07 -08:00
Philip Rosedale
ba683de026 Merge remote-tracking branch 'origin' 2013-02-15 12:54:20 -08:00
Philip Rosedale
27860b1f07 Added stats display of agent ping times and various agent functions to get the data. 2013-02-15 12:53:21 -08:00
Stephen Birarda
da8fd5f4ee hook space server up to shared UDPSocket class 2013-02-14 16:45:00 -08:00
Philip Rosedale
c360fabd96 Domain IP is used if static, else looked up. 2013-02-14 13:20:06 -08:00
Philip Rosedale
10ff074e38 Don't render head if you are inside it (it's your own) 2013-02-14 13:14:01 -08:00
Stephen Birarda
864bcb0a03 Merge branch 'master' of github.com:worklist/hifi 2013-02-13 20:43:20 -08:00
Stephen Birarda
9c822b9d58 dynamic switchover of audio mixer 2013-02-13 20:43:10 -08:00
Philip Rosedale
49201efbb1 Merge remote-tracking branch 'origin' 2013-02-13 20:40:38 -08:00
Philip Rosedale
12e4e15b21 It's entirely possible that the serialInterface reader is a tiny bit better, but I'm really not sure. :) Fixed bug with reading from middle of serial string on startup causing hang. 2013-02-13 20:40:00 -08:00
Stephen Birarda
ff83335123 undo solo test for mixer, add localhost mixer const to Audio.cpp 2013-02-13 16:19:31 -08:00
Stephen Birarda
815783732c make UDPSocket non-blocking, thread receive of data in interface 2013-02-13 15:27:16 -08:00
Stephen Birarda
28beb3ecfc undo changes to interface constants 2013-02-13 13:44:26 -08:00
Stephen Birarda
09dee91279 collect agent address on receive to send back audio 2013-02-13 13:42:23 -08:00
Philip Rosedale
9ad121ea00 Now looking up IP address of domain server on startup. 2013-02-13 11:50:10 -08:00
Philip Rosedale
f8cd82bd82 Merge remote-tracking branch 'origin' 2013-02-13 10:53:20 -08:00
Philip Rosedale
ecc7eee161 changed to EC2 domain server by default in interface, increased domain server keep alive timeout to 5 seconds. 2013-02-13 10:53:03 -08:00
Stephen Birarda
f371b5e21c Merge branch 'master' of github.com:worklist/hifi 2013-02-13 10:47:34 -08:00
Stephen Birarda
fb31765024 AudioRingBuffer is a shared class (between mixer and interface) 2013-02-13 10:47:10 -08:00
Philip Rosedale
4ed1971276 Made oscilloscope 2 channel, turned on by default (need to fix injecting the last audio buffer tho). 2013-02-13 10:14:31 -08:00
Philip Rosedale
53a3d1f8c9 Added audio waveform oscilloscope, fixing head rendering of other agents and self. 2013-02-12 23:27:36 -08:00
Philip Rosedale
9d368adcd2 Merge remote-tracking branch 'origin' 2013-02-12 20:48:59 -08:00
Philip Rosedale
8d5a53b2c9 Added agent type to domain server, interface client 2013-02-12 20:48:09 -08:00
Stephen Birarda
fab10ada3e move shared UDPSocket class to shared dir for reuse in mixer 2013-02-12 17:31:53 -08:00
Stephen Birarda
49d7e34cd9 fix casing of util.h import in Agent.cpp 2013-02-12 16:02:07 -08:00
Philip Rosedale
98612c8705 Merge remote-tracking branch 'origin' 2013-02-12 13:18:59 -08:00
Philip Rosedale
a48d9ecd95 Added ping detection between agents 2013-02-12 13:18:19 -08:00
Stephen Birarda
b426ea52d5 fix unused fread return value warning 2013-02-12 12:11:24 -08:00
Philip Rosedale
6f9d223454 Fixed network-to-host byte order problems when storing ports. 2013-02-12 10:58:30 -08:00
Philip Rosedale
b19fce1b46 close socket added 2013-02-12 01:54:14 -08:00
Philip Rosedale
b651032b06 Merge remote-tracking branch 'origin/master' 2013-02-12 01:52:23 -08:00
Philip Rosedale
82594c31ba stop failing texture load at startup, always show nearby agent count 2013-02-12 01:50:12 -08:00
Philip Rosedale
b58bb6fe80 Head data streaming to other users, domain server improved, network.cpp removed and replaced with UDPSocket objects, input audio drives mouth color and size. 2013-02-12 01:41:36 -08:00
Stephen Birarda
b45286c6e5 add copied AudioRingBuffer for mixer, comment crashing mouse calls 2013-02-11 17:16:18 -08:00
Stephen Birarda
b3375c5e5f fix crash by closing socket before deleting audio data 2013-02-11 17:07:56 -08:00
Stephen Birarda
b3a343f17f build portaudio as external project before interface 2013-02-08 17:28:22 -08:00
Stephen Birarda
99b96ec737 build portaudio library to link with interface 2013-02-08 15:58:12 -08:00
Stephen Birarda
8b18238be3 include cstring for use of strcpy 2013-02-08 15:08:27 -08:00
Stephen Birarda
f1467b2f6c fix incorrect casing on include of Util.h 2013-02-08 15:04:31 -08:00
Stephen Birarda
9dc6c1124b include the correct library for printf 2013-02-08 15:03:17 -08:00
Stephen Birarda
7f0ee90486 include cstring for printf function 2013-02-08 15:02:03 -08:00
Stephen Birarda
08142a8adb add header for glut to conditional include in InterfaceConfig 2013-02-08 14:57:59 -08:00
Stephen Birarda
ca0f285abe include InterfaceConfig in Head.cpp for GLUT 2013-02-08 14:51:50 -08:00
Stephen Birarda
d394035e7e switch back to ARB functions with glext include 2013-02-08 14:49:12 -08:00
Stephen Birarda
9095508238 define GL_GLEXT_PROTOTYPES for glPointParameter use 2013-02-08 14:43:22 -08:00
Stephen Birarda
d79bf39a24 using OpenGL later than 2, remove ARB from calls 2013-02-08 14:09:44 -08:00
Stephen Birarda
4983cc6973 conditional include to fix glPointParameterfvARB crash 2013-02-08 14:03:24 -08:00
Stephen Birarda
54b4762830 conditional Apple OS include of call to glPointParameterfvARB 2013-02-08 14:01:35 -08:00
Stephen Birarda
95dc030f19 fix casing of include of finger.h 2013-02-08 13:59:09 -08:00
Stephen Birarda
0c570f5ed5 import cstring for memset and memcpy 2013-02-08 13:57:38 -08:00
Stephen Birarda
8e412f7f40 fix casing on include of world.h 2013-02-08 13:54:45 -08:00
Stephen Birarda
7ff2441c84 conditionally only call glPointParameterfARB if Apple OS 2013-02-08 13:53:26 -08:00
Stephen Birarda
2be4e509c7 change conditional check for GL_ARB_point_parameters 2013-02-08 13:37:04 -08:00
Stephen Birarda
08e96b365b conditional use of glPointParameterfvARB based on GL_ARB_point_parameters 2013-02-08 13:31:42 -08:00
Stephen Birarda
71713cf265 conditional inclusion of glext.h for non-apple OS 2013-02-08 13:28:36 -08:00
Stephen Birarda
b339e47be2 glut should be only inlude required for OpenGL 2013-02-08 13:25:34 -08:00
Stephen Birarda
98fc8418b1 condtional inclusion of glext for UNIX build 2013-02-08 13:21:25 -08:00
Stephen Birarda
70bddbbfed include glext for glPointParameterfvARB method 2013-02-08 13:16:49 -08:00
Stephen Birarda
8bac08859e include cstring for strlen function 2013-02-08 13:14:06 -08:00
Stephen Birarda
cedb212597 make Field a proper class to avoid duplicate symbols 2013-02-08 13:11:56 -08:00
Stephen Birarda
d75541bb69 include stdint.h for references to int16_t type 2013-02-08 12:54:07 -08:00
Stephen Birarda
2d08ce0b7d capitalize import of Finger.h 2013-02-08 12:50:09 -08:00
Stephen Birarda
a1a8cd723d provide type to structs for ISO C++ compliance 2013-02-08 12:49:02 -08:00
Stephen Birarda
c575974060 don't initialize samplecount in header 2013-02-08 12:46:47 -08:00
Stephen Birarda
a4fb6e01aa include cstring for strlen on UNIX 2013-02-08 12:31:21 -08:00
Stephen Birarda
b524a38559 fix mising capitilazation for util include 2013-02-08 12:19:34 -08:00
Stephen Birarda
13a0597ab6 dynamic header for GLUT include 2013-02-08 12:17:35 -08:00
Philip Rosedale
58e96f0ab8 Merge branch 'master' of github.com:worklist/hifi 2013-02-07 20:09:29 -08:00
Stephen Birarda
0359cdbc12 merge with origin/master 2013-02-07 17:30:08 -08:00
Stephen Birarda
f5cbe7a05a cmake build working for interface project 2013-02-07 17:29:01 -08:00
Stephen Birarda
f9b8d6cde0 don't use find module for glm/portaudio 2013-02-07 12:24:05 -08:00
Stephen Birarda
4860fb086d link glm library to interface target 2013-02-07 11:41:01 -08:00
Stephen Birarda
24240a709c add all extra CMake files to gitignore 2013-02-06 18:26:19 -08:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00