Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 01:50:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2109 commits 75 branches 59 tags 1.2 GiB
Commit graph

100 commits

Author SHA1 Message Date
ZappoMan
35c840fefa Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-06 15:57:44 -07:00
Stephen Birarda
90a8027f69 include cstdlib for call to exit 2013-05-06 15:36:48 -07:00
Stephen Birarda
c742c292b6 have the audio mixer output a stacktrace when it crashes 2013-05-06 15:29:21 -07:00
ZappoMan
043a284d4d Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-06 13:36:31 -07:00
Stephen Birarda
499899c6e0 if there are no active agents in list begin() iterator should be end() 2013-05-06 13:11:40 -07:00
Stephen Birarda
beca9cac8d update timestamp variables in Agent, use new packet headers for DS 2013-05-06 12:40:52 -07:00
ZappoMan
16b93f8c92 added PerformanceWarning class 2013-05-06 11:00:01 -07:00
Stephen Birarda
cee73e4622 don't replay last buffer for silent agent 2013-05-01 10:57:59 -07:00
ZappoMan
47326230a1 fixed build buster 2013-04-30 11:57:06 -07:00
ZappoMan
6d378281a8 cr cleaup - third times a charm? 2013-04-30 10:24:13 -07:00
ZappoMan
bf3b014743 code review cleanup 2013-04-30 10:16:04 -07:00
ZappoMan
8a5633a0db got rid of compareOctalCodesDepth() and cleaned up compareOctalCodes() 2013-04-30 10:09:15 -07:00
ZappoMan
429ba8c729 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-29 17:48:12 -07:00
ZappoMan
ea219cdd16 Merge pull request #163 from birarda/no-avatars 
remove half-baked ping reply setup from avatar mixer
 2013-04-29 14:53:24 -07:00
Andrzej Kapolka
0fe4d57ad7 I think this is the least intrusive fix for the chat crashes: lock the agent 
list when we're updating from the network, simulating, or rendering.  I think
there are likely to be other synchronization issues, but this is a start.
 2013-04-29 13:17:39 -07:00
Stephen Birarda
7b8d377eb4 simplify the avatar mixer communication while publicly accessible 2013-04-29 12:47:03 -07:00
ZappoMan
e4c39369aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-27 14:49:03 -07:00
Andrzej Kapolka
b9fdba2711 Rather than creating a thread to read datagrams, just set the socket to 
nonblocking mode and check it before simulating.  This addresses one aspect
of the lack of synchronization on AgentList, but there are other issues...
 2013-04-26 11:08:41 -07:00
ZappoMan
3f158c0753 Added new version of compareOctalCodes() which actually compares octal codes 2013-04-25 23:42:35 -07:00
ZappoMan
899068e3a6 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-25 17:35:02 -07:00
Stephen Birarda
69ea567f77 use class key for AgentListIterator friend in AgentList 2013-04-25 17:12:11 -07:00
Stephen Birarda
ccbbf31beb fix for extraneous typedefs and reference to AgentListIterator as friend 2013-04-25 17:10:09 -07:00
Stephen Birarda
edc908b1cd AgentList type squishes across project 2013-04-25 16:25:49 -07:00
Stephen Birarda
81322d01e5 spacing fixes in AgentList 2013-04-25 16:19:33 -07:00
Stephen Birarda
507f39a052 fix readability of agent dereference 2013-04-25 16:14:38 -07:00
Stephen Birarda
625a963918 prefer -> notation to (*TYPE) for AgentList iterator 2013-04-25 15:49:25 -07:00
Stephen Birarda
5ddd9a9f4f Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 15:27:40 -07:00
Stephen Birarda
ef6593eb89 update audio-mixer to use new AgentList iterator 2013-04-25 15:21:56 -07:00
Stephen Birarda
ad530b4eb8 fix bug based on dynamic end of agentList iterator 2013-04-25 15:10:08 -07:00
Stephen Birarda
2850d74a84 add typedefs for stl iterator implementation 2013-04-25 14:48:07 -07:00
Stephen Birarda
836d286b75 initial transition from vector to multi-dimensional array in AgentList 2013-04-25 13:11:13 -07:00
ZappoMan
0bec7156aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-24 23:50:57 -07:00
ZappoMan
bbdf97ccc4 added some helper functions for debugging and for improved voxel protocol 
- added outputBufferBits() which will output an entire buffer as debug bits/bytes
- tweak to outputBits() to allow caller to ask for NewLine or not
- added insertIntoSortedArrays() which keeps a set of arrays sorted by a key
 2013-04-24 22:50:40 -07:00
ZappoMan
4b726b7fba added compareOctalCodes() and support for null octal code in printOctalCode() 2013-04-24 22:49:09 -07:00
Philip Rosedale
6c986a1049 Merge pull request #127 from tschw/19188 
19188
 2013-04-24 16:53:04 -07:00
Stephen Birarda
a5ea1dca7e fix incorrect debugging of agent local and public addresses 2013-04-24 11:16:13 -07:00
tosh
225188a6f9 Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-24 13:32:30 +02:00
Stephen Birarda
11986ca00f add IP address to DS information output 2013-04-23 15:58:06 -07:00
Stephen Birarda
3344016212 SOLO_AGENT_TYPES needs a defined size 2013-04-23 14:12:21 -07:00
Stephen Birarda
ceefda8ce1 add cstring for memset and memcpy 2013-04-23 14:09:09 -07:00
Stephen Birarda
620615599f fix the const for injectAudio 2013-04-23 14:01:19 -07:00
Stephen Birarda
ed5afb3537 add const to injectAudio method 2013-04-23 13:57:41 -07:00
Stephen Birarda
fd6fb60d24 fix pointer var declarations in AudioInjector class 2013-04-23 13:55:42 -07:00
Stephen Birarda
ddc74984b5 fix pointer var declarations, AudioInjector constructor in eve main 2013-04-23 13:52:25 -07:00
Stephen Birarda
7ae320d7e1 intial version of eve that says WALL-E every so often 2013-04-23 13:37:49 -07:00
Stephen Birarda
88fe04bcd1 hook up the injector to the new AudioInjector class 2013-04-23 11:48:01 -07:00
Stephen Birarda
beee875e88 add a new AudioInjector class that can be leveraged from eve and injector 2013-04-23 10:46:05 -07:00
tosh
723d49d78c Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-23 16:08:47 +02:00
Stephen Birarda
8201b963d1 fix crash for NULL agent sockets 2013-04-22 18:36:13 -07:00
Stephen Birarda
4956370d52 have parseData return the number of bytes consumed 2013-04-22 18:05:27 -07:00