Olivier Prat
|
45e0f65972
|
Merge branch 'ao' of http://github.com/Zvork/hifi into ao
|
2018-11-14 09:48:24 +01:00 |
|
sabrina-shanman
|
e08bc7296f
|
Merge branch 'master' into hfm_serializer
|
2018-11-13 15:41:49 -08:00 |
|
sabrina-shanman
|
93c7578f54
|
Convert hfm::Serializer to use hifi-namespaced types
|
2018-11-12 16:12:21 -08:00 |
|
John Conklin II
|
0370c60398
|
Merge pull request #14358 from AndrewMeadows/fix-capsuleY
Case 18436: consistent handling of CapsuleShape dimensions
|
2018-11-12 15:25:42 -08:00 |
|
John Conklin II
|
dc4b967ff5
|
Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position
Clamp avatar-joint translations that hit the compressed-format limit
|
2018-11-11 16:27:56 -08:00 |
|
Dante Ruiz
|
358aa547b1
|
feedback changes
|
2018-11-08 09:58:53 -08:00 |
|
Dante Ruiz
|
f664421fe0
|
addressing code review feedback
|
2018-11-08 09:58:53 -08:00 |
|
Andrew Meadows
|
5bfb9c1f71
|
fix ShapeInfo::contains() logic for capsule shapes
|
2018-11-08 08:39:43 -08:00 |
|
Olivier Prat
|
9d5dcec0a0
|
Merge from master
|
2018-11-08 09:14:42 +01:00 |
|
Andrew Meadows
|
6ecf850159
|
clarify ShapeInfo::setCapsuleY() API and use it correctly
|
2018-11-06 12:37:55 -08:00 |
|
Simon Walton
|
26b9e2e162
|
Fix a URL while we're in the file
|
2018-11-02 14:47:40 -07:00 |
|
Simon Walton
|
e64557a46c
|
Clamp the fixed-point network values to their limits
|
2018-11-02 11:52:40 -07:00 |
|
SamGondelman
|
e64a4d0536
|
try to fix unnecessary queryAACube updates
|
2018-10-30 12:47:44 -07:00 |
|
John Conklin II
|
2eb801bdc6
|
Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements
Further avatar-mixer improvements
|
2018-10-25 12:25:32 -07:00 |
|
Jeff Clinton
|
67fe43ebb1
|
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
Small avatars now have a minimum jump height of 0.25 meters
|
2018-10-24 17:08:28 -07:00 |
|
Simon Walton
|
e22e0ecb04
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-24 10:39:23 -09:00 |
|
Olivier Prat
|
69ace03919
|
Merged with master
|
2018-10-24 08:27:39 +02:00 |
|
Simon Walton
|
0a78eeaf1a
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-23 15:56:56 -07:00 |
|
Zach Fox
|
493262052c
|
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
|
2018-10-22 13:59:52 -07:00 |
|
Zach Fox
|
7be5d5674d
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-22 13:59:35 -07:00 |
|
Olivier Prat
|
5f3a299fd9
|
Merge with master
|
2018-10-22 14:02:24 +02:00 |
|
Seth Alves
|
2ce8ed25f8
|
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
|
2018-10-20 13:40:53 -07:00 |
|
Anthony Thibault
|
6cc7c861d1
|
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest
Disable user hand controllers if they are too far away or not moving.
|
2018-10-19 14:02:32 -07:00 |
|
Anthony Thibault
|
ef74014075
|
Small avatars now have a minimum jump height of 0.25 meters
This should improve the quality of the jump animation and improve the mobility of small avatars.
|
2018-10-19 13:55:56 -07:00 |
|
Simon Walton
|
0b2ee35907
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-18 14:13:39 -07:00 |
|
Zach Fox
|
2f37a2b1a1
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-18 11:12:26 -07:00 |
|
John Conklin II
|
1cc2569bd8
|
Merge pull request #13596 from SamGondelman/scriptvec3
Replace vec2, vec3, and xColor properties with JS prototypes
|
2018-10-18 09:47:56 -07:00 |
|
Kerry Ivan Kurian
|
3b15548ea3
|
Display resource-access events in marketplace item tester
Includes refactoring marketplace item tester into a single-page app.
|
2018-10-18 01:04:47 -07:00 |
|
John Conklin II
|
8e5bc1678f
|
Merge pull request #14219 from SamGondelman/materialCull
QueryAACube fixes and materials expand to include their parent
|
2018-10-17 15:15:23 -07:00 |
|
Sam Gondelman
|
e3543cf098
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:10:29 -07:00 |
|
John Conklin II
|
9f0b4fb437
|
Merge pull request #14122 from SamGondelman/skybox
Rebake default skybox for all platforms
|
2018-10-17 09:50:00 -07:00 |
|
Anthony Thibault
|
27c495406e
|
Disable user hand controllers if they are too far away or not moving.
|
2018-10-16 17:24:47 -07:00 |
|
SamGondelman
|
49b496046b
|
queryAACube fixes
|
2018-10-16 14:35:39 -07:00 |
|
SamGondelman
|
ded8d4b547
|
variant conversions
|
2018-10-16 11:55:28 -07:00 |
|
Sam Gondelman
|
121fc7205c
|
Delete Default-Sky-9-cubemap.texmeta
|
2018-10-14 22:36:22 -07:00 |
|
SamGondelman
|
9788aa307e
|
remove width/height/depth
|
2018-10-10 12:38:07 -07:00 |
|
Clement
|
8983fe2bcf
|
Fix new Mac warnings
|
2018-10-09 12:11:55 -07:00 |
|
Olivier Prat
|
cfcf6f05a2
|
Merge with master
|
2018-10-09 14:18:02 +02:00 |
|
Simon Walton
|
6f659db3b5
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-08 15:18:29 -07:00 |
|
Sam Gondelman
|
67662df760
|
Merge branch 'master' into scriptvec3
|
2018-10-08 12:59:34 -07:00 |
|
Sam Gondelman
|
4e96c3297b
|
Merge branch 'master' into scriptvec3
|
2018-10-03 17:14:15 -07:00 |
|
sabrina-shanman
|
2ef85dfdba
|
Merge branch 'master' into stt_parenting2
|
2018-10-03 11:39:00 -07:00 |
|
Olivier Prat
|
4c84ae02fa
|
Merge branch 'master' of http://github.com/highfidelity/hifi into ao
|
2018-10-02 18:13:57 +02:00 |
|
Sam Gondelman
|
5b6e7b2566
|
Merge branch 'master' into scriptvec3
|
2018-10-02 08:58:04 -07:00 |
|
David Rowe
|
f7fd76b316
|
Merge branch 'master' into M18586
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
|
2018-10-02 16:49:16 +13:00 |
|
sabrina-shanman
|
67dc526ee2
|
Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2
|
2018-10-01 17:17:32 -07:00 |
|
John Conklin II
|
3ab83731b9
|
Merge pull request #14087 from sethalves/quiet-asan
fix several uninitialized reads
|
2018-10-01 16:48:54 -07:00 |
|
sabrina-shanman
|
0cf7e954cc
|
Simplify a RayPick and StylusTip constructor
|
2018-10-01 09:20:59 -07:00 |
|
Seth Alves
|
b69d0f3997
|
get interface building and working with clang-7 on ubuntu 18
|
2018-09-28 13:46:51 -07:00 |
|
David Rowe
|
1c4bde3e84
|
Fix build warnings
|
2018-09-28 18:38:38 +12:00 |
|
David Rowe
|
545c2591e3
|
Merge branch 'master' into M18586
|
2018-09-28 16:19:44 +12:00 |
|
sabrina-shanman
|
74937a1979
|
Serialize PickRay according to its variables
|
2018-09-27 14:41:38 -07:00 |
|
sabrina-shanman
|
3ac9478101
|
Assign _mathPick in the Pick constructor
|
2018-09-27 11:30:57 -07:00 |
|
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 |
|
sabrina-shanman
|
4011660435
|
Merge branch 'master' into stt_parenting2
|
2018-09-26 10:17:45 -07:00 |
|
Seth Alves
|
ff2a47e7e6
|
fix several uninitialized reads
|
2018-09-26 09:33:12 -07:00 |
|
David Rowe
|
b98bd741b8
|
Indent and reword jumping and flying checkbox
|
2018-09-26 18:14:02 +12:00 |
|
David Rowe
|
af1b4fef5d
|
Modify layout of rotation mode settings options
|
2018-09-25 18:03:57 +12:00 |
|
Simon Walton
|
d5977612a1
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-09-24 13:29:45 -07:00 |
|
David Rowe
|
e29b403abc
|
Merge branch 'master' into M18586
# Conflicts:
# interface/src/raypick/PointerScriptingInterface.cpp
# interface/src/raypick/PointerScriptingInterface.h
# interface/src/raypick/StylusPointer.h
# libraries/pointers/src/Pointer.h
# scripts/system/controllers/controllerModules/teleport.js
|
2018-09-24 11:44:28 +12:00 |
|
Seth Alves
|
86e502637e
|
Make Settings thread safe
|
2018-09-21 15:46:35 -07:00 |
|
Olivier Prat
|
9f0201878d
|
Some work to try to find the odd resolution bug
|
2018-09-21 17:14:39 +02:00 |
|
Simon Walton
|
7bba4d4bad
|
Change priorities in the correct place
|
2018-09-19 18:38:20 -07:00 |
|
Simon Walton
|
f1b7097edb
|
Priority experiment
|
2018-09-19 15:32:56 -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
|
6a1c76d14d
|
Only sort an estimated number of avatars
|
2018-09-14 12:19:55 -07:00 |
|
sabrina-shanman
|
237022d304
|
Refactor new pick parenting system for use with RayPick, ParabolaPick
|
2018-09-14 10:28:15 -07:00 |
|
SamGondelman
|
c522d1bc93
|
merge with master
|
2018-09-14 00:57:13 -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 |
|
SamGondelman
|
b3bdddb3f4
|
set vec with one number
|
2018-09-07 15:15:02 -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
|
589e88af4a
|
Merge remote-tracking branch 'upstream/master' into scriptvec3
|
2018-09-04 17:54:45 -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 |
|
John Conklin II
|
476887a224
|
Merge pull request #13909 from NissimHadar/fixFileUtils
Create correct folder.
|
2018-09-04 14:20:20 -07:00 |
|