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

29873 commits

Author SHA1 Message Date
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck 
fix Agent teardown of recording and ScriptEngine(s)
 2018-09-10 10:51:52 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling 2018-09-10 10:15:49 -07:00
Sam Gondelman
ae8eea32d6
Merge pull request #13960 from SamGondelman/profileUnpacking 
Add detailed profile range for avatar unpacking
 2018-09-10 10:04:08 -07:00
SamGondelman
a4605289a2 animation on switch url 2018-09-10 10:03:05 -07:00
David Back
3601ade8ba destroy thread from thread finished not scriptEngine destroyed 2018-09-07 18:36:36 -07:00
David Rowe
7dba2e6a2e Merge branch 'master' into M17428-f 2018-09-08 12:45:11 +12:00
Sam Gateau
5140999445 Forcing all the meshes with 3 buffers aka the blendshape layout 2018-09-07 15:57:04 -07:00
John Conklin II
bafdd06c91
Merge pull request #13934 from SimonWalton-HiFi/assigned-port-check 
Check that a requested listening port is able to be used
 2018-09-07 15:48:12 -07:00
sam gateau
e8cfac2ab1 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-09-07 15:35:27 -07:00
sam gateau
9350d6f36e removing performance counters 2018-09-07 15:35:10 -07:00
SamGondelman
b3bdddb3f4 set vec with one number 2018-09-07 15:15:02 -07:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats 
Move animation stats into its own Menu
 2018-09-07 14:51:46 -07:00
Sam Gondelman
19fe40abe7
Merge pull request #13958 from SamGondelman/bloom 
Fix bloom on edges
 2018-09-07 14:50:31 -07:00
Sam Gateau
81a542982b Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-07 12:02:20 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale 
Scale Collision Pick to match parent
 2018-09-07 11:54:02 -07:00
SamGondelman
32e2a244a1 detailed profile range for avatar unpacking 2018-09-07 11:44:35 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot 
Fix for lurching walk(case 16945), when walking in hmd.
 2018-09-07 11:43:03 -07:00
Simon Walton
1a67176819 Fix a dangling merge conflict 2018-09-07 11:29:30 -07:00
sam gateau
fa72910ac1 fixing fuckeries 2018-09-07 11:14:12 -07:00
SamGondelman
f9ec53a2e6 fix bloom on edges 2018-09-07 10:25:26 -07:00
sam gateau
d979d02139 why did i do that? 2018-09-07 10:03:55 -07:00
Simon Walton
3dc993c841 Fix small error in translation delta 2018-09-07 09:46:21 -07:00
Anthony Thibault
5a059e9318 Fix for build failure on linux and android. 2018-09-07 09:44:19 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling 2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
sabrina-shanman
52bc09cd2a Add override qualifier to BaseNestableTransformNode::getTransform 2018-09-06 17:44:06 -07:00
Wayne Chen
72818f3729 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged 2018-09-06 17:37:36 -07:00
Wayne Chen
ef3449f96d Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged 2018-09-06 17:36:47 -07:00
sabrina-shanman
f40f40e135 Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value 2018-09-06 17:35:12 -07:00
Ryan Huffman
22df1b3bc6 Add comment to Assets.sendFakeHandshake about excluding jsdoc 2018-09-06 17:19:41 -07:00
SamGondelman
ed7f993c0d avatar mixer and manager perf improvements and cleanup 2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca Update jsdocs to reflect new collision pick scaling behavior 2018-09-06 16:47:09 -07:00
Andrew Meadows
92210f28b5 cleanup and use correct avatar bounding box 2018-09-06 16:33:30 -07:00
sabrina-shanman
836f810c41 Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code 2018-09-06 16:33:29 -07:00
Anthony Thibault
acc7f1f168 Moved AnimStats into its own qml panels. 
Added state machine tracking as well.
 2018-09-06 16:18:58 -07:00
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
Andrew Meadows
021146e4f0 minor tweak to default avatar-update sort coefficients 2018-09-06 15:33:52 -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
Gabriel Calero
2d2a4804f7 Add android settings screen. Add AEC setting 2018-09-06 17:49:52 -03:00
amantley
90a51e6181 added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area 2018-09-06 13:12:48 -07:00
sabrina-shanman
714cfc5ef1 Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc 2018-09-06 12:14:50 -07:00
Simon Walton
e1aba52c23 Revert to statics for priority sort weights; update defaults from Andrew 2018-09-06 12:09:44 -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
sabrina-shanman
3f7a7fb11a Return early from AvatarTransformNode and similar when getTransform fails 2018-09-06 10:29:01 -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
sabrina-shanman
f7226757ad Just import TransformNode in AvatarTransformNode.h and similar 2018-09-06 10:03:05 -07:00
Dante Ruiz
200f6d540a Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-09-06 09:59:51 -07:00
Bradley Austin Davis
fade3a8de0 Fixing shader implicit type conversions 2018-09-06 09:08:36 -07:00
Brad Davis
650f112f16 Fix keyword in shader layout 2018-09-06 09:08:36 -07:00
Brad Davis
50f4932d9c PR feedback: structure alignement and size 2018-09-06 09:07:53 -07:00
Brad Davis
9a28e04e37 Remove all tabs from shaders 2018-09-06 08:59:07 -07:00
Brad Davis
2df2bbef46 Adding missing locations 2018-09-06 08:59:07 -07:00
Brad Davis
87b9594bd0 Fix warnings 2018-09-06 08:59:06 -07:00
Brad Davis
730cdb4257 Remove uniforms from unused shaders 2018-09-06 08:59:06 -07:00
Brad Davis
f704ddc11c Remove uniform from SDF text rendering 2018-09-06 08:59:06 -07:00
Brad Davis
a4cd56532e Removing uniforms from antialiasing 2018-09-06 08:59:06 -07:00
Brad Davis
07fba89f0f Remove uniforms from item status 2018-09-06 08:59:06 -07:00
Brad Davis
271651737b Cleanup gpu shader constants 2018-09-06 08:59:06 -07:00
Brad Davis
5a5e1ad498 Remove uniforms from polyvox 2018-09-06 08:59:06 -07:00
Brad Davis
cafd981744 Remove uniforms from bloom debug effect 2018-09-06 08:59:06 -07:00
Brad Davis
719ae25adb Remove uniforms from drawCellBounds 2018-09-06 08:59:05 -07:00
Brad Davis
c8eb4da6b6 Remove simple draw task uniforms 2018-09-06 08:59:05 -07:00
Brad Davis
ac84a498b3 Cleanup dead declarations 2018-09-06 08:59:05 -07:00
Anthony Thibault
3a3ffcc98c First pass at improving anim stats. 2018-09-05 18:14:06 -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
Simon Walton
adf0a9a414 Convert priority age from microseconds to seconds 2018-09-05 17:41:00 -07:00
Sam Gateau
03f51352aa
Merge pull request #13932 from SamGondelman/framebuffer 
Fix framebuffer debugging
 2018-09-05 17:38:21 -07:00
