Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 08:23:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71917 commits 76 branches 59 tags 1.2 GiB
Commit graph

26912 commits

Author SHA1 Message Date
Wayne Chen
e1541fd7e0 Merge branch 'master' of https://github.com/wayne-chen/hifi into loginOnLaunch 2018-09-07 08:43:42 -07:00
Alexander Ivash
7058b07aea FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized 2018-09-07 12:41:39 +03:00
Alexia Mandeville
190a335c71
Adding more margin to forgotten links 2018-09-07 00:01:00 -07:00
Alexia Mandeville
92f218ae29
Adding margins to forgotten link text 2018-09-06 22:59:19 -07:00
Alexia Mandeville
2443723a2b
Removing margins, adding width attribute 2018-09-06 21:14:04 -07:00
Anthony Thibault
6508533a15 Remove anim stats from plain ole stats. 
There are still present in anim stats tho.
 2018-09-06 17:58:40 -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
7a9480723e Remove unused variable in PickScriptingInterface::createTransformNode 2018-09-06 17:30:29 -07:00
Wayne Chen
e76ebf7a0b changing location of shortcuts 2018-09-06 17:29:16 -07:00
Dante Ruiz
2f9119529a editing the interstitial page 2018-09-06 17:06:17 -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
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
Alexia Mandeville
8e5f5cc796 Moving forgotten links 2018-09-06 16:16:43 -07:00
Zach Fox
0e785f9bdb Fix MS17877: Persist Connections table sort choice 2018-09-06 15:35:26 -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
Alexia Mandeville
aabfda6eb5 Adding descriptive text 2018-09-06 14:16:42 -07:00
Alexia Mandeville
00e10ad684 Updating sign up text, moving forgotten info links 2018-09-06 14:05:51 -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
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
sabrina-shanman
714cfc5ef1 Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc 2018-09-06 12:14:50 -07:00
sabrina-shanman
727b62144f Fix MyAvatarHeadTransformNode not using avatar scale 2018-09-06 12:03:13 -07:00
Wayne Chen
a5038850f1 right align forgot user/pw shortcuts 2018-09-06 11:37:35 -07:00
Wayne Chen
385027321b fixing the eye open/closed pw image 2018-09-06 11:18:35 -07:00
Dante Ruiz
ec2d89fd25 fixing toolbar disappering 2018-09-06 11:16:58 -07:00
sabrina-shanman
7839ba42db Make the Collision Pick threshold scale with the largest dimension of the parent 2018-09-06 11:02:07 -07:00
sabrina-shanman
3f7a7fb11a Return early from AvatarTransformNode and similar when getTransform fails 2018-09-06 10:29:01 -07:00
sabrina-shanman
e8ea95e375 Use elseifs in PickScriptingInterface::createTransformNode 2018-09-06 10:21:48 -07:00
sabrina-shanman
390e89a64d Fix missing NestableTransformNode import 2018-09-06 10:20:26 -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
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
Brad Davis
105a615745 Fix no-ui crashes 2018-09-06 08:59:05 -07:00
Wayne Chen
3f1eba418d modifying location of links for user/pw 2018-09-06 00:07:23 -07:00
Wayne Chen
6d055ba136 changing sign up label 2018-09-05 23:49:49 -07:00
Wayne Chen
78fa52285f adding show password toggle in textfield 2018-09-05 23:48:21 -07:00
Wayne Chen
7a136812bf Merge branch 'login-update' of https://github.com/alexiamandeville/hifi into loginOnLaunch 2018-09-05 20:05:19 -07:00
Wayne Chen
581aa0c02d Merge branch 'fly-login-upon-launch' of https://github.com/sethalves/hifi into loginOnLaunch 2018-09-05 20:04:34 -07:00
David Rowe
ab47e16be1 Fix up titles and leading white space of some dev menu tablet dialogs 2018-09-06 14:35:08 +12:00
David Rowe
8420afd143 Fix title not not going back to "Settings" upon Save or Cancel 2018-09-06 14:00:33 +12:00
Anthony Thibault
3a3ffcc98c First pass at improving anim stats. 2018-09-05 18:14:06 -07:00
amantley
6fb335429d starting to re-implement the walking state detection for smoothwalking 2018-09-05 17:55:27 -07:00
Alexia Mandeville
901de120a6 Removing flavortext 2018-09-05 17:20:49 -07:00
luiscuenca
abb632afda Update capsule when scale/load and teleport without safe landing 2018-09-05 16:51:34 -07:00
sabrina-shanman
84a2512f31 Fix collision pick scale not being used 2018-09-05 16:51:27 -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
Alexia Mandeville
1e697ad45f Removing labels, adding flavor text, moving links 2018-09-05 16:25:18 -07:00
David Rowe
a7099025dc Fix up some Settings dialogs' titles 2018-09-06 11:15:14 +12:00
David Rowe
960bf00e12 Modify look of HMD mode Settings dialogs' titles 2018-09-06 11:02:24 +12: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
David Rowe
398724de73 Make Save in HMD settings dialogs return to previous dialog 
Same as Cancel key does.
 2018-09-06 10:23:45 +12:00
