Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18803 commits 71 branches 56 tags 1.2 GiB
Commit graph

18803 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Sam Gateau
7ccb7495c7 Merge and resolve conflict on APplication.cpp 2014-11-10 10:07:24 -08:00
Sam Gateau
631ed9da78 let's start reusing the Batch per model from frame to frame 2014-11-10 10:04:19 -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
DaveDubUK
ef325db052 Formatting changes to walk.js 1.1 
Minor formatting changes for HiFi coding standard compliance
 2014-11-08 11:47:57 +00: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
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
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
Stephen Birarda
5e3e363066 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-11-07 14:28:53 -08:00
Sam Gateau
f3fe934fe2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-07 14:27:51 -08:00
Sam Gateau
9d146e7ea3 improving the evalFromRawMatrix decomposition 2014-11-07 14:27:22 -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
Stephen Birarda
beb7c339f3 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-11-07 11:18:04 -08:00
Sam Gateau
dc748a85a3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-07 11:14:55 -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