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
|
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 |
|
Atlante45
|
edec4d1298
|
Mixer send mute when if too noisy
|
2014-11-10 14:10:29 -08:00 |
|
Brad Hefta-Gaub
|
338c5aea94
|
Merge pull request #3767 from birarda/plugs
fix a bug produced by not setting deleted var to NULL
|
2014-11-10 11:21:24 -08:00 |
|
Stephen Birarda
|
fda5b0fffd
|
fix a bug produced by not setting deleted var to NULL
|
2014-11-10 11:03:15 -08:00 |
|
Brad Hefta-Gaub
|
70c7a2e040
|
Merge pull request #3766 from Atlante45/corruption_bug
Switch members in EntityItemProperties to hack around corruption bug
|
2014-11-10 10:40:16 -08:00 |
|
Atlante45
|
d0a535aee5
|
Switch members in EntityItemProperties to hack around corruption bug
|
2014-11-10 10:24:14 -08:00 |
|
AndrewMeadows
|
e562f3d7a8
|
Merge pull request #3765 from highfidelity/revert-3763-revert-3762-fix-build-warning
Revert "Revert "Fix build warning""
|
2014-11-08 06:59:45 -08:00 |
|
Brad Hefta-Gaub
|
fc89f92097
|
Revert "Revert "Fix build warning""
|
2014-11-07 21:53:56 -08:00 |
|
Brad Hefta-Gaub
|
86eb7a2464
|
Merge pull request #3764 from highfidelity/revert-3759-20140
Revert "CR for Job #20140 - Add Overlays.getTextWidth"
|
2014-11-07 21:50:29 -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
|
c4744290d2
|
Merge pull request #3763 from highfidelity/revert-3762-fix-build-warning
Revert "Fix build warning"
|
2014-11-07 21:47:44 -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 |
|
samcake
|
3dec5722a0
|
Merge pull request #3761 from birarda/plugs
fix a memory leak in OctreeElement, StDev
|
2014-11-07 17:36:14 -08:00 |
|
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
|
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 |
|
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 |
|
David Rowe
|
a904b128b3
|
Fix boolean literal value
|
2014-11-07 15:28:39 -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 |
|
Brad Hefta-Gaub
|
99f8f1ca45
|
Merge pull request #3756 from huffman/fix-entity-paste
Fix EntityItemProperties::markAllChanged() not marking all properties
|
2014-11-07 14:09:28 -08:00 |
|
Ryan Huffman
|
d4fa24e9b6
|
Fix entity item properties not marking all props changed
|
2014-11-07 13:56:23 -08:00 |
|
Brad Hefta-Gaub
|
f29a418e25
|
Merge pull request #3754 from birarda/local-audio
add option for local only loopback of audio from js
|
2014-11-07 11:14:11 -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 |
|
AndrewMeadows
|
b2acf4f3d1
|
Merge pull request #3752 from ZappoMan/entityBugs
couple of entity features and bug fixes
|
2014-11-07 10:17:41 -08:00 |
|
Stephen Birarda
|
f1a238a6c2
|
piping for local UI sounds
|
2014-11-07 10:08:09 -08:00 |
|
ZappoMan
|
742e6487c7
|
rename textureNames to originalTextures
|
2014-11-07 10:05:43 -08:00 |
|
ZappoMan
|
53f5019ee7
|
rename textureNames to originalTextures
|
2014-11-07 10:05:36 -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
|
8c3360d0a9
|
Auto-size load URL and file menu items in editModels and newEditEntities
And fix a couple of typos.
|
2014-11-07 08:59:37 -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 |
|
ZappoMan
|
786c08f196
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityBugs
|
2014-11-07 08:19:25 -08:00 |
|
ZappoMan
|
542d671e54
|
cleanup entity scripts when changing domains or entity is deleted
|
2014-11-06 20:01:09 -08:00 |
|
Philip Rosedale
|
3323ac11ff
|
Merge pull request #3751 from ZappoMan/entityBugs
various entity bug fixes
|
2014-11-06 19:42:23 -08:00 |
|