Stephen Birarda
|
9b2acadb4b
|
include c++ header for memset
|
2014-11-07 17:24:05 -08:00 |
|
Stephen Birarda
|
6a4808aac8
|
include string.h for memset usage
|
2014-11-07 17:22:54 -08:00 |
|
Stephen Birarda
|
2ca673175a
|
rename StdDev to StDev, patch its leak
|
2014-11-07 17:15:54 -08:00 |
|
Stephen Birarda
|
4fd22914c0
|
fix a leak in StdDev
|
2014-11-07 17:11:00 -08:00 |
|
Stephen Birarda
|
c04e653cf3
|
fix a memory leak in OctreeElement
|
2014-11-07 17:06:50 -08:00 |
|
Philip Rosedale
|
54ff9062c0
|
Merge pull request #3757 from PhilipRosedale/master
fix bug with audio mixer muting too often
|
2014-11-07 14:42:19 -08:00 |
|
Philip Rosedale
|
12eb67c734
|
fix bug with audio mixer muting too often
|
2014-11-07 14:18:57 -08:00 |
|
Ryan Huffman
|
d4fa24e9b6
|
Fix entity item properties not marking all props changed
|
2014-11-07 13:56:23 -08:00 |
|
Stephen Birarda
|
bd8b71a02a
|
complete handling of local audio loopback
|
2014-11-07 11:05:01 -08:00 |
|
Stephen Birarda
|
e78f149369
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local-audio
|
2014-11-07 10:28:31 -08:00 |
|
Stephen Birarda
|
f1a238a6c2
|
piping for local UI sounds
|
2014-11-07 10:08:09 -08:00 |
|
ZappoMan
|
53f5019ee7
|
rename textureNames to originalTextures
|
2014-11-07 10:05:36 -08:00 |
|
ZappoMan
|
fdc5aa1da5
|
include urls with texture names, make sure to wait till default textures loaded before setting new textures
|
2014-11-07 09:54:13 -08:00 |
|
ZappoMan
|
c48d79ad8b
|
add gettable feature which lists texture names
|
2014-11-07 09:05:47 -08:00 |
|
ZappoMan
|
542d671e54
|
cleanup entity scripts when changing domains or entity is deleted
|
2014-11-06 20:01:09 -08: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 |
|
ZappoMan
|
768a854b00
|
cleanup
|
2014-11-06 14:00:26 -08:00 |
|
ZappoMan
|
90b079d5a8
|
remove debug
|
2014-11-06 13:51:48 -08:00 |
|
ZappoMan
|
5333f0eb19
|
quiet some debug
|
2014-11-06 13:45:30 -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 |
|
AndrewMeadows
|
3f3e6ea581
|
Merge pull request #3745 from Atlante45/ignore_penumbra
Ignore penumbra
|
2014-11-06 09:59:31 -08:00 |
|
Philip Rosedale
|
7e822d31e7
|
Merge pull request #3744 from ZappoMan/entityBugs
Octree server improvements
|
2014-11-06 08:41:21 -08:00 |
|
Philip Rosedale
|
54957a2fa1
|
merge fix
|
2014-11-05 21:08:24 -08:00 |
|
ZappoMan
|
bcec14b0f4
|
adjust the sentAt times in packets by the receiving side's clockskew so that it can calculate proper flight times
|
2014-11-05 19:37:08 -08:00 |
|
Philip Rosedale
|
688bd0f34f
|
first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body'
|
2014-11-05 16:58:58 -08:00 |
|
ZappoMan
|
13e358549d
|
add periodic pruning of the octree on load and save
|
2014-11-05 14:56:38 -08:00 |
|
Stephen Birarda
|
2e8118300f
|
fix for two member variable declarations on same line
|
2014-11-05 11:11:37 -08:00 |
|
Stephen Birarda
|
663167d684
|
wait on AudioInjectors when shutting down interface
|
2014-11-05 10:37:22 -08:00 |
|
Stephen Birarda
|
2c667d209d
|
make the AudioInjectorScriptingInterface a singleton
|
2014-11-05 10:10:05 -08:00 |
|
Atlante45
|
4b73a5ac35
|
Modify injected audio stream to send the ignore penumbra option
|
2014-11-05 16:22:06 +01:00 |
|
Atlante45
|
49526e69f8
|
Added ignorePenumbra option to injected stream
|
2014-11-05 16:21:06 +01:00 |
|
Atlante45
|
85a59249df
|
Move ignorePenumbra to positional audio
|
2014-11-05 16:19:26 +01:00 |
|
Atlante45
|
617bb23206
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ignore_penumbra
|
2014-11-05 15:42:50 +01:00 |
|
Philip Rosedale
|
a6c8fb7449
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-04 14:12:24 -08:00 |
|
Philip Rosedale
|
803686c2ce
|
Merge pull request #3739 from birarda/lobby
fix for ice server lookup from DomainHandler
|
2014-11-04 14:12:18 -08:00 |
|
Stephen Birarda
|
beb350d1e7
|
fix for HifiSockAddr lookup for ice server from DomainHandler
|
2014-11-04 13:53:56 -08:00 |
|
Philip Rosedale
|
b971089ba8
|
Merge pull request #3738 from birarda/lobby
fix for ice server sock addr in domain-server
|
2014-11-04 13:26:56 -08:00 |
|
Stephen Birarda
|
d46f775f20
|
async and sync nomenclature flip
|
2014-11-04 13:23:53 -08:00 |
|
Philip Rosedale
|
cdad40faec
|
Merge pull request #3736 from ZappoMan/entityBugs
reset the QElapsedTimer in usecTimestampNow() periodically to prevent error
|
2014-11-04 12:59:13 -08:00 |
|
Philip Rosedale
|
558aa52d30
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-04 12:14:08 -08:00 |
|
Stephen Birarda
|
f53455ee55
|
use a ray from the near clip for action ray
|
2014-11-04 11:40:47 -08:00 |
|
ZappoMan
|
a89287e404
|
reset the QElapsedTimer in usecTimestampNow() periodically to prevent error
|
2014-11-04 11:01:37 -08:00 |
|
Stephen Birarda
|
8d6b041758
|
send a pick ray with HFActionEvent, not x,y
|
2014-11-04 10:01:25 -08:00 |
|
Atlante45
|
fb33634171
|
ignore penumbra member variable
|
2014-11-04 16:44:39 +01:00 |
|
Brad Hefta-Gaub
|
bc51d13c9a
|
Merge pull request #3726 from birarda/domain-tunnel
allow for case insensitivity in domain-server allowed users
|
2014-11-03 15:52:55 -08:00 |
|
Brad Hefta-Gaub
|
a78407cac8
|
Merge pull request #3724 from birarda/network-timeout
fix for reverted HifiSockAddr IP lookup in assignment clients
|
2014-11-03 15:52:44 -08:00 |
|
Stephen Birarda
|
a86ccfd603
|
Merge pull request #3725 from ZappoMan/entityScriptsAndEvents
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
|
2014-11-03 15:51:33 -08:00 |
|
ZappoMan
|
e12e3b05e1
|
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
|
2014-11-03 15:33:01 -08:00 |
|
Stephen Birarda
|
0348251cc1
|
allow case insensitivity for allowed users in domain-server
|
2014-11-03 15:32:45 -08:00 |
|