Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:04:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15498 commits 25 branches 0 tags 1.1 GiB
Commit graph

15498 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
2f1a56a87c ContactPoint tries to help maintain collisions 
so that collision events will continue to update the contact
 2014-08-13 13:48:04 -07:00
Andrew Meadows
bc432aa8e8 use relative masses for ContactPoint contsrtaint 2014-08-13 11:29:54 -07:00
Andrew Meadows
4de43b7cbe cleanup and reordering of code 2014-08-13 11:19:32 -07:00
Andrew Meadows
2918feddf0 reduce acceptable error for ragdoll simulation 2014-08-11 14:51:42 -07:00
Andrew Meadows
2286eae64a head connects to neck during ragdoll simulation 2014-08-08 10:53:38 -07:00
Andrew Meadows
2fe22a4c1a merge upstream/master into andrew/ragdoll 2014-08-08 08:43:02 -07:00
Andrew Meadows
05318acc7f don't make shapes for joints with zero radius 2014-08-08 08:37:28 -07:00
Brad Hefta-Gaub
0f5ee4eac1 Merge pull request #3264 from AndrewMeadows/ragdoll 
fix for bad models and some crashes
 2014-08-08 08:36:10 -07:00
Andrew Meadows
bcb0cb2c3c fix bug: variable should be float rather than int 2014-08-08 08:26:25 -07:00
Andrew Meadows
5de762361a remove cleanup of Model::_jointStates tree 
the cleanup causes crashes and broken models
 2014-08-08 08:20:42 -07:00
Philip Rosedale
96a795eea4 Merge pull request #3263 from AndrewMeadows/ragdoll 
Ragdoll Part 9:
 2014-08-07 22:12:31 -07:00
Andrew Meadows
9a55252587 remove extraneous roots from Model::_jointStates 2014-08-07 17:02:28 -07:00
Leonardo Murillo
03985a3bd4 Merge pull request #3262 from ZappoMan/master 
remove animation server
 2014-08-07 16:14:30 -06:00
ZappoMan
84f3ede32f small change to force rebuild 2014-08-07 15:09:24 -07:00
ZappoMan
64699a213a remove animation server 2014-08-07 14:48:51 -07:00
ZappoMan
8c2dad1476 remove animation server 2014-08-07 14:40:06 -07:00
Andrew Meadows
bb33266635 merge upstream/master into andrew/ragdoll 2014-08-07 14:37:10 -07:00
Andrew Meadows
94da63006c VerletPoint::_mass is now private 
We set the mass of other avatars artificially high
so they are less movable.
 2014-08-07 14:35:32 -07:00
Andrew Meadows
0f784a9cc5 add other ragdolls to simulation 2014-08-07 13:09:05 -07:00
Andrew Meadows
87350ad2d0 ragdoll simulation now in model-relative frame 
(same rotation as world-frame, but translated to MyAvatar origin)
 2014-08-07 11:45:06 -07:00
Andrew Meadows
db1d6c8b49 MyAvatar's ragdoll is the main simulation ragdoll 2014-08-07 09:23:05 -07:00
Andrew Meadows
27b876e84c namechange _frame --> _frameCount 2014-08-07 09:02:31 -07:00
Leonardo Murillo
8cca925679 Merge pull request #3260 from murillodigital/master 
Fixing bug with visage find_library
 2014-08-07 09:59:37 -06:00
Leonardo Murillo
6191db3a7f Fixing bug with visage find_library 2014-08-07 09:59:07 -06:00
AndrewMeadows
2653b33b67 Merge pull request #3257 from Atlante45/referentials 
Referentials
 2014-08-06 14:12:18 -07:00
Philip Rosedale
dc4f57b30f Merge pull request #3259 from Atlante45/fix_avatar_not_fading_out 
Fix avatar not fading out
 2014-08-06 13:39:59 -07:00
Atlante45
de8c7fb204 Fix avatar not fading out 2014-08-06 12:14:36 -07:00
Andrzej Kapolka
c384abedcc Merge pull request #3258 from Atlante45/fix_voxel_bug 
fix voxel bug
 2014-08-06 11:46:38 -07:00
Atlante45
a8999d7db7 fix voxel bug 2014-08-06 11:23:48 -07:00
Andrew Meadows
cb8c0792b2 make main ragdoll and entity special 
also addded some logic (unused) to add ragdolls of other avatars
 2014-08-06 10:43:56 -07:00
Atlante45
fe8839b4b8 CR 2014-08-06 10:40:55 -07:00
Atlante45
110b034bcb Changed updates locations 2014-08-05 18:41:48 -07:00
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
Atlante45
293c2e94ad Correct member initialisation 2014-08-05 18:17:49 -07:00
Atlante45
2e7d34a886 typing error 2014-08-05 17:08:23 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -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
Atlante45
39a74cbc28 Few modifications to how avatars update their positions 2014-08-05 12:03:53 -07:00
Atlante45
283beab05d ModelReferential copy constructor 2014-08-05 12:03:16 -07:00
Atlante45
9999c88d84 Added Referential getters + fixed stupid unpacking bug 2014-08-05 12:01:47 -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