Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 10:00:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
9526 commits 76 branches 59 tags 1.2 GiB
Commit graph

9526 commits

This branch
This branch
All branches
Author SHA1 Message Date
stojce
fe6f5a341c Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-13 18:14:20 +01:00
ZappoMan
5ad74a04f1 Merge pull request #1989 from PhilipRosedale/master 
Improved EditVoxels script, improve and cleanup noise reduction
 2014-02-13 00:14:40 -08:00
Philip Rosedale
50df17dc10 fix windows build buster 2014-02-12 23:37:19 -08:00
Philip Rosedale
595eb38c72 comment out debug 2014-02-12 22:57:13 -08:00
Philip Rosedale
be7d1a5723 Adjustments to noise gate, commit to min sampling method 2014-02-12 22:53:46 -08:00
Philip Rosedale
3a807c1914 comment out debugging spam, improved EditVoxels 2014-02-12 17:57:52 -08:00
stojce
0244ead5df fixed glm::quat initialization 2014-02-12 21:06:30 +01:00
Philip Rosedale
0322c8b934 Added minimum sample counting method for noise reduction 2014-02-11 23:44:22 -08:00
stojce
83d1d54bc2 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-12 02:13:04 +01:00
stojce
68584c654b Allow drag-and-drop of snapshots into Interface 2014-02-12 02:12:52 +01:00
Andrzej Kapolka
e29d6210bb Merge pull request #1981 from AndrewMeadows/avatar-interaction 
Avatar body-body collisions
 2014-02-11 16:02:43 -08:00
Andrew Meadows
66dc4e17ad Fixing formatting to be KR 2014-02-11 15:59:35 -08:00
Philip Rosedale
1412d49a2f merge fix 2014-02-11 15:08:49 -08:00
Philip Rosedale
b6edd7be7b add Vec3::subtract in JS 2014-02-11 15:07:25 -08:00
Philip Rosedale
cd057af1e3 Merge pull request #1972 from ZappoMan/move_hydra_flying_to_js 
Move Hydra movement code from C++ to JS
 2014-02-11 14:22:22 -08:00
Andrew Meadows
d0f9b78710 Adding avatar body-body collisions to prevent near-clipping. 2014-02-11 13:48:48 -08:00
ZappoMan
1fca763b9d removed whitespace to get build to run 2014-02-11 12:43:48 -08:00
ZappoMan
5688e22e6c Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-11 11:37:32 -08:00
Philip Rosedale
803d0fd7c7 Merge pull request #1976 from AndrewMeadows/fix-mouselook 
Fix mouselook roll
 2014-02-11 09:38:48 -08:00
Andrew Meadows
887fa0c938 Only resolve our hand collisions that would not move the other avatar. 
This helps us only penetrate the moveable parts of other avatars.
 2014-02-11 09:23:40 -08:00
Andrew Meadows
861778347f Fixing windows compile warnings about signed vs unsigned compare. 2014-02-11 08:54:40 -08:00
Andrew Meadows
ed610c0739 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-mouselook 2014-02-11 08:47:02 -08:00
Andrew Meadows
7840b351dd Fix for #1968: head does not roll 2014-02-11 08:43:56 -08:00
ZappoMan
9244180cb4 removed debug 2014-02-10 20:27:39 -08:00
ZappoMan
07a2849b92 Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-10 19:56:05 -08:00
ZappoMan
4b2ddc9021 remove dead comment 2014-02-10 19:53:34 -08:00
ZappoMan
91740f89f8 Merge pull request #1971 from ey6es/master 
Ignore extra "=1"'s that Faceshift appends to FST files, fall back to default head/body on failure to load.
 2014-02-10 19:50:26 -08:00
ZappoMan
4b5e633258 tweaks to hydraMove.js, added scale to MyAvatar JS 2014-02-10 19:48:51 -08:00
Andrzej Kapolka
f9e9d62fe3 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-10 19:02:58 -08:00
Andrzej Kapolka
2071da2c8a Provide a means to specify a fallback for when we fail to load a model. Also 
added missing associated resources for default model.  Closes #1960.
 2014-02-10 18:50:36 -08:00
Andrzej Kapolka
bbb8e2a45f Ignore the =1's that Faceshift appends to our custom data in the FST. 2014-02-10 17:41:57 -08:00
Philip Rosedale
990f0ef3a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-10 17:41:56 -08:00
ZappoMan
98211a832c Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-10 17:41:21 -08:00
Philip Rosedale
0527cf886e Merge pull request #1965 from AndrewMeadows/avatar-interaction 
Avatar interaction first pass
 2014-02-10 17:36:54 -08:00
ZappoMan
8b45e0e3a8 Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-10 17:34:35 -08:00
Philip Rosedale
49292a478e EditVoxels.js: Added new voxel making in front of camera with ‘9’ 2014-02-10 17:28:24 -08:00
ZappoMan
991c72006c moving the hydra grab behavior to JS 2014-02-10 17:25:14 -08:00
Andrew Meadows
728f3c7b78 Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction 2014-02-10 17:14:43 -08:00
Andrew Meadows
8529858134 Remove experimental joining of hand-avatar and avatar-avatar collision logic. 2014-02-10 17:12:25 -08:00
Andrew Meadows
f6be83b63c Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 17:02:46 -08:00
Philip Rosedale
65121aefb6 EditVoxels.js: Added color changing with number keys, better audio 2014-02-10 16:42:05 -08:00
Andrzej Kapolka
1445fc3820 Merge pull request #1966 from AndrewMeadows/windows-fix 
Theoretical fix for windows build of tests/metavoxels
 2014-02-10 16:38:25 -08:00
Andrzej Kapolka
c16e539bcc Merge pull request #1967 from ey6es/metavoxels 
This should fix the remaining signed/unsigned warning on Windows.
 2014-02-10 16:37:33 -08:00
Andrzej Kapolka
b9a5b13f0a This should fix the remaining signed/unsigned warning on Windows. 2014-02-10 16:33:35 -08:00
Andrew Meadows
c8bb539a0c Theoretical fix for windows build of tests/metavoxels 2014-02-10 16:24:10 -08:00
Andrew Meadows
ab25fd03af Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 16:01:36 -08:00
Philip Rosedale
dabf3e34d6 Merge pull request #1964 from ZappoMan/multiple_voxel_scripts_crash 
Fixes various crashes in running multiple voxel scripts simultaneously
 2014-02-10 15:43:37 -08:00
Andrew Meadows
4edc6cd88b Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 15:42:56 -08:00
Philip Rosedale
ac9e2732b9 Merge pull request #1963 from birarda/authentication 
default avatar head and body URLS
 2014-02-10 15:42:53 -08:00
Philip Rosedale
64736fe290 Merge pull request #1961 from ZappoMan/silence_bad_edit_packet_warning 
clean up bad edit packet warnings to help reduce log clutter
 2014-02-10 15:42:23 -08:00