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
8e3097d94c
Merge pull request #12275 from jherico/fix/haze_uniform
...
Fix haze parameters uniform buffer size
2018-01-29 08:50:50 -08:00
David Rowe
d334f1c35c
Don't append trailing FBX root nodes to the tail of the tree
2018-01-29 13:45:39 +13:00
Brad Davis
206927d72a
Fix haze parameters uniform buffer size
2018-01-27 12:05:29 -08:00
Brad Davis
08df262474
Fix haze parameters uniform buffer size
2018-01-27 11:42:17 -08:00
Thijs Wenker
8fdbac521f
move ADD_CUSTOM_QRC_PATH function to its own file
2018-01-27 19:58:15 +01:00
Thijs Wenker
898c99e5b8
append file jsdoc json file to resources.rcc resource file
2018-01-27 19:50:52 +01:00
Sam Gateau
221475d7d9
FIxing the dark ambient lighting on scattering surface
2018-01-27 10:37:32 -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
Liv Erickson
20635acf27
moving logic to wallet, crashes currently
2018-01-26 17:13:39 -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
humbletim
e2afcac534
include .extraInfo as part of RayPick API constructors
2018-01-26 18:34:13 -05: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
Anthony J. Thibault
43eaa02ef0
updated Skinning.slh comment and constant.
2018-01-26 14:01:33 -08:00
Dante Ruiz
be42f0cfb1
finally fix the multihighlighting
2018-01-26 13:24:44 -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
3be42fe79a
Merge branch 'master' of github.com:highfidelity/hifi into warn-for-head-position-nan
2018-01-26 10:36:26 -08:00
Seth Alves
17ec79f182
add breaks in case statements that used to have returns
2018-01-26 10:36:16 -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
Seth Alves
9173db62c7
Merge pull request #12042 from druiz17/entity-joints
...
Allows model entity joint to be changed from scripts
2018-01-26 09:48:26 -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
Thijs Wenker
08b712281f
Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete
2018-01-26 18:10:47 +01: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
Zach Fox
b41129f81b
Merge pull request #12258 from zfox23/commerce_fixSortingAgain
...
Fix Purchases sorting (again); Fix (i) icon loading
2018-01-25 17:35:26 -08:00
Dante Ruiz
5bb1b1bbff
remove backup file
2018-01-25 16:26:00 -08:00
Dante Ruiz
537db37b26
removed dead comment
2018-01-25 16:23:35 -08:00
SamGondelman
78d72a1703
remove unnecessary invokeMethod from ResourceCache::getResource
2018-01-25 16:07:26 -08:00
Dante Ruiz
3c12ed3b75
Merge branch 'master' of github.com:highfidelity/hifi into entity-joints
2018-01-25 16:03:15 -08:00