Simon Walton
d2650f7ede Modified priority function from Andrew 2018-09-05 17:22:07 -07:00
SamGondelman
cde2dc2eaa please work 2018-09-05 17:04:05 -07:00
sabrina-shanman
e8ce152687 Scale collision picks relative to parent by adding and using more 
specialized transform nodes.
 2018-09-05 16:51:28 -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
amantley
73e628bb8d merge with master fixes 2018-09-05 14:42:49 -07:00
sam gateau
1feaf286b4 keeping position separated from the other attributes 2018-09-05 14:35:50 -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
Wayne Chen
841080ea72 Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-05 11:54:21 -07:00
Wayne Chen
77bb6fa4d5 adding position to try again zone; updating whitespace 2018-09-05 11:53:49 -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
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
Wayne Chen
0be7a5ffaa
fixing typo in domain handler 2018-09-04 19:58:56 -07:00
Wayne Chen
98c4d05b4a fixing typo in domain handler 2018-09-04 19:54:30 -07:00
Wayne Chen
c47788efe4 merging with dante's PR 2018-09-04 18:00:06 -07:00
SamGondelman
589e88af4a Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-09-04 17:54:45 -07:00
Wayne Chen
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -07:00
sam gateau
adcabf52c5 Refactoring the FBXReader_MEsh.cpp for better interleaving 2018-09-04 17:33:18 -07:00
SamGondelman
9b75c7e07f trying to separate colors and vectors 2018-09-04 17:20:05 -07:00
SamGondelman
9e76c164ac fix aabox operator+= 2018-09-04 16:25:47 -07:00
Simon Walton
262dbaf5ed Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling 2018-09-04 15:27:41 -07:00
Simon Walton
695fabf4f5 Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling 2018-09-04 15:27:18 -07:00
Simon Walton
6ae2ca1576 Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling 
Merge of Samuel's change to use simple sort instead of priority queue
 2018-09-04 15:26:26 -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
Simon Walton
7af69b5450 Check that a requested listened port is used in NodeList 2018-09-04 13:53:25 -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
ec0b0ab464 fix acceleration spread 2018-09-04 13:03:42 -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
Simon Walton
058115b791 Add guard for sentJointDataOut 2018-09-04 10:38:18 -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
Simon Walton
c2ea05b026 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-09-04 09:31:05 -07:00
sam gateau
761e8a3f95 fixing warnings 2018-09-04 09:19:24 -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
Sam Gateau
e8d922a56c Interleaving the attributes and relying on just 3 input buffers 2018-09-03 02:48:07 -07:00
Ken Cooke
96aa0549be AVX2 implementation of crossfade_4x2() 2018-09-01 12:08:49 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
sam gateau
0fe13ea5ee Merge branch 'black' of github.com:samcake/hifi into black-bis 2018-08-31 17:58:04 -07:00
Sam Gateau
bd9136812d Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-31 17:53:49 -07:00
sam gateau
8c23ecce8f Merge branch 'black' of github.com:samcake/hifi into black-bis 2018-08-31 17:45:10 -07:00
Simon Walton
11a563cb38 Don't use temp vector for outgoing joint status - doesn't seem to be necessary 2018-08-31 17:40:57 -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
Simon Walton
cf5f81ab95 Don't memcpy quaternions as we don't use same component order on wire! 2018-08-31 17:04:23 -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
Simon Walton
5a0de0f103 Small fixes for joint logic 2018-08-31 16:45:39 -07:00
Simon Walton
2da5338574 Fix couple of gcc issues 2018-08-31 15:24:51 -07:00
Simon Walton
e1d51a6c42 Avatar serializing: use memcpy where possible, take copy of joint data to avoid holding lock, etc 2018-08-31 15:06:33 -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
Wayne Chen
e3f5f4c55a Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 19:41:06 -07:00
David Rowe
c41d74621e Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/raypick/PathPointer.cpp
 2018-08-31 14:26:24 +12: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
Wayne Chen
5f43f5b276 adding different method for handling redirect 2018-08-30 17:40:13 -07:00
Simon Walton
33db1394e6 Use system_clock in usecTimestampNow for cross-platform goodness 2018-08-30 17:12:42 -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
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix 
Avatar without Neck Joint bug 14620
 2018-08-30 14:52:44 -07:00
sam gateau
8179de35b0 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 14:46:40 -07:00
NissimHadar
4b7ca76ebd Create correct folder. 2018-08-30 14:15:57 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange 
Hand Azimuth Controls Shoulder Rotation
 2018-08-30 13:59:00 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
