David Rowe
|
6f4952c7d5
|
More consts
|
2014-11-13 12:25:15 -08:00 |
|
David Rowe
|
493455fdac
|
Fix const
|
2014-11-13 11:34:40 -08:00 |
|
David Rowe
|
8d4cecda62
|
Optimization and coding standard
|
2014-11-13 11:06:40 -08:00 |
|
David Rowe
|
6cf833cf98
|
Add text overlay textWidth() method
|
2014-11-11 17:31:49 -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 |
|
AndrewMeadows
|
22dbebbe09
|
Merge pull request #3760 from DaveDubUK/20142
CR for Job #20142 - Walk Cycle Polish Description
|
2014-11-11 09:10:32 -08:00 |
|
Philip Rosedale
|
c965c21702
|
Merge pull request #3758 from ey6es/master
Mirror/warning fixes.
|
2014-11-10 17:23:43 -08:00 |
|
Philip Rosedale
|
885a93b7e3
|
Merge pull request #3769 from birarda/plugs
add guard for handling of local audio
|
2014-11-10 17:20:19 -08:00 |
|
Stephen Birarda
|
dabc2b23a3
|
add a guard in case local audio cannot be handled
|
2014-11-10 15:51:56 -08:00 |
|
Atlante45
|
02b401701f
|
Set a minimum mute intervalle in the mixer
|
2014-11-10 15:46:36 -08:00 |
|
Atlante45
|
125ef0e3e2
|
make pulsate function into a cos
|
2014-11-10 15:12:40 -08:00 |
|
Atlante45
|
53fb9e9047
|
make mute icon pulsate when muted
|
2014-11-10 14:11:17 -08:00 |
|
Andrzej Kapolka
|
5f89b6e00e
|
The spec actually says that the 'L' (should have been 'LL' anyway) isn't
necessary; the compiler will know to read the constant as a long long.
|
2014-11-10 11:58:52 -08:00 |
|
Andrzej Kapolka
|
0c1ea784b9
|
Set face.
|
2014-11-10 11:49:02 -08:00 |
|
Andrzej Kapolka
|
431bb0af1d
|
Merge branch 'master' of https://github.com/highfidelity/hifi
Conflicts:
interface/src/Application.cpp
|
2014-11-10 11:46:09 -08:00 |
|
Brad Hefta-Gaub
|
fc89f92097
|
Revert "Revert "Fix build warning""
|
2014-11-07 21:53:56 -08:00 |
|
Brad Hefta-Gaub
|
3a90e869d4
|
Revert "CR for Job #20140 - Add Overlays.getTextWidth"
|
2014-11-07 21:50:19 -08:00 |
|
Brad Hefta-Gaub
|
09490b58b4
|
Revert "Fix build warning"
|
2014-11-07 21:47:28 -08:00 |
|
Brad Hefta-Gaub
|
8e9d0a6396
|
Merge pull request #3762 from ctrlaltdavid/fix-build-warning
Fix build warning
|
2014-11-07 20:24:08 -08:00 |
|
Brad Hefta-Gaub
|
8e17bc74bf
|
Merge pull request #3759 from ctrlaltdavid/20140
CR for Job #20140 - Add Overlays.getTextWidth
|
2014-11-07 20:14:18 -08:00 |
|
David Rowe
|
94d82455a0
|
Fix build warning
|
2014-11-07 19:56:54 -08:00 |
|
Stephen Birarda
|
1e52232a4c
|
add destructors for arrays in Hair
|
2014-11-07 17:21:53 -08:00 |
|
Stephen Birarda
|
2ca673175a
|
rename StdDev to StDev, patch its leak
|
2014-11-07 17:15:54 -08:00 |
|
Andrzej Kapolka
|
6445b3aa5d
|
Linux warnings fixes.
|
2014-11-07 15:59:16 -08:00 |
|
David Rowe
|
a904b128b3
|
Fix boolean literal value
|
2014-11-07 15:28:39 -08:00 |
|
Andrzej Kapolka
|
cd110d6048
|
Fix for invalid projection matrix on startup.
|
2014-11-07 14:35:01 -08:00 |
|
Andrzej Kapolka
|
7008012492
|
Trigger fixes.
|
2014-11-07 14:20:31 -08:00 |
|
Andrzej Kapolka
|
b421ee9243
|
Fix for audio toolbox.
|
2014-11-07 14:09:40 -08:00 |
|
Andrzej Kapolka
|
61e0660d65
|
This actually seems to work differently on OS X versus Linux.
|
2014-11-07 14:01:28 -08:00 |
|
Andrzej Kapolka
|
a4db244182
|
Mirror/warning fixes.
|
2014-11-07 13:57:20 -08:00 |
|
Stephen Birarda
|
bd8b71a02a
|
complete handling of local audio loopback
|
2014-11-07 11:05:01 -08:00 |
|
Stephen Birarda
|
66949ee7a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local-audio
|
2014-11-07 10:57:37 -08:00 |
|
Brad Hefta-Gaub
|
4a6c5e4203
|
Merge pull request #3753 from RyanDowne/master
Changes to Hair to make it look more like clothing
|
2014-11-07 10:55:08 -08:00 |
|
Ryan
|
d0ca9ed14c
|
Changes to Hair to make it look more like clothing
|
2014-11-07 10:45:58 -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
|
45ca063249
|
use original textures for textureNames
|
2014-11-07 10:00:04 -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
|
7b40a7cd89
|
CR feedback
|
2014-11-07 09:07:28 -08:00 |
|
ZappoMan
|
c48d79ad8b
|
add gettable feature which lists texture names
|
2014-11-07 09:05:47 -08:00 |
|
David Rowe
|
7e6d616f20
|
Add text overlay textWidth() method
Is accessible from JavaScript.
|
2014-11-07 08:58:31 -08:00 |
|
David Rowe
|
02f6f6769b
|
Enable different copies of otherwise identical text renderers
Needed when using computeWidth() because it messes up draw() rendering.
|
2014-11-07 08:56:50 -08:00 |
|
Atlante45
|
011e531971
|
Magic numbers and casts
|
2014-11-07 14:41:59 +01:00 |
|
ZappoMan
|
542d671e54
|
cleanup entity scripts when changing domains or entity is deleted
|
2014-11-06 20:01:09 -08:00 |
|
ZappoMan
|
55576e7f9d
|
fix crash in mouse messages while quitting
|
2014-11-06 17:53:22 -08:00 |
|
ZappoMan
|
c1385a9c35
|
fix random crash on checkEnterLeaveEntities
|
2014-11-06 17:41:55 -08:00 |
|
ZappoMan
|
bceab4ead9
|
clear all octree related state when disconnecting from a domain
|
2014-11-06 17:25:49 -08:00 |
|
Atlante45
|
dcfeef4712
|
Reference and comments
|
2014-11-07 00:24:37 +01:00 |
|
Atlante45
|
1e6cadc7c1
|
Extra lines
|
2014-11-07 00:06:57 +01: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 |
|