Commit graph

63732 commits

Author SHA1 Message Date
Seth Alves
3a57324cef
Merge pull request #16 from Atlante45/interface-backtrace
Move crashpad out of shared
2018-01-30 11:55:12 -08:00
Atlante45
edfffc575a Handle multiple targets for add_crashpad 2018-01-30 11:48:01 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Seth Alves
2a6ff80911 fix indentation 2018-01-30 09:13:47 -08:00
Seth Alves
7d1eb5fef8 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-30 09:13:02 -08:00
John Conklin II
dc3823374a
Merge pull request #12282 from druiz17/RC63
fix new model path(RC63)
2018-01-29 16:28:58 -08:00
John Conklin II
180d09f901
Merge pull request #12278 from AndrewMeadows/adjust-low-lod-threshold
RC63 Hotfix: HMD low LOD threshold changed: 45 --> 34
2018-01-29 16:09:56 -08:00
Dante Ruiz
08511a2a2e fix new model path 2018-01-29 15:27:55 -08:00
John Conklin II
1220ad6b50
Merge pull request #12281 from zfox23/400ConnectionsPerPage
400 connections per page for Wallet and PAL
2018-01-29 12:49:05 -08:00
Seth Alves
ae4aa41da4
Merge pull request #14 from Atlante45/interface-backtrace
Don't run settings preroutine when not initialized
2018-01-29 12:34:21 -08:00
Atlante45
061f9ea359 Don't run settings preroutine when not initialized 2018-01-29 12:09:16 -08:00
Zach Fox
00555250a0 400 connections per page for Wallet and PAL 2018-01-29 12:07:07 -08:00
John Conklin II
92b9290294
Merge pull request #12267 from hyperlogic/bug-fix/rc63-neck-cauterization
RC63: Bug fix for avatar neck cauterization
2018-01-29 10:52:10 -08:00
Andrew Meadows
c2817fc091 HMD low LOD threshold changed: 42 --> 34 2018-01-29 10:18:08 -08:00
Andrew Meadows
6acec39e92 HMD low LOD threshold changed: 45 --> 42 2018-01-29 10:05:23 -08:00
John Conklin II
97d9fe0ea7
Merge pull request #12273 from samcake/RC63-fix-lighting
RC63 hotfix: fixing lighting on scattering skin bug 11802
2018-01-29 09:26:11 -08:00
Sam Gateau
3d9985fa67 FIx the scattering ambient lighting diffuse which was too dark (got divided by PI) comparedd to non scattering 2018-01-27 08:48:19 -08:00
Seth Alves
c2b1c4250c
Merge pull request #13 from Atlante45/backtrace-for-rc-63
Fix settings init in all exe
2018-01-26 15:57:35 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -08:00
John Conklin II
00773b4b12
Merge pull request #12270 from sethalves/warn-for-head-position-nan-for-rc-63
Warn for head position nan for rc 63
2018-01-26 14:16:30 -08:00
Anthony J. Thibault
3be857567b updated Skinning.slh comment and constant.
(cherry picked from commit 43eaa02ef0)
2018-01-26 14:02:18 -08:00
Seth Alves
78a5f535c1 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-26 12:09:38 -08:00
Seth Alves
d73538f233 oops 2018-01-26 12:08:19 -08:00
Seth Alves
1237749628 oops 2018-01-26 12:05:26 -08:00
Seth Alves
b7303414f2 unmangle merges 2018-01-26 11:57:30 -08:00
Seth Alves
19409cc6ce fix merge/cherry-pick error 2018-01-26 10:45:18 -08:00
Seth Alves
503175cd28 Merge branch 'RC63' of github.com:highfidelity/hifi into warn-for-head-position-nan-for-rc-63 2018-01-26 10:34:51 -08:00
Seth Alves
b8f3d8140d add breaks in case statements that used to have returns 2018-01-26 10:34:43 -08:00
Seth Alves
2962c8979c print warnings if head position contains not-a-number 2018-01-26 09:49:21 -08:00
John Conklin II
dd628a4d95
Merge pull request #12268 from hyperlogic/bug-fix/rc63-twisted-knees
RC63: Bug fix for twisted knees on some avatars.
2018-01-26 09:42:24 -08:00
Seth Alves
cb5ca26600 quiet warnings 2018-01-26 09:23:34 -08:00
Seth Alves
dbe9fd290e comment out code that would set annotations after StartHandler is called 2018-01-26 09:23:29 -08:00
Seth Alves
c550620cb4 backtrace for rc-63 2018-01-26 09:23:24 -08:00
Atlante45
df62ba88cb Fix rebase error 2018-01-26 09:22:37 -08:00
Seth Alves
9eb10c09da oops 2018-01-26 09:22:33 -08:00
Seth Alves
c02ab28c60 fix clang build 2018-01-26 09:22:28 -08:00
Seth Alves
e32089d3dd only start crash hanlder if UserActivityLogger::isEnabled() is true 2018-01-26 09:22:22 -08:00
Atlante45
39f26e35f0 backtrace for rc-63 2018-01-26 09:22:14 -08:00
Seth Alves
88f66f03cc remove merge mistake 2018-01-26 09:20:46 -08:00
Atlante45
093fff9c9e Add crashpad 2018-01-26 09:20:38 -08:00
Seth Alves
6c04431636 call startCrashhandler from interface 2018-01-26 09:20:29 -08:00
Seth Alves
47f44eb21f extirpate bugsplat 2018-01-26 09:20:23 -08:00
Atlante45
ced5aad1d1 backtrace for rc-63 2018-01-26 09:20:07 -08:00
Anthony J. Thibault
1ad65b8da5 Bug fix for twisted knees on some avatars.
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix.  The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale.  If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity.  To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.

(cherry picked from commit 991ba7f195)
2018-01-25 18:31:41 -08:00
Anthony J. Thibault
21c1e32490 Bug fix for avatar neck cauterization
The basic dual-quaternion skinning algorithm does not handle non-rigid transformations like scale well.
Because we only use scaling for head cauterization, we special case this by passing in a cauterization factor,
as well as a cauterization position to the vertex shader.  If a vertex is flagged as cauterized, we slam it to equal the cauterization position.
Although, not as smooth as the previous method, it seems to work well enough on the avatar's I've tested.

(cherry picked from commit faf8350369)
2018-01-25 17:47:39 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix
RC63 Fix Edit/Asset Browser in HMD mode
2018-01-25 09:38:23 -08:00
John Conklin II
d537146fd1
Merge pull request #12240 from luiscuenca/gotoFixForHMD
RC63 GoTo fix for HMD
2018-01-25 09:37:59 -08:00
John Conklin II
5599488b88
Merge pull request #12254 from hyperlogic/bug-fix/rc63-avatar-eye-offset
RC63: Bug fix for incorrect positioned eyes on other peoples avatars
2018-01-25 09:32:13 -08:00
Anthony J. Thibault
58d3d8ef3d Bug fix for incorrect positioned eyes on other peoples avatars
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.

(cherry picked from commit a252e90f96)
2018-01-24 21:14:29 -08:00
John Conklin II
a2f6f25f59
Merge pull request #12247 from SamGondelman/RC63
RC63: Revert "Display both lasers on tablet and Web surfaces"
2018-01-24 16:00:06 -08:00