Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 22:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9534 commits 71 branches 56 tags 1.2 GiB
Commit graph

9534 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
ed7fa6e311 added back setupNewVoxelsForDrawing() on changeTree() 2014-02-13 14:39:10 -08:00
ZappoMan
4fb5e68425 removed some debug 2014-02-13 14:33:23 -08:00
ZappoMan
caab3afb69 add menu item for auto adjust LOD 2014-02-13 14:26:30 -08:00
ZappoMan
3aba29b015 first working cut at recreateVoxelGeometryInView() 2014-02-13 13:26:31 -08:00
ZappoMan
cac67d7baa add proper readWriteLocks around the VBO arrays to preven random triangles 2014-02-13 13:06:45 -08:00
ZappoMan
e9259db944 Merge branch 'master' of https://github.com/worklist/hifi into lowerLODnoFPSdrop 2014-02-13 12:20:29 -08:00
Philip Rosedale
7bb7271976 Merge pull request #1993 from ZappoMan/removesomedefaultsettings 
More menu tweaks
 2014-02-13 11:26:52 -08:00
ZappoMan
156fa6dc5a more tweaks, removed old clouds 2014-02-13 11:03:35 -08:00
Philip Rosedale
40f9e0a029 Merge pull request #1991 from ZappoMan/removesomedefaultsettings 
DO NOT MERGE: tweaks to default menus for alpha
 2014-02-13 11:01:26 -08:00
ZappoMan
6d75efd2b0 tweaks to default menus for alpha, make Gravity false so we don't fall into abyss 2014-02-13 10:46:28 -08: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
ZappoMan
20a6f4eea9 first cut at auto-LOD adjustment 2014-02-12 21:22:21 -08:00
ZappoMan
d6b71f19a8 fix voxel texture to work better with larger TREE_SCALE 2014-02-12 18:00:09 -08:00
Philip Rosedale
3a807c1914 comment out debugging spam, improved EditVoxels 2014-02-12 17:57:52 -08:00
Philip Rosedale
0322c8b934 Added minimum sample counting method for noise reduction 2014-02-11 23:44:22 -08: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