Alexia Mandeville
dcf2e00bd7 Adding placeholder text 2018-09-05 14:55:12 -07:00
amantley
73e628bb8d merge with master fixes 2018-09-05 14:42:49 -07:00
David Rowe
097b4c177a Merge branch 'master' into M17901 2018-09-06 09:30:10 +12: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
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
Seth Alves
1bea6c9ea3 if not already logged in, show login dialog at launch-time rather than connect-to-domain-time 2018-09-05 10:38:12 -07:00
Wayne Chen
c6229c5c60 updating serverless file to have dynamic oops 2018-09-05 10:37:45 -07:00
Wayne Chen
179138aa10 updating serverless file to have dynamic oops 2018-09-05 10:36:06 -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
Wayne Chen
ebedbabace Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-05 09:06:36 -07:00
Wayne Chen
f38a26a1ff updating location of oops dialog script 2018-09-05 09:04:17 -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
Wayne Chen
d6442b350c updating redirect to the interstitial page url 
TODO: Fix this link to s3 bucket hosted file
 2018-09-04 23:18:57 -07:00
Wayne Chen
62abb51b26 Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-04 23:18:06 -07:00
Wayne Chen
afd7321e7f updating redirect with proper fbx 
TODO: fix path when uploaded the fbx files
 2018-09-04 23:16:59 -07:00
Wayne Chen
8b6c21e0bb updating script path 
TODO: will fix with s3 hosted script
 2018-09-04 22:19:20 -07:00
Wayne Chen
7721cba483 Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-04 22:18:16 -07:00
Wayne Chen
af1c473a9c updating with models in meshes folder 2018-09-04 22:17:33 -07:00
Wayne Chen
1ce6c84c08 updating metacall for loadServerlessDomain 2018-09-04 18:24:49 -07:00
Wayne Chen
2e17140c07 fixing loadServerlessDomain function to be from 404 redirect 2018-09-04 18:24:01 -07:00
Wayne Chen
c47788efe4 merging with dante's PR 2018-09-04 18:00:06 -07:00
Wayne Chen
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -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
Wayne Chen
002c6547ee entity script URL update 2018-09-04 14:08:13 -07:00
Wayne Chen
22a8164401 adding back refusal notifications + domain bounds/floor 2018-09-04 13:53:03 -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
Wayne Chen
a7abebd7aa adding redirect json to post build in Mac 2018-09-04 11:11:34 -07:00
Simon Walton
fff6a10bcd Remove some debug logging from safe landing additions 2018-09-04 10:58:40 -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
Zach Fox
24cf4adb44 Fix MS17902: Prevent case where My Purchases says Open instead of Uninstall 2018-09-04 09:08:42 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
Sam Gateau
bd9136812d Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-31 17:53:49 -07:00
Stephen Birarda
20912349a4 cycle avatar entity IDs for new avatar mixer 2018-08-31 16:53:58 -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
sam gateau
5067047e52 warnings on ubuntu 2018-08-31 14:24:52 -07:00
sam gateau
ec18806546 INtegrating in the algorithm, not in the public values the overshoot for the target FPS to make it simpler to understand 2018-08-31 12:15:28 -07:00
SamGondelman
d01b438cb3 CR 2018-08-31 11:25:17 -07:00
sabrina-shanman
62344c106d Make render states a map when returned from PointerScriptingInterface::getPointerProperties 2018-08-31 11:19:53 -07:00
sam gateau
84ad5c79f9 fixing a no op 2018-08-31 11:09:16 -07:00
sabrina-shanman
2e290ea798 Only create a NestableTransformNode if the spatially nestable exists 2018-08-31 10:52:00 -07:00
sabrina-shanman
f71fc83309 Remove PickResult::needsToCompareResults 2018-08-31 10:48:48 -07:00
sabrina-shanman
4d85cb17f3 Include full transform in CollisionPick::getResultTransform 2018-08-31 10:46:17 -07:00
sabrina-shanman
9bf088d32b Just assign mathPick.loaded in CollisionPick::getMathematicalPick 2018-08-31 10:28:45 -07:00
sam gateau
6bd1ab5ae0 fixing a bad constant 2018-08-31 09:18:33 -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
262fdb3c28 ardressing coding standard 2018-08-31 09:09:22 -07:00
sam gateau
eb5f6c8eb3 ardressing coding standard 2018-08-31 09:07:34 -07:00
Wayne Chen
b6d23843dd adding fix to domain redirection URL 2018-08-30 22:32:02 -07:00
Sam Gateau
764f75c340 including review feedback 2018-08-30 22:26:45 -07:00
Sam Gateau
371105d0c4 Removing cruft and warnings 2018-08-30 22:18:34 -07:00
Sam Gateau
0ae18febc7 Removing cruft and warnings 2018-08-30 22:09:48 -07:00
David Rowe
f144308334 Make tablet menu page title navigation go back a level 2018-08-31 16:58:59 +12: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
ed441d5570 Merge branch 'master' into M17901 2018-08-31 14:30:11 +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
SamGondelman
5f08ed5027 misc perf improvements 2018-08-30 16:55:15 -07:00
Alexander Ivash
07739453c5 coding standards 2018-08-31 01:51:13 +03:00
Alexander Ivash
cb1855b0d7 filter out left/right hands from joints list in avatarapp 
should fix:
	FB17884 - Wearable disappears when added to some joints
	FB17885 - Changing werable joint moves the model and detaches from avatar body
 2018-08-31 01:51:13 +03: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
