Commit graph

71074 commits

Author SHA1 Message Date
NissimHadar
fb80e9c395 Added new class. 2018-09-01 19:48:43 -07:00
NissimHadar
4e677c85f6 Can rename the High Fidelity folder in AppData 2018-08-31 23:13:50 -07:00
NissimHadar
3786f2b4d0 Merge branch 'exportToTestRail1' of https://github.com/NissimHadar/hifi into exportToTestRail1 2018-08-31 14:13:49 -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 Gondelman
067d7b280d
Merge pull request #13900 from SamGondelman/blendshapeCrash
Fix blendshape crash
2018-08-30 17:10:24 -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
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
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
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
SamGondelman
248c2621a4 fix blendshapes crash 2018-08-29 17:57:54 -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
Stephen Birarda
aaf5f593c5 send MyAvatar avatar entity updates through entity tree 2018-08-29 16:30:24 -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
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
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
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
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
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
0e53fa3f8b only focus with selection 2018-08-29 12:05:46 -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
Sam Gondelman
156f1dc60d
Merge pull request #13852 from Cristo86/android_lists_in_mem_cached_fast
Android - Domains and Users Lists - memory cache for quick loads
2018-08-29 11:24:12 -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
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
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -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
Anthony Thibault
f281afa71f
Merge pull request #13874 from amantley/phaseWalkFix
Phase walk fix bug 17770
2018-08-28 11:29:29 -07:00
amantley
3c792a04c1 fixed roll rotation added to azimuth in MySkeletonModel.cpp 2018-08-28 11:25:42 -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
David Back
511478a563 use not Mac instead of Windows 2018-08-27 18:11:19 -07:00
David Back
990638fd95 Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-27 18:04:23 -07:00
amantley
89b508251e added some comment to explain rig to avatar transform 2018-08-27 17:57:50 -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
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
Sam Gateau
657373d02f
Merge pull request #13588 from jherico/bug/fb15594
Working on pauses in tomb domain
2018-08-27 15:56:55 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -07: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
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