Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 23:08:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71206 commits 25 branches 0 tags 1.1 GiB
Commit graph

29292 commits

Author SHA1 Message Date
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
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
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
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
2ced6d9681 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-09-05 11:35:59 -07:00
Thijs Wenker
198ec294ac restore window parent on presentationMode switch 2018-09-05 20:13:48 +02: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
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
Thijs Wenker
62d4b1805d Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive 2018-09-05 17:25:14 +02: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
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
Andrew Meadows
49e48f5ea0 enable workload regulation by default 2018-09-04 08:49:19 -07:00
Ken Cooke
f5b7232f58 Cleanup 2018-09-03 14:00:30 -07:00
Ken Cooke
94e8ee99f5 AVX2 implementation of interpolate() 2018-09-03 13:06:49 -07:00
Ken Cooke
96aa0549be AVX2 implementation of crossfade_4x2() 2018-09-01 12:08:49 -07:00
Sam Gateau
bd9136812d Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-31 17:53:49 -07:00
John Conklin II
b94dd526b9
Merge pull request #13919 from SamGondelman/avatarmanager2 
Fix blendshapes crash one last time
 2018-08-31 17:12:42 -07:00
Stephen Birarda
a37a19da1e use different XORed instance ID for replicas 2018-08-31 16:59:24 -07:00
Stephen Birarda
9b3d9dd0f3 XOR incoming trait instance IDs for other avatars 2018-08-31 16:56:22 -07:00
Stephen Birarda
20912349a4 cycle avatar entity IDs for new avatar mixer 2018-08-31 16:53:58 -07:00
Stephen Birarda
48680329ec mark trait instances needing to be sent on mixer reconnect 2018-08-31 16:53:53 -07:00
Sam Gondelman
7cdc7dcc66
Merge pull request #13873 from sabrina-shanman/stt_parenting 
Collision Pick Parenting
 2018-08-31 14:43:55 -07:00
SamGondelman
028092f803 fix blendshapes one last time 2018-08-31 13:33:45 -07:00
Andrew Meadows
727bd6b05a don't bid for simulation ownership of locked things 2018-08-31 13:31:26 -07:00
SamGondelman
d01b438cb3 CR 2018-08-31 11:25:17 -07:00
sabrina-shanman
b5862aca2a Use bracket initialization for CollisionRegion.loaded 2018-08-31 10:53:20 -07:00
sabrina-shanman
f71fc83309 Remove PickResult::needsToCompareResults 2018-08-31 10:48:48 -07:00
sabrina-shanman
e94d7de99a Add JS API hook for getting overlay IDs from a pointer via 
Pointer.getPointerProperties
 2018-08-31 09:18:07 -07:00
Sam Gateau
e0f4c8239e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:16:53 -07:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback 
Filter timings used in feedback logic for workload region sizes
 2018-08-30 19:11:49 -07:00
Sam Gateau
dc852bf906 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:00:56 -07:00
sam gateau
194903692e clening up the code in LODmanager and the associated js/qml 2018-08-30 18:09:11 -07:00
Sam Gondelman
067d7b280d
Merge pull request #13900 from SamGondelman/blendshapeCrash 
Fix blendshape crash
 2018-08-30 17:10:24 -07:00
SamGondelman
5f08ed5027 misc perf improvements 2018-08-30 16:55:15 -07:00
NissimHadar
d99cd2a42c Merge branch 'master' of https://github.com/highfidelity/hifi into addMap_d 2018-08-30 15:07:45 -07:00
NissimHadar
0f6fdef928 Fixed compilation error (within #ifdef) 2018-08-30 15:06:05 -07:00
NissimHadar
eeb63bd16a Merge branch 'addMap_d' of https://github.com/NissimHadar/hifi into addMap_d 2018-08-30 15:04:39 -07:00