Alexander Ivash
daf81bbcb8 FB17982 Avatar App reloads existing selected bookmark on app relaunch 2018-08-31 00:36:52 +03:00
Dante Ruiz
03ede9371e cleaning code 2018-08-30 14:26:39 -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
David Back
cee270780b
Merge pull request #13908 from dback2/androidCrashStateVariables 
Fix Android StateController assert
 2018-08-30 13:37:13 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
Sam Gateau
78c7948ebc fine tuning the noise coef ramp and documenting the algorithm 2018-08-30 12:11:43 -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
John Conklin II
bf0ab865bb
Merge pull request #13903 from birarda/bug/av-entity-delete-master 
send MyAvatar avatar entity updates through entity tree
 2018-08-30 10:25:31 -07:00
David Back
8b1fcfcce9 fix double windows platform 2018-08-30 10:16:27 -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
Wayne Chen
f07f326f06 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 09:08:22 -07:00
Sam Gateau
6c502e79e3 Fine tuning a LOD regulator PV that works 2018-08-29 22:56:44 -07:00
Sam Gateau
8f4419de30 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-29 19:11:03 -07:00
Sam Gateau
4844f06e5e brain freeze 2018-08-29 17:33:39 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Sam Gondelman
cfffa65819
Merge pull request #13899 from SamGondelman/pointerPerf 
Improve Pointer performance
 2018-08-29 16:57:43 -07:00
Wayne Chen
eb29c9c4a2 updating with default landing location 2018-08-29 16:53:22 -07:00
sabrina-shanman
1fe909f9ad Make CollisionPick::getResultTransform() always return a valid transform 2018-08-29 16:33:51 -07:00
Stephen Birarda
aaf5f593c5 send MyAvatar avatar entity updates through entity tree 2018-08-29 16:30:24 -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
Angus Antley
9fb0f8b7c0 added condition to prevent overwriting tracker input with estimated orientation for spine2 joint 2018-08-30 00:25:53 +01:00
Wayne Chen
3810984056 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-29 16:18:16 -07:00
Wayne Chen
0c8964b16f Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-29 16:12:57 -07:00
Wayne Chen
6cdcae3349 switching address syntax, updating redirection domain 2018-08-29 16:11:51 -07:00
Sam Gateau
349f782697 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 16:07:50 -07:00
Sam Gateau
ed4dbaa4c7 Refining the plot widget to be able to represent negative values 2018-08-29 16:07:30 -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
2d73b7845e Code style fixes 2018-08-29 15:00:01 -07:00
sabrina-shanman
0981f08b22 Do not propagate avatar scale in AvatarHeadTransformNode 2018-08-29 14:48:27 -07:00
Zach Fox
67e57a9487
Merge pull request #13849 from zfox23/MS16003_backCloses 
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
 2018-08-29 14:29:12 -07:00
SamGondelman
cda8b82ead improve pointer performance 2018-08-29 13:32:53 -07:00
Angus Antley
f7d0cdda02 added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth 2018-08-29 20:44:21 +01:00
David Back
96d2ba660c Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-29 12:05:51 -07:00
Andrew Meadows
f9d14e1351 filter time-cost drivers for region regulation 2018-08-29 11:17:59 -07:00
John Conklin II
4ab45e70a4
Merge pull request #13887 from sethalves/fix-pick-reg-point-1 
fix far-grab laser-lock on entities with non-default registration point
 2018-08-29 10:42:03 -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
