Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Zach Fox
8072372822
Lots of changes
2018-02-15 13:27:13 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals
2018-02-15 11:02:49 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
David Back
dc92250b1a
change var names
2018-02-09 17:37:53 -08:00
David Back
ff0b632978
get avatars in range
2018-02-09 17:37:30 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
Seth Alves
5e16623c81
allow overlay children to follow avatar from one domain to another
2018-02-08 17:17:04 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Sam Gateau
7fe4f8480a
Merge pull request #12172 from highfidelity/android
...
Android updates
2018-01-23 14:41:35 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Anthony J. Thibault
c13c9f301c
Take defaultPoseFlag section into account when computing byteArraySize.
2018-01-22 14:57:09 -08:00
Anthony J. Thibault
52f1803ea8
code review feedback
2018-01-22 09:55:39 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
Zach Fox
1d747bc0e4
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-17 11:56:00 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Brad Davis
58530c595a
Pre-merge cleanup
2018-01-14 19:48:12 -08:00
Zach Fox
1e608b13b2
Show username when admin (this probably isn't the way to get username
2018-01-11 14:45:43 -08:00
Brad Davis
97593bc4d8
Fixing compiled resource access
2018-01-10 17:18:12 -08:00
Atlante45
776a2e8373
Fix concurrent access crash in avatar mixer
2018-01-09 11:24:34 -08:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
Anthony J. Thibault
542af47e9e
Fix for hand controller avatar scaling.
...
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Anthony J. Thibault
b5ffda6911
const fix
2017-12-07 10:09:09 -08:00
Anthony J. Thibault
095bedcd3f
code review feedback
2017-12-07 10:08:18 -08:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Andrew Meadows
e212ac67c1
enable custom avatar sort tuning
2017-11-28 11:30:06 -08:00
Andrew Meadows
deccc54965
remove cruft
2017-11-28 09:14:05 -08:00
Anthony J. Thibault
b3896f664d
Made increaseScale and decreaseScale more responsive at limits
2017-11-22 14:45:52 -08:00
Anthony J. Thibault
9f54ce55f3
Change domain setting from min/max avatar scale to min/max avatar height
...
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
2017-11-21 13:25:47 -08:00
ZappoMan
b44ced4c21
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-20 17:19:18 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
Seth Alves
93fd2a6a6b
clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared
2017-11-15 20:10:05 -08:00
Ryan Downe Karpf
9ff4541ee3
Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack
...
Remove hack for missing inttypes.h header on VS2010
2017-11-12 10:59:19 -08:00
Anthony J. Thibault
5507bcea3c
Remove hack for missing inttypes.h header on VS2010
2017-11-09 10:34:01 -08:00
vladest
6685b74c2a
Remove checking of empty model url and add sanity for checking modelUrl field existing
2017-11-08 21:23:50 +01:00
ZappoMan
b5199220ab
cleanup SpatiallyNestable Velocity to match WorldVelocity naming
2017-11-02 17:07:53 -07:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Ryan Huffman
9c06afc4c8
Merge pull request #11326 from cain-kilgore/21537
...
WL 21537 - Improve log naming
2017-10-06 08:51:42 -07:00
Bradley Austin Davis
bc4193f276
Merge branch 'master' into android_new
2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Cain Kilgore
387e474889
WIP
2017-09-08 23:48:09 +01:00
Anthony J. Thibault
9cd8b6991e
Merge branch 'master' into feature/ant-man
2017-08-30 08:58:55 -07:00
Chris Collins
47a2e57e26
Merge pull request #10625 from humbletim/21180-C++
...
CR 21180-C++ Camera app -- core changes
2017-08-30 07:20:00 -07:00
