Atlante45
6d567e67a9
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-18 15:41:19 -07:00
Clément Brisset
bec149ebb9
Merge pull request #3295 from AndrewMeadows/ragdoll
...
Ragdoll Part 11: ragdoll collisions move avatar
2014-08-18 15:38:25 -07:00
AndrewMeadows
86aa9a1dcf
Merge pull request #3289 from ctrlaltdavid/19840
...
Code Review for Job #19840
2014-08-18 15:05:26 -07:00
Clément Brisset
a6f0c9bb01
Merge pull request #3288 from nivardus/19616
...
Code Review for Job #19616
2014-08-18 14:44:29 -07:00
Atlante45
1d30b52ec2
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-18 14:23:40 -07:00
Atlante45
52640c8482
Various tweaks and code cleanup
2014-08-18 14:23:29 -07:00
Andrew Meadows
b2d3830057
merge upstream/master into andrew/ragdoll
2014-08-18 12:56:11 -07:00
Andrew Meadows
c2f4648ad7
Merge branch 'ragdoll' of ssh://github.com/AndrewMeadows/hifi into ragdoll
2014-08-18 12:55:10 -07:00
Andrew Meadows
543bf5224c
add VerletPoint::shift()
2014-08-18 12:54:26 -07:00
Andrew Meadows
aa1a7307cc
use Ragdoll::_accumulatedMovement to move MyAvatar
2014-08-18 12:53:34 -07:00
Andrew Meadows
7e7978de1a
compute and store Ragdoll::_accumulatedMovement
2014-08-18 12:53:04 -07:00
Andrew Meadows
3e2095332f
make SkeletonRagdoll::updateMuscles() protected
2014-08-18 12:50:07 -07:00
Andrew Meadows
fe5f9f8fe5
use relative mass when enforcing ContactPoint
2014-08-18 12:49:47 -07:00
Andrew Meadows
54851c5ced
add Ragdoll::_accumulatedMovement
2014-08-18 12:49:12 -07:00
Clément Brisset
ddc67a8edb
Merge pull request #3285 from AndrewMeadows/ragdoll
...
Cleanup of Ragdoll API
2014-08-18 12:36:27 -07:00
Atlante45
acb55ce65e
Switched audio play back to AudioInjector out of Audio
2014-08-18 12:31:44 -07:00
Atlante45
2eb1321cc2
Sound and AudioInjector tweaks
2014-08-18 12:28:44 -07:00
Andrzej Kapolka
b7bdaae691
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-08-18 11:40:16 -07:00
Andrew Meadows
77047b0130
no NULL check on delete SkeletonModel::_ragdoll
2014-08-18 11:25:51 -07:00
AndrewMeadows
4b7208ac53
Merge pull request #3280 from huffman/19907
...
Code Review for Job #19907
2014-08-18 10:20:01 -07:00
AndrewMeadows
7d508eab1b
Merge pull request #3294 from ZappoMan/improvedJitterTests
...
improved use of MovingMinMaxAvg<> for better performance
2014-08-18 09:25:05 -07:00
ZappoMan
be94f98a91
fix warning
2014-08-17 14:10:42 -07:00
ZappoMan
cac4e5ba6c
improved use of MovingMinMaxAvg<> for better performance, added execution timing stats
2014-08-17 14:08:07 -07:00
Atlante45
47685b0e88
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-17 12:56:19 -07:00
Andrzej Kapolka
a83ff45335
Working on custom encodings for subdivisions.
2014-08-15 18:09:58 -07:00
Philip Rosedale
5ca28901bd
Merge pull request #3293 from ey6es/metavoxels
...
Support for shadows on heightmaps.
2014-08-15 17:37:58 -07:00
Andrzej Kapolka
a2ec9898ad
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-08-15 16:34:25 -07:00
Andrzej Kapolka
668f6d3cfd
Support for shadows on heightmaps.
2014-08-15 16:13:47 -07:00
AndrewMeadows
e2251852c3
Merge pull request #3291 from birarda/mixer-analytics
...
perfom packet verification on same thread as NodeList hash
2014-08-15 14:24:40 -07:00
AndrewMeadows
adef45538c
Merge pull request #3292 from Atlante45/fix_for_custom_URL_schemes
...
Fix for custom URL schemes
2014-08-15 14:22:49 -07:00
Atlante45
6592a6dca2
Fix for custom URL schemes
2014-08-15 10:28:22 -07:00
Stephen Birarda
2e6350832c
perfom packet verification on same thread as NodeList hash
2014-08-15 09:35:03 -07:00
Philip Rosedale
28abc6ab2a
Merge pull request #3290 from ey6es/metavoxels
...
Big change in the way shared borders are handled in order to fix seams between blocks. Fixes for height/ray queries. Minimal rectangles for deltas, switch between PNG and deflated JPG encodings.
2014-08-15 07:57:46 -07:00
Andrzej Kapolka
67266b41df
Deflated JPEG encoding for blocks above 16x16.
2014-08-14 19:21:32 -07:00
Bennett Goble
ca42aecd41
Merge branch 'master' into 19616
2014-08-14 20:52:55 -04:00
David Rowe
f7addad5ac
Update progress background image to use copy on S3
2014-08-14 17:20:00 -07:00
Andrzej Kapolka
05d6b628fa
Alllmost ready with the big edge sharing rejiggery.
2014-08-14 17:10:45 -07:00
Philip Rosedale
f15ff56314
Merge pull request #3284 from wangyix/master
...
Made JitterTester work on Windows
2014-08-14 16:58:21 -07:00
AndrewMeadows
1a5230ef08
Merge pull request #3286 from birarda/mixer-analytics
...
de-couple audio mixer packet receive thread from processing
2014-08-14 16:42:21 -07:00
Atlante45
3cc18d10ae
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-14 16:07:38 -07:00
Clément Brisset
c01e8339b1
Merge pull request #3287 from birarda/oculus-dk2
...
require presence of LibOVR for relative position from OculusManager
2014-08-14 15:59:23 -07:00
wangyix
7a8a8684d6
fixed crash when audioscope frame size is reduced
2014-08-14 15:56:13 -07:00
Stephen Birarda
e3bab8bdc8
require presence of LibOVR for relative position from OculusManager
2014-08-14 15:47:03 -07:00
Atlante45
9e5b68fa9d
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-14 15:38:03 -07:00
Bennett Goble
e21392f553
Merge branch 'master' into 19616
2014-08-14 18:37:11 -04:00
Andrew Meadows
432c14408c
removed hackery from ContactPoint enforcement
2014-08-14 15:29:57 -07:00
Andrew Meadows
98d27ad2b5
more correct names for ContactPoint API
...
renamed (and disabled) the useless enforce() to applyFriction()
changed the buildConstraints() method to more correct name: enforce()
will eventually change how ContactPoint actually works, but later
2014-08-14 15:17:03 -07:00
Andrew Meadows
60d411ead5
cleanup Ragdoll API (less "ragdoll" qualifiers)
2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9
split SkeletonModel and Ragdoll classes apart
2014-08-14 14:29:03 -07:00
Stephen Birarda
c58bae9021
attempt to change buffers to 1MB only
2014-08-14 14:27:09 -07:00
