Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
71914 commits 71 branches 56 tags 1.2 GiB
Commit graph

3897 commits

Author SHA1 Message Date
John Conklin II
6c47ba0dc7
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps 
Use C++ chrono system_clock for timestamps
 2018-09-26 11:22:49 -07:00
Seth Alves
86e502637e Make Settings thread safe 2018-09-21 15:46:35 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip 
Safe Teleport Target
 2018-09-14 15:11:18 -07:00
Simon Walton
727aea2025 Remove comment 2018-09-13 18:21:16 -07:00
Simon Walton
74ea1548a9 Use chrono::system_clock for usecTimestampNow() on all platforms 2018-09-13 14:24:49 -07:00
Simon Walton
15f06264f9 Remove unneeded #include 2018-09-11 17:03:39 -07:00
Simon Walton
80b7e04bc6 Revert change to chrono<system_clock> for usecTimestampNow() 2018-09-11 10:51:36 -07:00
luiscuenca
9c6ee18db5 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 15:18:15 -07:00
sabrina-shanman
3b7dac9058 Account for collisionGroup in CollisionRegion implementation 2018-09-10 15:14:48 -07:00
luiscuenca
6f4e9ded09 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 14:42:02 -07:00
sabrina-shanman
9a86b7451b Add collision group parameter to collision pick and set my avatar as the default 2018-09-10 14:35:04 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling 2018-09-10 10:15:49 -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
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
sabrina-shanman
f40f40e135 Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value 2018-09-06 17:35:12 -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
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
adf0a9a414 Convert priority age from microseconds to seconds 2018-09-05 17:41:00 -07:00
Simon Walton
d2650f7ede Modified priority function from Andrew 2018-09-05 17:22:07 -07:00
amantley
73e628bb8d merge with master fixes 2018-09-05 14:42:49 -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
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager 
Miscellaneous low-level performance improvements
 2018-09-05 10:12: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
John Conklin II
476887a224
Merge pull request #13909 from NissimHadar/fixFileUtils 
Create correct folder.
 2018-09-04 14:20:20 -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
Simon Walton
c2ea05b026 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-09-04 09:31:05 -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
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
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
Simon Walton
33db1394e6 Use system_clock in usecTimestampNow for cross-platform goodness 2018-08-30 17:12:42 -07:00
SamGondelman
5f08ed5027 misc perf improvements 2018-08-30 16:55:15 -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
Simon Walton
c2ac2b9ab0 Various tweaks; fix clang warning 2018-08-30 10:59:55 -07:00
Simon Walton
a186be014d Use std::chrono for usecTimestampNow() 2018-08-29 17:35:28 -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
sabrina-shanman
78a438d89a Correct CollisionRegion jsdoc for 'joint' parameter 2018-08-29 14:55:14 -07:00
Andrew Meadows
f9d14e1351 filter time-cost drivers for region regulation 2018-08-29 11:17:59 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00