442644381a adding other connection refused suppressions 2018-08-28 20:16:55 -07:00
Wayne Chen
6689c15564 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-28 19:22:34 -07:00
Angus Antley
ee33f5dc97 normalize the hip hand vector in getSpine2RotationRigSpace, made computeHandAzimuth a const function that returns a vec2 2018-08-29 01:57:49 +01:00
Sam Gateau
37b4cf6223 Picking pid values 2018-08-28 17:39:35 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
Sam Gateau
0da22db837 Picking pid values 2018-08-28 16:05:57 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
Sam Gateau
7dfdc79644 Picking pid values 2018-08-28 12:21:15 -07:00
Sam Gondelman
89bd24dd54
Merge pull request #13880 from SamGondelman/matCrash 
Fix crash on shutdown in domain with material
 2018-08-28 11:48:35 -07:00
amantley
3c792a04c1 fixed roll rotation added to azimuth in MySkeletonModel.cpp 2018-08-28 11:25:42 -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
63eb57c741 Exploring PID again 2018-08-28 08:58:25 -07:00
amantley
89b508251e added some comment to explain rig to avatar transform 2018-08-27 17:57:50 -07:00
sabrina-shanman
c6e6da2e3f Make MouseTransformNode actually parent the pick to a mouse rather than a MouseRayPick, and properly include rotation information 2018-08-27 16:53:55 -07:00
Seth Alves
52bbb4d2ab fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix. 2018-08-27 16:21:01 -07:00
David Rowe
c29c9f98c1 Make Cancel in HMD settings dialogs return to Settings dialog 2018-08-28 11:15:57 +12:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -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
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
Thijs Wenker
efa3fa7907 Don't always on top InteractiveWindows (Windows OS) 2018-08-27 20:42:06 +02: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 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
Dante Ruiz
92acaade2b trying to fix problems 2018-08-24 17:13:57 -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
amantley
2bec867863 added the sanity check to see if the shoulders have flipped 2018-08-24 16:29:08 -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
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
Sam Gateau
8f8bcc1901 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-24 15:23:37 -07:00
SamGondelman
98d145dc24 fix crash on shutdown in domain with material 2018-08-24 15:19:48 -07:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002 
workload tracks other avatars and adds/removes from physics simulation accordingly
 2018-08-24 12:43:51 -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
amantley
a60ab863a3 demo version of the head and hands determining the rotate function 2018-08-24 11:06:36 -07:00
Angus Antley
25610c7587 got the hands turning the shoulders, needs error checking 2018-08-24 11:04:36 +01:00
Angus Antley
44a6c7df5f added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot 2018-08-24 07:17:17 +01:00
Sam Gateau
699240027e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-23 19:29:14 -07:00
amantley
0e0561bb24 latest rotate code 2018-08-23 17:59:18 -07:00
SamGondelman
b5b7167644 add to stats 2018-08-23 17:56:24 -07:00
Sam Gateau
cee9b90930 working on the LOD behavior 2018-08-23 16:48:42 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Zach Fox
a1d88a8588 Merge howard/wallet-locker2 into my branch 2018-08-23 14:45:16 -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
abf4a926d8 cleanup 2018-08-23 12:59:28 -07:00
Andrew Meadows
8f2141b592 fix compile error 2018-08-23 12:59:28 -07:00
Andrew Meadows
777b90bdc0 add 'physics body count' to debug stats 2018-08-23 12:59:28 -07:00
Andrew Meadows
f5cae61b43 fix typo causing compile failure 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
3ecabb6583 cleanup after removing spaghetti 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
615b8addd0 fix order of includes 2018-08-23 12:59:28 -07:00
Andrew Meadows
598a227f1a use OtherAvatar instead of Avatar in AvatarMotionState 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
21adbf49c0 remove cruft 2018-08-23 12:59:28 -07:00
Andrew Meadows
15665b25e8 give OtherAvatars a proxy in workload 2018-08-23 12:59:28 -07:00
Sam Gateau
b725ed440b Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-23 11:40:10 -07:00
Sam Gateau
473f8d0ca5 Working on the LOD system 2018-08-23 11:39:47 -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
Dante Ruiz
54258a8707 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-23 09:53:20 -07:00
Angus Antley
30ef544c6d starting the c++ version of shoulder rotation 2018-08-23 15:57:14 +01:00
SamGondelman
c474f38860 force coarse picking, sort avatars 2018-08-22 18:07:16 -07:00
Dante Ruiz
db8e1bdfa3 compile error fix 2018-08-22 16:47:18 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
Wayne Chen
4daa30c1d0 changing text for check preference 2018-08-22 15:58:37 -07:00
Wayne Chen
9518b8cdaf rearrangement 2018-08-22 15:46:02 -07:00
Wayne Chen
c32cc1ead2 adding implementation 2018-08-22 15:42:15 -07:00
Dante Ruiz
f5441b2721 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-22 15:28:42 -07:00
Dante Ruiz
78458d62de revert some changes and fix toolbar issue 2018-08-22 15:20:56 -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