Simon Walton
b45b0f54e4 Move unfilteredHandlers processing back into main loop 2018-08-30 11:59:53 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870 
Fixup PR13870: Make the feature work in Master
 2018-08-30 11:08:23 -07:00
Simon Walton
c2ac2b9ab0 Various tweaks; fix clang warning 2018-08-30 10:59:55 -07:00
Andrew Meadows
6c4862910e smoother edges for workload region feedback response 2018-08-30 10:13:35 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse 
findRayIntersection/findParabolaIntersection performance improvements
 2018-08-30 09:49:16 -07:00
Dante Ruiz
8c77820e30 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-30 09:45:41 -07:00
sabrina-shanman
a4bb8cb622 Add comment on future of PickTransformNodes 2018-08-30 09:08:02 -07:00
Ken Cooke
6583864597 AVX2 implementation of interleave_4x4() 2018-08-29 19:19:20 -07:00
SamGondelman
248c2621a4 fix blendshapes crash 2018-08-29 17:57:54 -07:00
Simon Walton
a186be014d Use std::chrono for usecTimestampNow() 2018-08-29 17:35:28 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
sabrina-shanman
0926968e2b Do not have depth as a parameter in getTransform(..) when called in NestableTransformNode 2018-08-29 16:30:06 -07:00
sabrina-shanman
686f9fb18a Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean 2018-08-29 16:29:59 -07:00
Wayne Chen
3810984056 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-29 16:18:16 -07:00
Sam Gateau
349f782697 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 16:07:50 -07:00
John Conklin II
7298cb4654
Merge pull request #13888 from dback2/editControllerMapping 
Edit mode controller mapping using new platform state variables
 2018-08-29 16:06:47 -07:00
sabrina-shanman
78a438d89a Correct CollisionRegion jsdoc for 'joint' parameter 2018-08-29 14:55:14 -07:00
Ken Cooke
6cc31e7397 AVX2 implementation of biquad2_4x4() 2018-08-29 13:30:13 -07:00
John Conklin II
47ce8be526
Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 
MS16847: Tablet button doesn't load in HMD mode
 2018-08-29 13:20:04 -07:00
John Conklin II
26f76081e6
Merge pull request #13843 from luiscuenca/fixGLTFLoadTexFromDir 
Read glTF resources from other than the main directory
 2018-08-29 12:31:41 -07:00
