Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 15:42:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12760 commits 71 branches 56 tags 1.2 GiB
Commit graph

580 commits

Author SHA1 Message Date
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Stephen Birarda
5e9036b3fe tweak audio constants to be less agressive on cutoff 2014-05-07 15:37:41 -07:00
Atlante45
fd1f6befff CR 2014-05-07 15:19:32 -07:00
Atlante45
40ed72989c mute environment packet 2014-05-07 12:57:11 -07:00
Stephen Birarda
befe75a04c fix broken audio-mixer stats 2014-05-05 14:03:14 -07:00
Stephen Birarda
aa2931d9bb resolve conflicts on merge with upstream/master 2014-05-02 10:39:17 -07:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
Stephen Birarda
2f0e311a99 return OAuth URL to interface clients when OAuth enabled 2014-05-01 10:19:05 -07:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
ZappoMan
f993f984c9 first cut at modelserver 2014-04-30 09:26:14 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Atlante45
ae566c55f6 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-23 10:38:29 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
AndrewMeadows
94fabf7875 Merge pull request #2709 from ZappoMan/shared_and_weak_pointers 
Voxel/Particle Server Performance Improvements
 2014-04-22 10:28:39 -07:00
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
ZappoMan
60b8ab0de5 CR feedback 2014-04-21 17:45:38 -07:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
ZappoMan
a64d3ffc32 more cleanup 2014-04-21 16:38:45 -07:00
ZappoMan
7d18dbdfb8 more cleanup 2014-04-21 16:35:42 -07:00
Atlante45
cfc778d10c Fix regexp fail 2014-04-21 16:32:17 -07:00
ZappoMan
e55c488964 clean up some old debugging 2014-04-21 16:17:59 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
ZappoMan
003e3ae507 properly unhook delete notifications 2014-04-21 16:01:37 -07:00
ZappoMan
f3aa9d3b8f unhook node bag from element notifications on shutdown to speed up cleanup 2014-04-21 15:45:12 -07:00
ZappoMan
7a8a8e2fac delete tree on server shutdown 2014-04-21 15:14:06 -07:00
ZappoMan
75f079e2b3 tweak debugging 2014-04-21 14:15:13 -07:00
ZappoMan
9a63fa7550 some cleanup 2014-04-21 13:36:13 -07:00
ZappoMan
14e1fa269a cleanup 2014-04-21 13:28:03 -07:00
Atlante45
ab76e6a00c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 
Conflicts:
	interface/src/Audio.cpp
 2014-04-21 12:19:19 -07:00
ZappoMan
7798c6eb09 some debugging 2014-04-21 11:48:58 -07:00
ZappoMan
59cbda20c6 added some threading and event debugging 2014-04-20 19:48:17 -07:00
ZappoMan
50f7db8fe1 quiet some debugging 2014-04-18 15:02:10 -07:00
ZappoMan
2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
 2014-04-18 14:28:54 -07:00
Stephen Birarda
6adfb91e93 rename AvatarHash to AvatarList 2014-04-18 09:40:35 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
75f35c5858 optionally add an AvatarHashMap instance to the ScriptEngine 2014-04-17 17:55:16 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Andrzej Kapolka
6251b6b819 Merge fix. 2014-04-17 13:55:16 -07:00
Andrzej Kapolka
599b472cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	assignment-client/src/Agent.cpp
 2014-04-17 13:51:32 -07:00
Stephen Birarda
a137dd0362 grab URL for script from payload if it exists 2014-04-17 10:18:42 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Atlante45
dd8a0e3550 Removed gettimeofday in AudioMixer 2014-04-16 12:16:49 -07:00
Andrzej Kapolka
38c0e99cbe More work on animation loading. 2014-04-14 18:12:32 -07:00
Stephen Birarda
7cef2def66 remove Syssocket which is from our pre-Qt days 2014-04-10 10:34:31 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
16bb28a4fa make GnuTLS a system include to suppress warnings 2014-04-10 10:04:02 -07:00
Stephen Birarda
58298984d3 link GnuTLS to the assignment-client, fix timeval in SharedUtil 2014-04-10 09:48:47 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00