Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 00:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19783 commits 69 branches 56 tags 1.2 GiB
Commit graph

1073 commits

Author SHA1 Message Date
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
Stephen Birarda
f58d21d6f0 have ShutdownEventListener handle WM_CLOSE or SIGTERM 2014-12-11 10:21:11 -08:00
Andrzej Kapolka
6764f29cd2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 16:49:10 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrew Meadows
ff7559c2c2 merge upstream/master into andrew/thermonuclear 2014-12-02 11:41:29 -08:00
Andrew Meadows
b9944edf66 OctreeServer::createTree() is now protected 2014-12-02 11:13:37 -08:00
Andrzej Kapolka
5b4869f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-01 16:43:39 -08:00
Stephen Birarda
59432e8d29 complete sharing of local domain-server port to local AC 2014-11-30 17:54:10 -08:00
Andrew Meadows
cb6d9a4312 EntityServer gets a simuation 2014-11-26 12:14:17 -08:00
Andrzej Kapolka
8d3f4a627b Working on quadtree for heightfields. 2014-11-25 14:10:44 -08:00
Andrzej Kapolka
0a976ad262 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 11:26:29 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
dac980d433 have AssignmentClientMonitor catch SIGTERM and cleanup 2014-11-19 16:40:19 -08:00
Andrzej Kapolka
632f3bfa7f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-18 17:12:40 -08:00
Atlante45
1443cece5b Fix singleton object created on temporary thread 2014-11-18 16:57:00 -08:00
Andrzej Kapolka
4308a45028 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-17 16:46:51 -08:00
AndrewMeadows
c2e80aed70 Merge pull request #3809 from Atlante45/mute_signal 
JS Mute signal
 2014-11-17 15:14:40 -08:00
Andrzej Kapolka
f18d4e4a0e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-17 12:23:22 -08:00
ZappoMan
bdfe02bbd0 Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	libraries/octree/src/OctreePersistThread.cpp
	libraries/octree/src/OctreePersistThread.h
 2014-11-17 11:22:00 -08:00
Atlante45
0528a9ff9b Remove forgotten setLastMuted 2014-11-17 10:49:35 -08:00
Atlante45
4615afe034 Remove lastMuted member in AvatarAudioStream 2014-11-17 10:32:28 -08:00
Atlante45
46eebe9d40 Give noisy mutes their own packet type 2014-11-17 10:26:47 -08:00
ZappoMan
f44513ebe7 added support for rolling version numbers in backups 2014-11-15 22:55:12 -08:00
ZappoMan
4adb4787cd added debugging of usecTimestampNow() in octree server to better understand flight times 2014-11-15 21:50:42 -08:00
Andrzej Kapolka
aae168dd46 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 12:43:52 -08:00
ZappoMan
cd4b267732 implement persist backup 2014-11-14 11:11:32 -08:00
ZappoMan
11058355a0 implement aboutToFinish for persist thread to allow final save before shutdown 2014-11-14 09:55:32 -08:00
Andrzej Kapolka
dd87a45211 Fix for server saving, use Paeth filter before compressing heightfield data. 2014-11-13 16:11:48 -08:00
Stephen Birarda
f27367a0c1 fix audio-mixer muting for injectors 2014-11-13 15:00:40 -08:00
Stephen Birarda
8a03738c83 give a Sound cache to the assignment-client 2014-11-13 14:48:18 -08:00
Andrzej Kapolka
2f0ea47e5a Use a magic number and version on the metavoxel file, put it in the resources 
directory.
 2014-11-12 20:23:35 -08:00
Philip Rosedale
17d0f247d6 Switch muting threshold to 0.003 to be a bit less aggressive 2014-11-11 14:10:44 -08:00
Philip Rosedale
d9141b4010 Merge pull request #3750 from Atlante45/reverb_for_own_voice 
Reverb for own voice
 2014-11-11 10:52:26 -08:00
Atlante45
a868661a25 Extra space 2014-11-10 15:51:31 -08:00
Atlante45
02b401701f Set a minimum mute intervalle in the mixer 2014-11-10 15:46:36 -08:00
Atlante45
edec4d1298 Mixer send mute when if too noisy 2014-11-10 14:10:29 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00
Philip Rosedale
12eb67c734 fix bug with audio mixer muting too often 2014-11-07 14:18:57 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
Atlante45
81888b9f83 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice 2014-11-07 00:30:03 +01:00
Andrzej Kapolka
372d8946d0 Merge pull request #3749 from ZappoMan/entityBugs 
Fix the bug where sometimes entity changes don't get sent to all viewers
 2014-11-06 15:19:35 -08:00
Atlante45
4dc40c9e84 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice 2014-11-06 23:17:53 +01:00
ZappoMan
768a854b00 cleanup 2014-11-06 14:00:26 -08:00
Stephen Birarda
881d03b11d migrate EntityServer and OctreeServer to tbb concurrent map 2014-11-06 13:54:40 -08:00
Stephen Birarda
1a953b5906 migrate node hash calls from AudioMixer to new tbb format 2014-11-06 13:53:10 -08:00
ZappoMan
90b079d5a8 remove debug 2014-11-06 13:51:48 -08:00
ZappoMan
3c7b06f1d2 quiet some debug 2014-11-06 13:45:38 -08:00
ZappoMan
2b62402a57 possible fix for entities not always updating bug 2014-11-06 13:17:46 -08:00
AndrewMeadows
843aaf4e95 Merge pull request #3747 from PhilipRosedale/master 
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
 2014-11-06 10:36:46 -08:00