Commit graph

15802 commits

Author SHA1 Message Date
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
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
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
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
Stephen Birarda
1e65a093f2 decouple audio-mixer packet receipt from main thread 2014-08-14 12:37:57 -07:00
Philip Rosedale
e18f4e7033 Merge pull request #3282 from AndrewMeadows/ragdoll
fix crash for between two ragdolls
2014-08-14 11:45:09 -07:00
Atlante45
2981132395 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 11:39:44 -07:00
Atlante45
cd0f216419 Added Recorder and Player to Audio class 2014-08-14 11:39:36 -07:00
wangyix
029ef962b7 made JitterTester work on windows 2014-08-14 11:31:31 -07:00
David Rowe
29f4f5b21a Support FBX files with embedded textures 2014-08-14 11:18:10 -07:00
Atlante45
db5aeddc0f fix for joints not playing back 2014-08-14 10:58:00 -07:00
Stephen Birarda
64c11ebf8f don't change the socket buffer sizes if it is already larger 2014-08-14 10:36:54 -07:00
Andrew Meadows
ca4a23e532 use "visible joint positions" for MyAvatar only 2014-08-14 09:21:15 -07:00
Andrew Meadows
ee0d0a1566 remove ragdoll from simulation in dtor 2014-08-14 09:20:53 -07:00
Philip Rosedale
395f643f1b Merge pull request #3277 from AndrewMeadows/ragdoll
Ragdoll Part 10: a little more stability
2014-08-13 19:05:01 -07:00
Ryan Huffman
bf9e887cee Fix SpeechRecognizer in CMakeLists 2014-08-13 16:16:11 -07:00
Leonardo Murillo
f3576a74d0 Merge pull request #3279 from birarda/buffer-fix
change both send and receive socket buffers
2014-08-13 15:59:53 -07:00
Stephen Birarda
ec260dbab2 change both send and receive socket buffers 2014-08-13 15:50:11 -07:00
Andrzej Kapolka
62b84edc7f Brush fix. 2014-08-13 15:13:06 -07:00
Andrew Meadows
f66398d366 adding comment about parameter's purpose 2014-08-13 15:06:34 -07:00