Andrzej Kapolka
23a4c21ce1
Only allow heightfield brushes on heightfield attributes.
2014-08-18 18:29:19 -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
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
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
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
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
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
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
wangyix
029ef962b7
made JitterTester work on windows
2014-08-14 11:31:31 -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
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
Andrew Meadows
7852321152
merge upstream/master into andrew/ragdoll
2014-08-13 14:52:14 -07:00
Andrew Meadows
3d107cc7e5
less variability in verlet simulation loop count
2014-08-13 14:51:16 -07:00
Andrew Meadows
b177686f74
minor tweak to how ContactPoint is updated
2014-08-13 14:50:25 -07:00
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
Andrzej Kapolka
8c42a3a848
Ray query fix.
2014-08-13 11:30:05 -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
Andrzej Kapolka
56c6c3c972
Working on the height/ray queries.
2014-08-13 11:05:48 -07:00
Leonardo Murillo
08382327b4
Merge pull request #3274 from wangyix/leo_stats
...
Added domain setting to make AudioMixer print audiostream stats to stdout every second; Added per-report prints to jittertester
2014-08-13 10:43:20 -07:00
Andrzej Kapolka
d00efe7f6d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-08-13 10:07:24 -07:00
Leonardo Murillo
ab4cd71028
Merge pull request #3275 from birarda/oculus-dk2
...
integration of Oculus 0.4.1 for DK2 positional tracking
2014-08-13 09:36:59 -07:00
Stephen Birarda
b055e07d72
look for atls not atl in FindATL
2014-08-13 09:29:49 -07:00
Stephen Birarda
c5ee81f99f
Merge branch 'master' of https://github.com/highfidelity/hifi into oculus-dk2
2014-08-13 09:28:10 -07:00
Stephen Birarda
715aa3b8b9
Merge pull request #3276 from birarda/qxmpp-fix
...
require QXMPP_LIBRARY to be found for FindQXMPP to succeed
2014-08-13 09:27:57 -07:00
Stephen Birarda
da7f3d18e4
require QXMPP_LIBRARY to be found for FindQXMPP to succeed
2014-08-13 09:27:44 -07:00
