Commit graph

16384 commits

Author SHA1 Message Date
ZappoMan
f16a85b2aa fix header 2014-09-05 19:07:30 -07:00
ZappoMan
9e21d26a6d improve ping behavior and clockskew in octree servers by introducing datagramprocessing thread 2014-09-05 19:03:44 -07:00
Clément Brisset
7476c61647 Merge pull request #3366 from ey6es/master
The long-requested full "Retina" resolution fix for OS X.
2014-09-05 18:08:22 -07:00
Andrzej Kapolka
c9d22ea07e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-05 18:04:15 -07:00
Clément Brisset
f3344ac440 Merge pull request #3365 from AndrewMeadows/inertia
remove warnings
2014-09-05 18:00:35 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00
Andrzej Kapolka
0b2d0a0b07 Fix for mouse events. 2014-09-05 17:30:19 -07:00
Andrew Meadows
526d998924 removed warnigs about ill-formed narrowing conversion 2014-09-05 17:21:15 -07:00
Andrew Meadows
1d7ac23aa1 removed signed/unsigned comparison 2014-09-05 17:10:13 -07:00
Andrzej Kapolka
c2cd23a54c Mouse coordinate fix. 2014-09-05 17:07:37 -07:00
Andrew Meadows
5c75b53c0d removed singed/unsigned comparisons 2014-09-05 17:06:42 -07:00
Andrew Meadows
2f03f0fb0d removed unused variables 2014-09-05 17:00:23 -07:00
Andrew Meadows
be4ec8920d reorderd init of data members in ctor 2014-09-05 16:58:25 -07:00
Andrew Meadows
51dca12a7b added default case for switch statements
which avoids warnings about unhandled enum values
2014-09-05 16:55:42 -07:00
Andrew Meadows
2fdfb125f2 removed signed/unsigned comparisons 2014-09-05 16:55:24 -07:00
Andrzej Kapolka
5bdad18ade Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-05 16:45:15 -07:00
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
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
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