sam gateau
7349562111
Removing commented code
2018-09-06 15:50:31 -07:00
sam gateau
5ecbdb50c7
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-06 15:36:32 -07:00
John Conklin II
7bbedf65c7
Merge pull request #13950 from sethalves/overlay-set-name-crash
...
fix a crash related to setting an overlay's name
2018-09-06 14:28:11 -07:00
John Conklin II
8c77749fb6
Merge pull request #13947 from SamGondelman/perf
...
Fix blendshapes crash one last time, one last time
2018-09-06 14:21:18 -07:00
John Conklin II
b486b6d148
Merge pull request #13928 from AndrewMeadows/enable-workload-feedback
...
enable workload regulation by default
2018-09-06 14:20:40 -07:00
sam gateau
6544e9f0b0
Removing the commented debug code
2018-09-06 13:58:03 -07:00
sam gateau
38bfee7b72
Fix compilation on android and add the simple getBufferIDUnsynced in bindUniformBuffer
2018-09-06 13:54:21 -07:00
John Conklin II
152ec3d631
Merge pull request #13945 from davidkelly/dk/17915
...
volume slider on individual users in PAL remembers setting now
2018-09-06 12:55:46 -07:00
sam gateau
e428248472
Adressing build warnings
2018-09-06 11:33:26 -07:00
sam gateau
5aa45b64d2
Adressing build warnings
2018-09-06 11:24:13 -07:00
sam gateau
129e2ce188
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-06 10:30:41 -07:00
Ryan Huffman
80b5f90160
Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive
...
MS17463: only show InteractiveWindow on top of interface window
2018-09-06 10:15:20 -07:00
Seth Alves
042044ceaf
dammit
2018-09-06 09:38:12 -07:00
Seth Alves
5a0a259c21
dammit
2018-09-06 09:37:01 -07:00
Seth Alves
69ae04ab09
protect Base3DOverlay::_name with a mutex
2018-09-06 09:03:28 -07:00
sam gateau
4ef8f29522
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-05 17:50:21 -07:00
sam gateau
21f65d8a78
position are used correctly for evaluting bounds in the Mesh
2018-09-05 17:50:06 -07:00
Sam Gateau
03f51352aa
Merge pull request #13932 from SamGondelman/framebuffer
...
Fix framebuffer debugging
2018-09-05 17:38:21 -07:00
SamGondelman
cde2dc2eaa
please work
2018-09-05 17:04:05 -07:00
Sam Gateau
912e0abb0a
Merge pull request #13891 from samcake/black
...
Improving the LOD manager behavior for better scaling
2018-09-05 16:01:09 -07:00
David Kelly
b022697dfa
volume slider on users fixed
2018-09-05 15:36:07 -07:00
sam gateau
15f54ac47d
Merge branch 'black-bis' of github.com:samcake/hifi into black-bis
2018-09-05 14:37:20 -07:00
sam gateau
1feaf286b4
keeping position separated from the other attributes
2018-09-05 14:35:50 -07:00
John Conklin II
649a22a70b
Merge pull request #13930 from misslivirose/fix-17828
...
Fix MS 17828: Explore Desktop Text Visible
2018-09-05 13:44:37 -07:00
John Conklin II
dc02ff66f5
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset
...
mark and cycle trait instances needing to be sent on mixer reconnect
2018-09-05 12:43:27 -07:00
Sam Gateau
f5843c24d4
Merge branch 'black' of github.com:samcake/hifi into black-bis
2018-09-05 11:36:53 -07:00
Sam Gateau
2ced6d9681
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-05 11:35:59 -07:00
sam gateau
0e614ad578
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-05 11:35:08 -07:00
sam gateau
ce86e94e6f
Add simple optim and instrumentation for tthe number of input buffer changes per frame"
2018-09-05 11:34:33 -07:00
Thijs Wenker
198ec294ac
restore window parent on presentationMode switch
2018-09-05 20:13:48 +02:00
sam gateau
8344cb9aff
REfactor the FBXReader_Mesh for different vertex formats
2018-09-05 11:07:04 -07:00
Anthony Thibault
584d39744f
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode
...
HMD mode bug fix for avatars with no eyes
2018-09-05 10:57:21 -07:00
Anthony Thibault
536de03637
Merge pull request #13935 from hyperlogic/bug-fix/takeoff-to-in-air-glitch
...
Fix for glitch when entering in-air state from takeoff.
2018-09-05 10:56:34 -07:00
Andrew Meadows
db28ac0224
Merge pull request #13926 from FlameSoulis/fix/Build_LINUX.md-18.04
...
Updated and Revised BUILD_LINUX.md - Includes Ubuntu 18.04 steps
2018-09-05 10:18:26 -07:00
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager
...
Miscellaneous low-level performance improvements
2018-09-05 10:12:05 -07:00
Sam Gateau
d2dcf6a3eb
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-05 08:40:30 -07:00
sam gateau
7de8f4867e
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-05 08:38:04 -07:00
Thijs Wenker
62d4b1805d
Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive
2018-09-05 17:25:14 +02:00
sam gateau
adcabf52c5
Refactoring the FBXReader_MEsh.cpp for better interleaving
2018-09-04 17:33:18 -07:00
SamGondelman
9e76c164ac
fix aabox operator+=
2018-09-04 16:25:47 -07:00
Anthony Thibault
e210fadc7c
Fix for glitch when entering inAir state from takeoff.
...
This was due to a frame lag of blend factor used for inAir blending. So the first frame the upward velocity would be 0, followed by 3.5 m/s the next frame.
This is fixed by using the workingVelocity instead of _lastVelocity to drive the blend.
2018-09-04 14:36:56 -07:00
John Conklin II
476887a224
Merge pull request #13909 from NissimHadar/fixFileUtils
...
Create correct folder.
2018-09-04 14:20:20 -07:00
Sam Gateau
b92d1061c4
Merge pull request #13920 from AndrewMeadows/dont-bid-for-locked
...
don't bid for simulation ownership of locked entities
2018-09-04 13:26:21 -07:00
SamGondelman
dff8292216
fix framebuffer debug
2018-09-04 12:50:25 -07:00
Zach Fox
3329dd8e71
Merge pull request #13929 from zfox23/MS17902_installApp
...
Fix MS17902: Prevent case where My Purchases says Open instead of Uninstall
2018-09-04 12:47:15 -07:00
John Conklin II
eaa5e2ea9a
Merge pull request #13927 from kencooke/audio-hrtf-avx2-more
...
Low-level performance improvements to audio-mixer
2018-09-04 12:06:32 -07:00
Anthony Thibault
b21fa1037f
Code review feedback and bug fixes for calibraiton matrices
2018-09-04 11:55:52 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
Anthony Thibault
3a034fdf66
HMD mode bug fix for avatars with no eyes
...
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Sam Gateau
a328528642
Merge pull request #13883 from NissimHadar/addMap_d
...
Added read of map_d from MTL files
2018-09-04 09:38:07 -07:00
