Andrzej Kapolka
e9e3671710
Increment the version number.
2014-08-21 18:14:10 -07:00
Andrzej Kapolka
530f5b0df8
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-08-21 16:00:30 -07:00
Andrzej Kapolka
e152e0c2be
Detachment fix.
2014-08-21 15:22:34 -07:00
Andrzej Kapolka
74b39773d6
Don't merge after expansion; it breaks stuff.
2014-08-21 14:50:58 -07:00
Andrzej Kapolka
72500630b0
Basic splatting.
2014-08-20 19:26:06 -07:00
Andrzej Kapolka
416d9bac2e
Working on texture rendering.
2014-08-20 14:48:02 -07:00
Clément Brisset
c76afe7d4a
Merge pull request #3298 from PhilipRosedale/master
...
First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering
2014-08-20 10:16:25 -07:00
Philip Rosedale
8e958b49c0
Merge pull request #3303 from Atlante45/record_feature
...
Record feature JS API + File Format
2014-08-19 21:25:18 -07:00
Andrzej Kapolka
540d074270
More texture bits.
2014-08-19 17:20:14 -07:00
Atlante45
b13604f968
JS API for recording
2014-08-19 16:43:26 -07:00
Andrzej Kapolka
3136e4df76
More texture progress.
2014-08-19 15:28:15 -07:00
Andrzej Kapolka
a9c4ce2a6a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-08-19 14:21:42 -07:00
Andrzej Kapolka
e854656a7f
Rather than using a boolean to indicate "colorness," use a different class.
...
More texture bits.
2014-08-19 14:20:47 -07:00
Andrew Meadows
f511fe2657
Ragdoll cannot assume skeleton's rootIndex is 0
...
some Models have extra "joints" not part of the normal skeleton
2014-08-19 11:31:50 -07:00
Philip Rosedale
7b86f668a6
Add SPACE to scripting JS, change reset to apostrophe
2014-08-18 23:22:55 -07:00
Atlante45
45ccb01297
Update options position and orientation correctly in the AudioInjector
2014-08-18 21:05:03 -07:00
Andrzej Kapolka
5b8ff07449
Working on heightfield textures.
2014-08-18 18:21:48 -07:00
Andrzej Kapolka
c2a5c33b7b
Added ability to encode subdivisions relative to ancestor (not currently using
...
for heightfields, since absolute lossy encoding is more efficient).
2014-08-18 16:07:15 -07:00
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
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
543bf5224c
add VerletPoint::shift()
2014-08-18 12:54:26 -07:00
Andrew Meadows
7e7978de1a
compute and store Ragdoll::_accumulatedMovement
2014-08-18 12:53:04 -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
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
AndrewMeadows
4b7208ac53
Merge pull request #3280 from huffman/19907
...
Code Review for Job #19907
2014-08-18 10:20:01 -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
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
Andrzej Kapolka
05d6b628fa
Alllmost ready with the big edge sharing rejiggery.
2014-08-14 17:10:45 -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
9e5b68fa9d
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-14 15:38:03 -07: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
Atlante45
2981132395
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
2014-08-14 11:39:44 -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
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
Stephen Birarda
ec260dbab2
change both send and receive socket buffers
2014-08-13 15:50:11 -07:00
