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

15447 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
6976d0f51e Merge pull request #3256 from ey6es/metavoxels 
Allow configurable block sizes, use back face culling for heightfields, custom expansion for spanner attributes, compute normals in vertex shader.
 2014-08-05 18:32:05 -07:00
Andrzej Kapolka
0dbad7d0dd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-05 16:49:22 -07:00
Andrzej Kapolka
4696832ec6 Compute heightfield normals from adjacent values in vertex shader. 2014-08-05 15:13:50 -07:00
Andrzej Kapolka
96302ca271 Provide for custom expansion according to attribute, tweak spanner attribute. 2014-08-05 14:10:39 -07:00
Brad Hefta-Gaub
b940d082f3 Merge pull request #3254 from wangyix/pull_mode_audio_output 
Audio output switched to pull mode
 2014-08-05 13:04:40 -07:00
wangyix
212316aed6 moved connect to Audio constructor 2014-08-05 12:14:10 -07:00
wangyix
84c517c073 tweaked starve behavior of InboundAudioStream 2014-08-05 11:57:34 -07:00
Andrzej Kapolka
c42fc15999 Use back face culling on the heightfields. 2014-08-05 11:13:15 -07:00
Andrzej Kapolka
964dc4e954 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-05 11:03:00 -07:00
wangyix
77dad6fe65 change to fix Mac linker error 2014-08-05 11:00:27 -07:00
wangyix
779e7631a1 magic number 100 changed in Audio.cpp 2014-08-05 10:27:16 -07:00
wangyix
1eaf175a92 removed disable audio output overflow check menu option 2014-08-05 10:21:53 -07:00
wangyix
748c9e2065 numAudioSamples now calculated to be device samples instead of network samples 2014-08-05 10:13:34 -07:00
Philip Rosedale
4a36636371 Merge pull request #3255 from AndrewMeadows/ragdoll 
remove dangling shape pointers from PhysicsSimulation
 2014-08-05 08:52:16 -07:00
Andrew Meadows
a1fccdb177 remove dangling shape pointers from PhysicsSimulation 2014-08-05 08:32:14 -07:00
Philip Rosedale
4d0474483d Merge pull request #3253 from AndrewMeadows/ragdoll 
Ragdoll Part 8: improved contact points
 2014-08-04 21:33:31 -07:00
Andrzej Kapolka
173e8af126 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-04 18:31:08 -07:00
Brad Hefta-Gaub
d662c0f414 Merge pull request #3248 from Atlante45/dde_face_tracker 
Dde face tracker
 2014-08-04 18:27:15 -07:00
wangyix
332e75453e Merge remote-tracking branch 'upstream/master' into pull_mode_audio_output 2014-08-04 17:58:31 -07:00
wangyix
2b8b15e32d made audioscope easier to see 2014-08-04 17:56:14 -07:00
wangyix
c42af55f2f Merge branch 'inbound_audio_stream' into pull_mode_audio_output 2014-08-04 17:41:03 -07:00
Andrew Meadows
39d3deee90 merge upstream/master into andrew/ragdoll 2014-08-04 17:37:28 -07:00
Andrew Meadows
f126ce299a ContactPoint = set of assymetric distance consraints 2014-08-04 17:34:24 -07:00
Andrew Meadows
4beee3fecf add Shape::getVerletPoints() 2014-08-04 17:33:24 -07:00
wangyix
ed3240fbad minor change to _audioOutput->setBufferSize() 2014-08-04 17:31:14 -07:00
Andrew Meadows
d1b2ba4a43 fix bug: false positive capsuleCapsule() collision 
for capsules with parallel axes and negative pojection of
center-to-center separation

also replace fabs() with fabsf()
 2014-08-04 17:30:23 -07:00
wangyix
4355ca8328 minor member rename 2014-08-04 17:24:18 -07:00
wangyix
3fe4c29848 removed heap alloc of receivedSamples; cleaned up code 2014-08-04 17:14:26 -07:00
Andrzej Kapolka
f8afdba922 Allow configurable block sizes, merging children with different resolutions. 2014-08-04 16:56:30 -07:00
Stephen Birarda
7254b3a06e Merge pull request #3252 from birarda/master 
another small html change in domain-server
 2014-08-04 16:24:14 -07:00
Stephen Birarda
4f0218090c have the domain-server brand in navbar link back to home 2014-08-04 16:23:28 -07:00
wangyix
4d7d6f1e25 changed downstream re-sampling to occur right after parsing packet 2014-08-04 16:23:17 -07:00
Stephen Birarda
ca93dbef83 Merge pull request #3251 from birarda/master 
make assignment link a dropdown in domain-server webpage
 2014-08-04 16:02:58 -07:00
Stephen Birarda
4407ea4480 make assignment selector a dropdown 2014-08-04 16:02:13 -07:00
Leonardo Murillo
384e62f1b1 Merge pull request #3250 from birarda/master 
add basic DS navbar, add support for basic auth
 2014-08-04 16:55:51 -06:00
Stephen Birarda
9fc545001c look for a config.json file by default in resources 2014-08-04 15:40:45 -07:00
Stephen Birarda
6febca3533 add missing domain-server javascript file 2014-08-04 15:37:06 -07:00
Stephen Birarda
c786ee5c26 dynamically change active link in domain-server navbar 2014-08-04 15:27:34 -07:00
Stephen Birarda
10c94023f1 handle basic authentication for domain-server admin 2014-08-04 15:25:14 -07:00
Stephen Birarda
2c1277ef37 remove voxel settings from domain-server settings until ready to go 2014-08-04 14:47:17 -07:00
Stephen Birarda
40375b8c81 add a navbar to domain-server web page 2014-08-04 14:46:33 -07:00
Philip Rosedale
d552b7ca97 Merge pull request #3246 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats handling of out-of-sync seq nums
 2014-08-04 14:30:45 -07:00
Philip Rosedale
6b1b1aaf17 Merge pull request #3249 from ey6es/metavoxels 
Cull heightfield/points/spanners against frustum, added simple "erase heightfield" tool.
 2014-08-04 14:28:48 -07:00
Andrzej Kapolka
f33c51378b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-04 12:58:19 -07:00
Andrzej Kapolka
b1d6977112 Added simple "erase heightfield" tool. 2014-08-04 12:58:01 -07:00
Atlante45
d1a1311979 Mode DDE tweaks 2014-08-04 12:44:23 -07:00
Atlante45
0a42968197 DDE tweaks 2014-08-04 12:40:12 -07:00
Atlante45
1a27b4b645 Merge branch 'master' of https://github.com/highfidelity/hifi into dde_face_tracker 2014-08-04 12:24:44 -07:00
Clément Brisset
a5f8a23d7c Merge pull request #3247 from Atlante45/edit_models_on_off 
turn off editModels by default
 2014-08-04 12:14:15 -07:00
Atlante45
74edf6557f turn off editModels by default 2014-08-04 12:05:31 -07:00