Brad Davis
72ec0ea29a
Update Oculus Mobile SDK to latest version
2019-03-06 11:16:03 -08:00
Anthony Thibault
7585391642
Merge pull request #15031 from luiscuenca/upVectorFBXFix
...
Read and apply the upVector parameter when importing FBX files
2019-03-05 16:27:42 -08:00
Shannon Romano
4f3d593d90
Merge pull request #15072 from SamGondelman/clear
...
Case 11775: Don't clear my avatar entities on domain switch
2019-03-05 15:42:51 -08:00
Sam Gondelman
94cc5b83ac
Merge pull request #15088 from SamGondelman/create
...
Case 21541: Fix mouse on create in HMD
2019-03-05 13:07:49 -08:00
Shannon Romano
3eff5d269f
Merge pull request #15008 from ctrlaltdavid/M21128-a
...
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review
2019-03-05 11:58:37 -08:00
John Conklin II
4729c8737e
Merge pull request #15095 from amerhifi/master
...
case 21563: adding modelScale initialization so that it does not fail the validSc…
2019-03-05 11:46:32 -08:00
Sam Gondelman
fd5e2b4672
Merge pull request #15082 from SamGondelman/modelCrash
...
Case 21528: Possible fix for model crash
2019-03-05 11:27:46 -08:00
amer cerkic
fab343a1d4
correcting spacing
2019-03-05 10:52:54 -08:00
amer cerkic
36e9c604e9
fixed based on comment
2019-03-05 10:45:15 -08:00
amer cerkic
29a308dcaa
adding modelScale initialization so that it does not fail the validScale check assert
2019-03-05 10:07:33 -08:00
SamGondelman
f2c248c0a2
disable href and entity script events when in edit mode
2019-03-04 17:10:20 -08:00
SamGondelman
fd88ec0d16
need to copy meshStates on main thread
2019-03-04 15:25:02 -08:00
SamGondelman
12f5a735d9
simplifying mouse events and fix mouse on create
2019-03-04 14:50:09 -08:00
luiscuenca
b2d08e9d42
apply axis rotation to translation and meshes
2019-03-04 15:33:21 -07:00
Shannon Romano
29d5574d93
Merge pull request #15036 from SimonWalton-HiFi/connect-class-in-nodelist-thread
...
Connection class should run in NodeList thread
2019-03-04 12:30:24 -08:00
Shannon Romano
45099a5db6
Merge pull request #15076 from SamGondelman/laserWidth
...
Case 21514: Lasers scale with avatar
2019-03-04 11:26:08 -08:00
amantley
e955c02e07
Merge pull request #15046 from amantley/bugRootHips
...
Bug Fix for the Hips not translating correctly when Hips and Root have the same location
2019-03-04 14:05:33 -05:00
Shannon Romano
6d297d91f6
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation
...
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
2019-03-04 10:49:16 -08:00
Shannon Romano
06d89dc81a
Merge pull request #15077 from SamGondelman/resourceCrash
...
Case 21344: Fix resource crash on invalid resource
2019-03-04 10:47:57 -08:00
Shannon Romano
d56b460d11
Merge pull request #15030 from wayne-chen/clockOnTablet
...
Case 21456, Case 21463: Clock On Tablet (81.0/master)
2019-03-04 10:45:34 -08:00
SamGondelman
708632ee82
possible fix for model crash
2019-03-04 10:00:26 -08:00
Shannon Romano
4437b64ef3
Merge pull request #15081 from r3tk0n/fargrab-interrupt
...
Prevent HUD and Web Surface lasers from interrupting FarGrab.
2019-03-04 09:47:21 -08:00
r3tk0n
12ffa41984
Prevent HUD and Web Surface lasers from interrupting FarGrab.
2019-03-02 13:55:06 -08:00
Sam Gateau
e4958b3b0f
Merge pull request #15075 from jherico/fix/release_android_build
...
Fix CI release builds
2019-03-01 17:15:23 -08:00
Brad Davis
3f65c57258
Fix CI release builds
2019-03-01 16:27:02 -08:00
John Conklin II
d96038fd70
Merge pull request #14966 from raveenajain/gltf_model_parts
...
Case: 21139 gltf model parts
2019-03-01 16:26:17 -08:00
SamGondelman
884a64bfa6
fix resource crash
2019-03-01 15:50:50 -08:00
SamGondelman
da1ffc15e3
lasers scale with avatar
2019-03-01 15:42:45 -08:00
danteruiz
8e600adf1e
making requested changes
2019-03-01 15:30:11 -08:00
amantley
c046b8ffd3
made is so the boneLengthScale is only computed once per animation clip
2019-03-01 15:12:37 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo
...
case 21485: removing quest-demo specific changes
2019-03-01 15:03:44 -08:00
Jason Najera
d41c2d296b
Merge pull request #15043 from r3tk0n/fargrab-manipulation
...
FarGrab Entity Rotation with Off-Hand
2019-03-01 14:42:59 -08:00
danteruiz
618a1d5b83
fix tablet button and gizmos rotation
2019-03-01 14:31:12 -08:00
SamGondelman
3e6061e435
try to not clear my avatar entities on domain switch
2019-03-01 13:45:00 -08:00
amantley
a11c4bf4e3
resolved conflict with master in AnimClip.cpp
2019-03-01 13:35:08 -08:00
Anthony Thibault
369c718ba8
Merge pull request #15068 from hyperlogic/bug-fix/avatar-missing-animated-joints-bug
...
Fix for case when animated joints are missing from the target avatar
2019-03-01 13:03:29 -08:00
Shannon Romano
20d65ab183
Merge pull request #15064 from danteruiz/another-login-fix
...
Case 21451: HMD Login Encouragement Screen is not Usable
2019-03-01 12:57:17 -08:00
Shannon Romano
5db5fca81e
Merge pull request #15066 from SamGondelman/2d
...
Case 19188: Potential 2D overlay + Tablet threading fixes
2019-03-01 12:56:23 -08:00
amerhifi
8802eeadf6
Make CI android build signed, don't fail on quest build fails ( #18 )
...
merging build changes
2019-03-01 12:46:50 -08:00
amantley
54f14b2772
added the case where my avatar has no parent of hips, but the animation does
2019-03-01 12:41:05 -08:00
NissimHadar
b6688868b0
Merge pull request #14991 from NissimHadar/21379-removeNitpickInstallerFromLinux
...
Case 21379: Remove nitpick installer from Linux
2019-03-01 11:51:49 -08:00
amantley
217145f4c5
This pr addresses two issues related to avatars that have parents joints
...
above their hip joints. First on the IK side this prevents parent joints
from being included in the accumulators in AnimInverseKinematics. Second
in AnimClip the boneLengthScale now takes into account translation and
scale on these extra parent joints.
2019-03-01 11:42:03 -08:00
raveenajain
dfb17c922b
fix model not loading in bounding box
2019-03-01 11:21:29 -08:00
Jason Najera
6346df54af
Merge pull request #15061 from r3tk0n/away_bubble_protection
...
[MS#21495] Enable Bubble/Shield on Away
2019-03-01 11:17:48 -08:00
Anthony Thibault
82b2050229
code review feedback
2019-03-01 11:13:56 -08:00
amer cerkic
ad69611b7c
removing redef of the two functions in avatar.h
2019-03-01 11:08:00 -08:00
SamGondelman
cfb84967d5
these seemed dangerous
2019-03-01 10:54:44 -08:00
amer cerkic
6ebc57994b
Merge branch 'master' into quest-demo
2019-03-01 10:23:41 -08:00
amer cerkic
3e3176d3a4
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-03-01 10:23:30 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling
...
Case 21424: Tablet does not properly resize when scaling avatar.
2019-03-01 09:37:47 -08:00