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 |
|
sabrina-shanman
|
6f6e70a470
|
Re-order variable initialization in CollisionRegion copy contructor
|
2018-08-28 08:45:47 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
luiscuenca
|
8ede6f1cd0
|
Fix removing my avatar and code standards
|
2018-08-27 06:55:52 -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 |
|
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 |
|
SamGondelman
|
ff6020e0ef
|
fix compile errors, maybe
|
2018-08-24 15:41:25 -07:00 |
|
SamGondelman
|
98d145dc24
|
fix crash on shutdown in domain with material
|
2018-08-24 15:19:48 -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 |
|
Stephen Birarda
|
d8b5a1a4a6
|
always remove old socket-matching node before add
|
2018-08-24 14:21:54 -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 |
|
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 |
|
SamGondelman
|
1c0c17cecb
|
faster triangle intersection
|
2018-08-24 11:20:10 -07:00 |
|
amantley
|
a60ab863a3
|
demo version of the head and hands determining the rotate function
|
2018-08-24 11:06:36 -07:00 |
|
luiscuenca
|
5654acf5bf
|
Fix warnings
|
2018-08-24 09:24:58 -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 |
|