Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:31:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18651 commits 75 branches 59 tags 1.2 GiB
Commit graph

18651 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrzej Kapolka
6445b3aa5d Linux warnings fixes. 2014-11-07 15:59:16 -08:00
Andrzej Kapolka
17089064f8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-07 15:35:42 -08:00
David Rowe
a904b128b3 Fix boolean literal value 2014-11-07 15:28:39 -08:00
Andrzej Kapolka
9a14e46c78 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-07 14:45:30 -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
Andrzej Kapolka
5838d8b3da Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-07 14:35:48 -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
Philip Rosedale
12eb67c734 fix bug with audio mixer muting too often 2014-11-07 14:18:57 -08:00
Andrzej Kapolka
b421ee9243 Fix for audio toolbox. 2014-11-07 14:09:40 -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
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
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
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
Philip Rosedale
3323ac11ff Merge pull request #3751 from ZappoMan/entityBugs 
various entity bug fixes
 2014-11-06 19:42:23 -08:00
Andrzej Kapolka
4c60be4a31 Fix for hang on test exit. 2014-11-06 19:37:37 -08:00
Andrzej Kapolka
e08a0144c2 Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as 
well as the throbbing/scripted guides and the notion of spanner masking.
 2014-11-06 19:15:43 -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
Andrzej Kapolka
ae71bb671b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-06 17:05:49 -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
Atlante45
dcfeef4712 Reference and comments 2014-11-07 00:24:37 +01:00