David Back
96d2ba660c Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-29 12:05:51 -07:00
David Back
dcf2074d7e remove [ camera key, allow F to enter camera without selection 2018-08-29 11:56:37 -07:00
Andrew Meadows
a134357489 fix compile typo 2018-08-29 11:37:19 -07:00
Andrew Meadows
f9d14e1351 filter time-cost drivers for region regulation 2018-08-29 11:17:59 -07:00
Simon Walton
9711076dae Use a queued signal for pending datagrams 2018-08-29 10:49:29 -07:00
Ken Cooke
3e17556cc1 Prefer static_assert() over assert() 2018-08-29 10:47:02 -07:00
Ken Cooke
6f151ad283 Consistent parameter order for SIMD functions 2018-08-29 10:03:40 -07:00
Ken Cooke
bf348f43aa Prepare for runtime CPU dispatch of all SIMD functions 2018-08-29 09:55:54 -07:00
Sam Gateau
3c0e284e98 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 08:48:04 -07:00
Wayne Chen
6689c15564 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-28 19:22:34 -07:00
Wayne Chen
223f86108f adding debugging stuff 2018-08-28 17:34:48 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
Simon Walton
4b7f6a346f Use AvatarData::getClientGlobalPosition() for position in priority queue 
It looks like it's the same as world position with the avatar mixer.
Also use one time stamp for current time in priority queue; use
std::chrono for some other timestamps in hope that it's faster.
Fix priority-code logic bug.
 2018-08-28 16:21:47 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
Anthony Thibault
f281afa71f
Merge pull request #13874 from amantley/phaseWalkFix 
Phase walk fix bug 17770
 2018-08-28 11:29:29 -07:00
Thijs Wenker
c4d43b3fbc CR fixes 2018-08-28 19:43:59 +02:00
Sam Gateau
7b399d9a04 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-28 09:20:13 -07:00
Sam Gateau
d9d23e7fcf
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars 
Create N replicas of each other-avatar on the client side
 2018-08-28 09:02:13 -07:00
Sam Gateau
e2f3c99cf1 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-28 08:58:55 -07:00
Sam Gateau
63eb57c741 Exploring PID again 2018-08-28 08:58:25 -07:00
sabrina-shanman
6f6e70a470 Re-order variable initialization in CollisionRegion copy contructor 2018-08-28 08:45:47 -07:00
David Back
990638fd95 Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-27 18:04:23 -07:00
luiscuenca
c19bd8968a Fix mixer crash 2018-08-27 16:48:47 -07:00
David Back
f81fe6b29f add more inputs to controller mapping 2018-08-27 16:35:36 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -07:00
Stephen Birarda
a76b50ce33 fix teardown of recording and ScriptEngine(s) 2018-08-27 15:07:19 -07:00
Thijs Wenker
c05fe7f0b7 Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive 2018-08-28 00:00:44 +02:00
David Back
75d7bf0424 Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-27 14:53:28 -07:00
David Back
b6edb2c9d6 platform states, edit controller mapping, separate mac/win delete 2018-08-27 14:53:13 -07:00
amantley
055f03878e made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now 2018-08-27 14:44:27 -07:00
sabrina-shanman
397b03d5d5 Add threshold parameter to collision pick with minimum of 0 2018-08-27 14:12:24 -07:00
Brad Davis
945982b1bd Working on pauses in tomb domain 2018-08-27 13:28:49 -07:00
Stephen Birarda
7ddd70a84a
Merge pull request #13871 from birarda/bug/double-domain-connect 
force NodeList reset if DS changes session or local ID
 2018-08-27 11:59:24 -07:00
danteruiz
e2cd695dfb PR code clean up 2018-08-27 11:01:29 -07:00
Sam Gateau
a6f7135ad8 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-27 10:54:23 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3 2018-08-27 10:43:52 -07:00
sabrina-shanman
51683b0b53 Remove storage of parenting information from CollisionRegion 2018-08-27 10:16:09 -07:00
John Conklin II
467fe56103
Merge pull request #13845 from SamGondelman/perf 
Move blendshape packing to worker thread
 2018-08-27 09:40:03 -07:00
NissimHadar
62814deb32 Added read of map_d from MTL files 2018-08-27 08:34:01 -07:00
luiscuenca
8ede6f1cd0 Fix removing my avatar and code standards 2018-08-27 06:55:52 -07:00
Sam Gateau
d97d655148 USing a simpler halfTan test for culling 2018-08-26 23:17:29 -07:00
danteruiz
e4293d9ad5 fixing some entity visual problems 2018-08-26 21:50:01 -07:00
Simon Walton
861d1e26a9 Remove unused variable 2018-08-24 18:02:28 -07:00
Dante Ruiz
92acaade2b trying to fix problems 2018-08-24 17:13:57 -07:00
Simon Walton
bf839ca291 Handle _unfilteredHandlers first upon processing datagrams 2018-08-24 16:53:38 -07:00
amantley
8406fb2359 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-24 16:48:26 -07:00
Sam Gateau
294fe51fde Trying to simplify the LOD culling test 2018-08-24 16:48:23 -07:00
amantley
dd8a00983c Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-24 16:29:20 -07:00
Simon Walton
4392b3c2a8 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-08-24 16:07:00 -07:00
Dante Ruiz
af19849a75 fixing merge conflict 2018-08-24 15:48:42 -07:00
sabrina-shanman
cce62f4d92 Do not assume picks with doesIntersect()==false have no results to compare. Fixes CollisionPickResult 'loaded' value always evaluating to false when not colliding 2018-08-24 15:47:52 -07:00
sabrina-shanman
6e160ad22f Add TransformNode-based parenting and implement for CollisionPicks 2018-08-24 15:47:52 -07:00
sabrina-shanman
68b86963d4 Add CollisionRegion copy constructor 2018-08-24 15:47:52 -07:00
sabrina-shanman
b0f8d3e427 Add PickTransformNode 2018-08-24 15:47:52 -07:00
sabrina-shanman
3167d3c0c7 Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head 2018-08-24 15:47:52 -07:00
Dante Ruiz
3796675123 script update and visuallyReady entities 2018-08-24 15:46:39 -07:00
SamGondelman
ff6020e0ef fix compile errors, maybe 2018-08-24 15:41:25 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
Stephen Birarda
cb4ce4fedb make sure settings are re-requested on new connection 2018-08-24 13:05:04 -07:00
luiscuenca
ddbadf5a69 change to Test API 2018-08-24 11:59:46 -07:00
SamGondelman
3d048c77ba Merge remote-tracking branch 'upstream/master' into recurse 2018-08-24 11:39:05 -07:00
SamGondelman
1c0c17cecb faster triangle intersection 2018-08-24 11:20:10 -07:00
luiscuenca
5654acf5bf Fix warnings 2018-08-24 09:24:58 -07:00
luiscuenca
1fd0d7da94 Create API call 2018-08-23 18:03:27 -07:00
SamGondelman
b5b7167644 add to stats 2018-08-23 17:56:24 -07:00
amantley
671bf32d58 removed whitespace 2018-08-23 17:36:35 -07:00
amantley
884be2f99d removed comment and whitespace 2018-08-23 17:30:03 -07:00
amantley
0cc302f68c set phase to 0.0 2018-08-23 17:28:38 -07:00
Stephen Birarda
1263db5688 force NL reset if the domain changes session ID or local ID 2018-08-23 16:48:46 -07:00
amantley
220dbf586f set the phase to 0.0 when it is negative 2018-08-23 16:46:58 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
luiscuenca
3d959ca7ee Refactoring and cleaning 2018-08-23 15:52:42 -07:00
Simon Walton
9dac399c20 Merge branch 'master' into avatar-mixer-scaling 2018-08-23 13:58:38 -07:00
Dante Ruiz
11ab6dd0b5 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-23 13:20:09 -07:00
Andrew Meadows
777b90bdc0 add 'physics body count' to debug stats 2018-08-23 12:59:28 -07:00
Andrew Meadows
87223946ad add/remove avatars according to workload region 2018-08-23 12:59:28 -07:00
Andrew Meadows
99aafb1f95 move code from Avatar to OtherAvatar 2018-08-23 12:59:28 -07:00
Andrew Meadows
1c87d7b109 reorder initialization to remove compile warning 2018-08-23 12:59:28 -07:00
Andrew Meadows
3c01433e12 stub for avatars changing workload regions 2018-08-23 12:59:28 -07:00
Andrew Meadows
55b1a6762c explicit delete default ctor, make _nestableType private 2018-08-23 12:59:28 -07:00
SamGondelman
283c0c0311 s i m p l i f y 2018-08-23 11:47:56 -07:00
John Conklin II
1320a34a18
Merge pull request #13841 from luiscuenca/noAttachmentsToJSON 
Don't include old attachment data on new avatar recordings
 2018-08-23 10:51:33 -07:00
John Conklin II
5dd64645eb
Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes 
Fix safe-landing protocol for sparse domains
 2018-08-23 10:17:08 -07:00
luiscuenca
e3ad5adcae first approach vertical alignment 2018-08-23 06:49:35 -07:00
Sam Gateau
1123ba2b0a exploring optimization in Backend for bffer bindings 2018-08-22 22:48:42 -07:00
SamGondelman
c474f38860 force coarse picking, sort avatars 2018-08-22 18:07:16 -07:00
Simon Walton
c0966d738e Use EntityVersion for the EntityQueryInitialResultsComplete packet 2018-08-22 16:40:49 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
Simon Walton
c4b916af62 Just bump packet version for EntityQueryInitialResultsComplete 2018-08-22 16:22:30 -07:00
David Rowe
883479d654 Merge branch 'master' into M17428-c 2018-08-23 10:43:44 +12:00
Dante Ruiz
f5441b2721 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-22 15:28:42 -07:00
Simon Walton
dd098f05c2 Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number 2018-08-22 14:54:07 -07:00
luiscuenca
b3d127c953 Fix flickering 2018-08-22 14:31:34 -07:00
Stephen Birarda
01e8fd66a3 fix script engine(s) cleanup from ESS 2018-08-22 13:52:37 -07:00
amantley
2dd812935f Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-22 12:57:16 -07:00
amantley
1e3ca6f902 added quicker follow code and added head to rotate calculation 2018-08-22 12:57:06 -07:00
Thijs Wenker
e08d8e9046 only show InteractiveWindow on top of interface window 2018-08-22 21:03:29 +02:00
Simon Walton
d8d940b06a Cap datagrams-at-once processed; debugging output 2018-08-22 10:28:32 -07:00
John Conklin II
04d72ea39d
Merge pull request #13850 from samcake/punk 
Adjust Workload Region to be bigger
 2018-08-22 10:21:14 -07:00
luiscuenca
5a5aa2f5b9 Remove proxy line 2018-08-22 09:13:27 -07:00
John Conklin II
1036f3c8b6
Merge pull request #13803 from birarda/feat/avatar-traits 
introduce avatar traits system, migrate skeleton URL and avatar entities
 2018-08-22 09:13:21 -07:00
luiscuenca
5f4903f884 Record entities 2018-08-22 08:53:51 -07:00
Sam Gateau
0f6f465e7f Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-08-21 19:23:33 -07:00
Brad Davis
e9683011f8 Fix parabola rendering on AMD GPUs 2018-08-21 16:58:38 -07:00
Dante Ruiz
71e8ccd190 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 16:20:16 -07:00
Simon Walton
4084973cca Changes for linux compilation 2018-08-21 16:04:08 -07:00
Wayne Chen
54aeac5d1f adding fix 2018-08-21 15:55:00 -07:00
Bradley Austin Davis
d3fd2132ce
Merge pull request #13851 from samcake/black 
Fix the local lights not working on AMD
 2018-08-21 15:36:12 -07:00
sam gateau
30c0c44822 Completely remove the texcoord frame transform as we don;t use it at all 2018-08-21 14:52:42 -07:00
sam gateau
6b994ba39a Completely remove the texcoord frame transform as we don;t use it at all 2018-08-21 14:51:54 -07:00
Simon Walton
e867ae86f4 Split readPendingDatagrams() into two slots 2018-08-21 14:44:55 -07:00
Stephen Birarda
7d8db482a3 put back ExtendedIODevice ctor for ubuntu warning 2018-08-21 13:21:21 -07:00
amantley
1fabc77244 latest update to stop lurching, and allow leaning, and stop perma leans 2018-08-21 12:34:05 -07:00
sam gateau
8c5aab7fa0 tabs! 2018-08-21 12:30:31 -07:00
sam gateau
b7d8b92fb5 Add comment in shader and fix bad cull mode 2018-08-21 12:25:27 -07:00
sam gateau
5ae604f341 REmove the texture Transform for deferred_light slv which then makes it work correctly on AMD 2018-08-21 12:14:32 -07:00
Stephen Birarda
8226ffb916 fix ref to instances vector for instance erase 2018-08-21 11:57:21 -07:00
Stephen Birarda
8c58ae4e60 fix insert of second trait instance 2018-08-21 11:56:28 -07:00
Stephen Birarda
25ed166f07 fix logic for initial send of deleted trait instance 2018-08-21 11:49:48 -07:00
John Conklin II
ad835597e6
Merge pull request #13779 from amantley/perspectiveBug 
Perspective bug
 2018-08-21 11:31:14 -07:00
Stephen Birarda
3e2d4dc696 fixes and improvments addressing CR comments 2018-08-21 10:53:52 -07:00
Stephen Birarda
4875738a05 always add to detached, flag update on full replace 2018-08-21 10:32:05 -07:00
Stephen Birarda
99f532a20e always check added avatar entities once in updateAvatarEntities 2018-08-21 10:32:05 -07:00
Stephen Birarda
eda84d2816 flag deleted avatar entities when replacing full map 2018-08-21 10:32:05 -07:00
Stephen Birarda
cd05d9335a remove debug of entity json document 2018-08-21 10:32:05 -07:00
Stephen Birarda
f0ba61ff05 add missing local ID, reset client processed trait versions 2018-08-21 10:32:05 -07:00
Stephen Birarda
6c204b682d include trait bytes written in over budget calculation 2018-08-21 10:32:05 -07:00
Stephen Birarda
e33f349d53 fix flagging for avatar entity update/delete 2018-08-21 10:32:05 -07:00
Stephen Birarda
0f03764c97 create missing avatar when processing traits 2018-08-21 10:31:15 -07:00
Stephen Birarda
1158ec8d50 improve change avoidance after avatar url override 2018-08-21 10:31:15 -07:00
Stephen Birarda
de6fe43dda ensure joint mapping is processed for current FST url 2018-08-21 10:31:15 -07:00
Stephen Birarda
a56e9b0860 allow agent to create and get avatar entities from script 2018-08-21 10:31:15 -07:00
Stephen Birarda
e6b419d283 add instanced traits and migrate avatar entities 2018-08-21 10:31:15 -07:00
Stephen Birarda
ea7c0e923a make client traits handler a unique ptr in AvatarData 2018-08-21 10:31:15 -07:00
Stephen Birarda
a0df68f32f move skeleton model URL emit to AvatarData 2018-08-21 10:31:14 -07:00
Stephen Birarda
be7eb57205 handle whitelist avatar URL override via traits 2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a remove skeleton from identity, handle in clients 2018-08-21 10:31:14 -07:00
Stephen Birarda
26a1f03314 send traits in bulk to avatar mixer client 2018-08-21 10:31:14 -07:00
Stephen Birarda
f23a036f4a add node local ID retreivable from NodeData 2018-08-21 10:31:14 -07:00
Stephen Birarda
ac835650b7 add skeleton trait sending to Agent, queuing in AvatarMixer 2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a initial trait packet sending on skeleton URL change 2018-08-21 10:31:14 -07:00
Sam Gateau
1914f1f103 Extending the default size of the regions to 16km 2018-08-21 10:10:39 -07:00
Dante Ruiz
db3d3d3d93 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 09:56:59 -07:00
David Rowe
4b12e18c27 Merge branch 'master' into M17428-c 2018-08-21 16:52:30 +12:00
Wayne Chen
acc7d493ec
Merge pull request #13812 from SimonWalton-HiFi/safe-landing 
Safe landing client-side improvements
 2018-08-20 20:36:17 -07:00
amantley
1e2ca579c7 widened base of support and put head angular and hand angular back to normal 2018-08-20 18:06:34 -07:00
John Conklin II
e6c81cdfba
Merge pull request #13833 from sabrina-shanman/stt_performance 
Performance improvements for Collision Pick API
 2018-08-20 17:34:46 -07:00
amantley
2dcdd60750 added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes 2018-08-20 17:32:52 -07:00
SamGondelman
9ab1fc0500 Merge remote-tracking branch 'upstream/master' into perf 2018-08-20 17:04:42 -07:00
Sam Gateau
d237195944
Merge pull request #13840 from AndrewMeadows/revert-backfacing-triangle-hack 
fix MyAvatar collision bug at transitions between meshes
 2018-08-20 17:01:40 -07:00
David Rowe
0a82f8adc9 Merge branch 'master' into M17217-b 2018-08-21 11:25:58 +12:00
Sam Gateau
e60756cfe6 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-20 15:54:23 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs 
Migrating to scribe program descriptors
 2018-08-20 14:48:54 -07:00
luiscuenca
8bd9bf39b6 Fix json load 2018-08-20 14:31:03 -07:00
luiscuenca
dc0fbcca59 Include avatar entities on recordings 2018-08-20 13:10:36 -07:00
luiscuenca
c564119edc Keep attachments when playing back recordings 2018-08-20 11:58:19 -07:00
Andrew Meadows
3068865a6c fix MyAvatar collision bug at transitions b/w meshes 2018-08-20 11:42:28 -07:00
SamGondelman
05ff99a1d2 working on blendshapes 2018-08-20 11:40:25 -07:00
luiscuenca
d9b136cf5d Read resources from other than the main directory 2018-08-20 11:06:51 -07:00
Sam Gondelman
f0986a7f5a Merge branch 'master' into scriptvec3 2018-08-20 10:56:45 -07:00
sabrina-shanman
74f482b361 Revert "Convert entityIntersections/avatarIntersections lists in" 
This reverts commit aa4a6b2eae.
 2018-08-20 10:15:28 -07:00
amantley
471bb28545 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-20 09:50:45 -07:00
luiscuenca
50cc68c63e Recording app doesn't record old attachments 2018-08-19 12:43:06 -07:00
Sam Gateau
60765902fb Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-08-18 15:04:43 -07:00
sabrina-shanman
2933038d04 Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum 2018-08-17 14:22:42 -07:00
David Rowe
846f38584f Merge branch 'master' into M17428 2018-08-17 15:01:35 +12:00
David Rowe
7e46a99400 Merge branch 'master' into M17217-b 2018-08-17 10:35:52 +12:00
sabrina-shanman
b65572725d Merge branch 'master' into stt_performance 2018-08-16 14:44:58 -07:00
John Conklin II
bbf6162361
Merge pull request #13632 from Atlante45/fix/udt-rtt 
Fix potential reliable connection lockup.
 2018-08-16 13:15:23 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable 
Use Create Entities as Grabbable option when adding asset to world
 2018-08-16 09:22:23 -07:00
sabrina-shanman
aa4a6b2eae Convert entityIntersections/avatarIntersections lists in 
CollisionPickResult to shared pointers
 2018-08-16 08:59:29 -07:00
David Rowe
a86fdeafc0 Merge branch 'master' into M17248-a 2018-08-16 10:38:30 +12:00
Sam Gondelman
5f4f232602
Merge pull request #13604 from huffman/feat/oven-etc2 
Add ETC2 support to Oven
 2018-08-15 13:55:44 -07:00
sabrina-shanman
61d12923ea Do not copy list of collision pick contact points when filtering them 2018-08-15 11:12:50 -07:00
sabrina-shanman
83ededfd37 Pass collision filter flags into AllContactsCallback for more efficient collision filtering 2018-08-15 11:12:50 -07:00
John Conklin II
032e67fd8e
Merge pull request #13748 from ElderOrb/FB16831 
FB16831 qml-related warnings in log
 2018-08-14 16:40:07 -07:00
Seth Alves
3623590e90
Merge pull request #13784 from sethalves/far-point-joints 
Far point joints
 2018-08-14 15:40:07 -07:00
John Conklin II
007652632c
Merge pull request #13724 from gcalero/android_audio_fixes3 
Android audio tests
 2018-08-14 13:57:59 -07:00
Alexander Ivash
4478733c27 fix coding conventions 2018-08-14 21:18:54 +03:00
Seth Alves
dce7b6eae6
Merge pull request #13714 from sabrina-shanman/safe-teleport-target 
Create CollisionPick API
 2018-08-14 09:56:51 -07:00
Seth Alves
41e9c3a2ad
Merge pull request #13820 from AndrewMeadows/dont-try-physics-for-invalid-models 
don't attempt physics with invalid modelURL
 2018-08-14 09:47:37 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
sabrina-shanman
2576d502ab Remove unused getter for btCollisionWorld in PhysicsEngine 2018-08-13 17:27:57 -07:00
Ryan Huffman
0fcf1517a5 Fix TextureCache not correctly choosing gl41 when gl45 is disabled 2018-08-13 16:35:21 -07:00
sabrina-shanman
e5cb078133 Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target 2018-08-13 14:51:37 -07:00
Sabrina Shanman
99374c099a
Merge pull request #13816 from SamGondelman/fading 
Fix parabola shader
 2018-08-13 14:45:31 -07:00
Gabriel Calero
4b808fe38e Revert "Test if this fixes the choppy audio" 
This reverts commit 2e323efe1b.
 2018-08-13 18:29:05 -03:00
Seth Alves
0a5c96ecc1
Merge pull request #13792 from luiscuenca/attachmentsAPImgr 
Attachments API returns avatar entities
 2018-08-13 14:21:13 -07:00
Andrew Meadows
fd9876cb63 don't attempt physics with invalid modelURL 2018-08-13 13:30:30 -07:00
SamGondelman
86ba8c3d81 fix parabola shader 2018-08-13 10:08:19 -07:00
unknown
c622a587e3 Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-11 07:59:56 -07:00
amantley
c2612af7a8 changed the spine stretch limit, will check the scale implications next 2018-08-10 17:10:33 -07:00
Sam Gateau
12f1b99283 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-10 16:41:08 -07:00
John Conklin II
b56d9c3ea5
Merge pull request #13807 from SamGondelman/fading 
Fixing fading
 2018-08-10 16:35:10 -07:00
luiscuenca
dd93055d89 Convert and load attachments when rig is ready 2018-08-10 16:15:30 -07:00
David Rowe
2a177e04e1 Misc. tweaks 2018-08-11 10:11:56 +12:00
Sam Gateau
d5cfe95a0a merging with master 2018-08-10 15:03:33 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges 
New Default Strafe Animations Plus Animation Tuning Support
 2018-08-10 15:03:30 -07:00
Gabriel Calero
2e323efe1b Test if this fixes the choppy audio 2018-08-10 18:57:41 -03:00
Simon Walton
3c665b7de8 Don't delete sequence numbers outside of range as range may change 2018-08-10 14:40:08 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow 
Fixing PR13731 shader error on Mac
 2018-08-10 14:10:47 -07:00
Ryan Huffman
9fadf58e7b Add threads lib to image lib 2018-08-10 13:56:48 -07:00
Sam Gateau
ad5b2ddc69
Merge pull request #13711 from AndrewMeadows/myAvatar-vs-backfacing-triangles 
MyAvatar's RigidBody ignores collisions with backfacing triangles
 2018-08-10 12:55:28 -07:00
unknown
5d1cc3696a Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 12:10:57 -07:00
David Rowe
38d8a9a2da Send messages locally if not connected to a domain 2018-08-11 07:00:50 +12:00
SamGondelman
15070f6374 fixing fading 2018-08-10 10:52:58 -07:00
sabrina-shanman
e5e1a72598 Use 'orientation' for Collision Pick API, not 'rotation' 2018-08-10 10:52:21 -07:00
Wayne Chen
6b73a0bba5
Merge pull request #13801 from wayne-chen/fixMyAvatarScale-case-17434 
MS17434: modifying MyAvatar.scale get property
 2018-08-10 10:45:53 -07:00
amantley
74186b0162 changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27 2018-08-10 09:56:24 -07:00
unknown
5641c59f5f Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 09:49:37 -07:00
Sam Gateau
c404f94220
Merge pull request #13795 from SamGondelman/paint 
Remove unused uniform buffer from polylines
 2018-08-10 09:36:53 -07:00
sabrina-shanman
f902552309 Finalize on using 'rotation' in Collision Pick API and add missing jsdoc for CollisionRegion 2018-08-10 08:55:29 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Sam
cd7ca96c3a Remove the separate depth buffer for in front overlay, only useful for debug and it breaks in mac 2018-08-10 02:42:45 +02:00
Wayne Chen
769e7eab03 removing domainLimitedScale property and changing read property of scale 2018-08-09 17:38:58 -07:00
amantley
c8a31bc59f created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3 2018-08-09 17:38:57 -07:00
Wayne Chen
d533e3b341 adding domainLimitedScale property 2018-08-09 17:29:13 -07:00
John Conklin II
2d9cbe91bb
Merge pull request #13780 from hyperlogic/bug-fix/perftimer-memory-corruption 
Fix memory corruption in PerformanceTimer when Stats are active
 2018-08-09 17:16:03 -07:00
sabrina-shanman
ad36e23c34 Return early when colliding MyAvatar is found in AllContactsCallback 2018-08-09 17:00:54 -07:00
David Rowe
a08bcd325d Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-08-10 11:25:39 +12:00
Sam
5fd3862c94 FIx shader error on mac in shadow.slh 2018-08-10 00:45:25 +02:00
Gabriel Calero
6e793a06a9 Merge remote-tracking branch 'upstream/master' into android_audio_fixes3 2018-08-09 18:47:17 -03:00
amantley
93baad7387 removed unnecessary computation of head height from eye position code 2018-08-09 14:35:44 -07:00
John Conklin II
6481aea2f4
Merge pull request #13715 from SamGondelman/parabolic 
Enable parabolic teleport
 2018-08-09 13:12:17 -07:00
Dante Ruiz
9a8ebdd021
Merge pull request #13739 from dback2/cloneChildrenFix 
Fix cloning a parented entity
 2018-08-09 13:05:28 -07:00
John Conklin II
59977fe1d3
Merge pull request #13764 from r3tk0n/17249-safe-landing 
Relocate Avatar Spawn Point from the Hips to the Feet
 2018-08-09 12:45:30 -07:00
SamGondelman
a0dfd76f06 variable texture support 2018-08-09 12:32:36 -07:00
Ryan Huffman
44a9b1df0e Fix choice of target backend in TextureCache on OSX 2018-08-09 12:30:42 -07:00
SamGondelman
bd4a3a5b32 remove unused uniform buffer from polylines 2018-08-09 12:20:36 -07:00
amantley
f26d6b8c3d cleaned up code and changed the forward offset for the default eyes when there is no neck bone 2018-08-09 12:15:35 -07:00
amantley
a3f2fd1f23 removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization 2018-08-09 11:33:27 -07:00
John Conklin II
17189b403a
Merge pull request #13786 from hyperlogic/bug-fix/remove-tip-constraint-enforcement 
In CCD IK chains, remove the LeftHand and RightHand constraint
 2018-08-09 10:49:55 -07:00
luiscuenca
8c121a531d Turn attachments into avatar entities 2018-08-09 10:35:15 -07:00
Dante Ruiz
faa5411757 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-09 08:42:14 -07:00
SamGondelman
bba806f78c merge with master, fix uniform slots, use varyings for sigma 2018-08-08 22:27:22 -07:00
amantley
c774dd7f5b debugging to solve the no-neck crazy scale problem 2018-08-08 17:52:22 -07:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -07:00
SamGondelman
a0c3c09b05 Merge remote-tracking branch 'upstream/master' into bloom 2018-08-08 14:44:02 -07:00
Sam Gateau
16bf46ea34 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-08 14:22:52 -07:00
Ryan Huffman
2ba2c4b68a Fix TextureCache not compressing textures on Android 2018-08-08 14:06:34 -07:00
Anthony J. Thibault
3fa3cd8cfd In CCD IK chains, remove the LeftHand and RightHand constraint completely. 
When used in combination with the elbow pole vector, this was causing the hand to never properly reach its rotation target.
It was also having side effects causing the elbow to never straighten properly to reach its position target.

There is possibly a bug in how this tip constraint is enforced and I've verified that there are no ill effects in removing it.
 2018-08-08 13:56:47 -07:00
Sam Gondelman
16b483b338
Merge pull request #13766 from SamGondelman/shaders 
Miscellaneous shader fixes
 2018-08-08 11:34:36 -07:00
sabrina-shanman
5b6916177c Add support for rotation as CollisionRegion parameter and make it the default 2018-08-08 10:47:13 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool 
Stack tester changes
 2018-08-08 13:40:05 -04:00
sabrina-shanman
6249d1c3aa Initialize btCollisionWorld::ContactResultCallback BEFORE AllContactsCallback variables 2018-08-08 10:32:26 -07:00
Ryan Huffman
6be0c43fca Update generateIrradiance to take a BackendTarget 2018-08-08 10:00:02 -07:00
Ryan Huffman
26e69de81e Add braces around std::array intialization to suppress warning 2018-08-08 10:00:02 -07:00
Ryan Huffman
140b9be1c4 Update BackendTarget to include version 2018-08-08 10:00:02 -07:00
Ryan Huffman
f1e63f489b Update image::processImage to use compress flag for GLES 2018-08-08 10:00:01 -07:00
Ryan Huffman
9ea08f1850 Add ETC2 support to Oven 2018-08-08 10:00:01 -07:00
Anthony J. Thibault
c4c3581285 Fix memory corruption in PerformanceTimer when Stats are active 
PerformanceTimer was neither thread safe nor re-entrant.  Because it was being used increasingly on render and worker threads it has increased the likelihood of heap corruption.
I was able to identify this by enabling full page heap verification using the gflags app.

https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
 2018-08-08 09:53:26 -07:00
Sam Gateau
7efd5964bd Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-08 09:28:14 -07:00
Sam Gateau
9295007d99 fixing the ui script and trying to get shadow 2018-08-08 09:22:31 -07:00
amantley
297e5b2e2f removed print statements 2018-08-08 09:18:28 -07:00
Andrew Meadows
49a1d0a18a MyAvatar RigidBody ignores backfacing triangles 2018-08-08 09:11:09 -07:00
sabrina-shanman
4ffe164569 Address Mac/Linux build warnings 2018-08-08 08:56:35 -07:00
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02:00
SamGondelman
fb75b42059 working on enabling bloom 2018-08-07 22:26:30 -07:00
SamGondelman
2959a406d7 working on enabling bloom 2018-08-07 21:52:05 -07:00
Clément Brisset
e9f23a43f6
Merge pull request #13726 from Atlante45/fix/angle-between 
Fix angleBetween potential NaN return value
 2018-08-07 18:31:57 -07:00
amantley
274bf33318 fix for the avatar scale reset when we re-enter hmd mode 2018-08-07 18:29:51 -07:00
Sam Gondelman
9ec0b05fe4
Merge pull request #13776 from samcake/black 
Fix bug with texel opaque and transparent cut off shader function
 2018-08-07 15:52:18 -07:00