Andrzej Kapolka
7f6b3d3649
Dimension fixes for Retina displays.
2014-09-05 16:44:45 -07:00
Andrew Meadows
c089dbb0bb
removed signed/unsigned comparisons
2014-09-05 16:44:33 -07:00
Andrew Meadows
e7b39ae119
removed unused variable
2014-09-05 16:42:24 -07:00
Andrew Meadows
3ae78da593
fixed signed/unsigned comparison
2014-09-05 16:41:51 -07:00
Andrew Meadows
62438bae6a
fixed signed/unsigned comparison and unused variable
2014-09-05 16:41:01 -07:00
Andrew Meadows
0ddc8eb448
fix signed/unsigned comparison
2014-09-05 16:40:14 -07:00
Brad Hefta-Gaub
5942386383
Merge pull request #3364 from Atlante45/stereo_injections
...
move isStereo packing to the correct position
2014-09-05 16:37:58 -07:00
Atlante45
619aebcd67
move isStereo packing to the correct position
2014-09-05 16:18:02 -07:00
Philip Rosedale
07a6fa56e0
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-05 15:55:45 -07:00
Philip Rosedale
1d2150e12d
Merge pull request #3362 from Atlante45/stereo_injections
...
Added stereo option to the AudioInjector
2014-09-05 15:53:29 -07:00
Philip Rosedale
39ffd3dadd
Merge pull request #3356 from ZappoMan/fixingOctreeSave
...
voxel file corruption fixes
2014-09-05 15:51:02 -07:00
ZappoMan
f0d72b83fa
CR feedback
2014-09-05 15:39:29 -07:00
Philip Rosedale
b311017c9a
Merge pull request #3361 from AndrewMeadows/inertia
...
expose the _measured_ MyAvatar.getVelocity() to JS
2014-09-05 15:34:34 -07:00
Philip Rosedale
220e79a6a9
Merge pull request #3363 from ey6es/metavoxels
...
Metavoxel fixes: added wireframe option, fixed shadow menu group, make sure edit colors are either 100% opaque or 100% transparent, fix deferred lighting/ambient occlusion when glow effect disabled, save metavoxels.dat regularly.
2014-09-05 15:33:20 -07:00
Andrzej Kapolka
eecc94f816
Enable high resolution for OS X.
2014-09-05 15:27:55 -07:00
ZappoMan
1e6b49899a
allow FBXReader to parse new format SVO files
2014-09-05 15:12:41 -07:00
Andrzej Kapolka
c88afc6b81
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-05 15:07:02 -07:00
Philip Rosedale
e5945c5b5a
Merge branch 'master' of https://github.com/worklist/hifi
2014-09-05 15:04:55 -07:00
Philip Rosedale
fec0e73223
Merge pull request #3354 from chansensturm/audio-filter
...
New coordinate calculations for head penumbra filter
2014-09-05 15:00:24 -07:00
Andrzej Kapolka
e476119bd1
Timer should be a child of the server object.
2014-09-05 14:51:14 -07:00
Andrzej Kapolka
742989a0e4
Save metavoxel data regularly, as with voxel data.
2014-09-05 14:35:32 -07:00
Atlante45
507419162c
Added stereo option to the AudioInjector
2014-09-05 14:34:55 -07:00
Andrzej Kapolka
37b4fe5166
Fix for deferred lighting/ambient occlusion when glow effect is disabled.
2014-09-05 14:16:12 -07:00
Andrew Meadows
9c2bfa35f7
restore position integration in Avatar::simulate()
2014-09-05 14:10:10 -07:00
Andrzej Kapolka
98c51f87d2
Make sure edit colors are either 100% opaque or 100% transparent.
2014-09-05 14:00:27 -07:00
Andrzej Kapolka
b278857091
Wireframe option, fix for shadow menu group.
2014-09-05 13:51:22 -07:00
ZappoMan
a19ce6e859
clean up warning
2014-09-05 12:52:04 -07:00
ZappoMan
54a746a846
remove noise
2014-09-05 12:49:23 -07:00
ZappoMan
e1064d8da7
correctly implement data types who assume all child data must be included (e.g. voxels)
2014-09-05 12:41:14 -07:00
ZappoMan
a25790b350
more work on fixing voxels
2014-09-05 11:51:17 -07:00
Andrew Meadows
ff09a0d41b
merge upstream/master into andrew/inerita
2014-09-05 11:47:49 -07:00
Andrew Meadows
7be411b4ca
expose _measured_ MyAvatar velocity to JS
2014-09-05 11:44:13 -07:00
Leonardo Murillo
c2db0c6a30
Merge pull request #3360 from huffman/fix-domain-server
...
Revert the revert and fix domain server
2014-09-05 12:39:07 -06:00
Ryan Huffman
b0a0760be2
Update ShutdownEventListener to not stop event handling
2014-09-05 11:26:22 -07:00
Ryan Huffman
38a14c3864
Reapply "Update assignment client to close on WM_CLOSE message on Windows"
...
This reverts commit a603453cf2
2014-09-05 11:19:36 -07:00
Leonardo Murillo
7b1ed496de
Merge pull request #3358 from highfidelity/revert-3311-fix-wm-close
...
Revert "Update assignment client to close on WM_CLOSE message on Windows...
2014-09-05 12:05:27 -06:00
ZappoMan
f234dbf9a1
converting voxel files to new versioned format with buffer breaks
2014-09-05 10:51:08 -07:00
Leonardo Murillo
a603453cf2
Revert "Update assignment client to close on WM_CLOSE message on Windows"
2014-09-05 11:36:56 -06:00
ZappoMan
5c5658b6e7
Merge branch 'master' of https://github.com/highfidelity/hifi into fixingOctreeSave
2014-09-05 09:27:27 -07:00
ZappoMan
60e8056cd8
removed some debug code
2014-09-05 02:20:30 -07:00
ZappoMan
dc31381fc1
better handling of old model files
2014-09-05 02:19:17 -07:00
ZappoMan
3c2b534842
dead code cleanup and comment cleanup
2014-09-05 01:50:43 -07:00
ZappoMan
5ec98b8dec
more guards to corrupt voxel files
2014-09-05 01:40:41 -07:00
ZappoMan
a189f077b8
fix huge-mega-voxels and voxel file corruption
2014-09-05 01:13:22 -07:00
Brad Hefta-Gaub
c4baf86f9d
Merge pull request #3351 from Atlante45/rec_file_format_tweaks
...
New Recorder/ControlACs UI
2014-09-04 23:09:42 -07:00
Brad Hefta-Gaub
9648c0d64e
Merge pull request #3343 from AndrewMeadows/ragdoll
...
Ragdoll Part 12: first pass avatar skeleton collides with voxels
2014-09-04 23:09:08 -07:00
Craig Hansen-Sturm
fc0a206985
code review comments
2014-09-04 22:57:02 -07:00
stojce
3339b92a49
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
2014-09-05 07:45:55 +02:00
Philip Rosedale
886add11db
Merge pull request #3342 from ey6es/metavoxels
...
Very basic beginnings of an implementation of the dual contour algorithm, including necessary data representation and tools.
2014-09-04 21:46:14 -07:00
Craig Hansen-Sturm
fe0b9825d0
new coordinate calculations for head penumbra filter
2014-09-04 18:10:29 -07:00
