Atlante45
db08f1dda6
Move backtrace to interface
2018-01-30 11:39:48 -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
Atlante45
061f9ea359
Don't run settings preroutine when not initialized
2018-01-29 12:09:16 -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
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
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
b7303414f2
unmangle merges
2018-01-26 11:57:30 -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
2962c8979c
print warnings if head position contains not-a-number
2018-01-26 09:49:21 -08:00
Seth Alves
dbe9fd290e
comment out code that would set annotations after StartHandler is called
2018-01-26 09:23:29 -08:00
Atlante45
df62ba88cb
Fix rebase error
2018-01-26 09:22:37 -08:00
Seth Alves
c02ab28c60
fix clang build
2018-01-26 09:22:28 -08:00
Atlante45
39f26e35f0
backtrace for rc-63
2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636
call startCrashhandler from interface
2018-01-26 09:20:29 -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
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
1529fea983
Revert "Display both lasers on tablet and Web surfaces"
...
(cherry picked from commit 455090d2b9
2018-01-24 14:51:42 -08:00
Anthony J. Thibault
5926384076
Take defaultPoseFlag section into account when computing byteArraySize.
...
(cherry picked from commit c13c9f301c
2018-01-22 16:02:35 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master
...
Fix lockup when no midi devices present.
2018-01-22 11:25:46 -08:00
Anthony J. Thibault
52f1803ea8
code review feedback
2018-01-22 09:55:39 -08:00
Seth Alves
45a00bebc0
Merge pull request #12217 from luiscuenca/sortOrderFix
...
Fix sortOrder param on tablet buttons
2018-01-21 10:40:25 -08:00
luiscuenca
b0f21c6931
sorter variable names
2018-01-20 07:09:16 -07:00
Bruce Brown
cbc8698e9a
Fix Bitwise operators.
2018-01-19 16:59:47 -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
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703
...
Display both lasers on tablet and Web surfaces
2018-01-19 15:15:44 -08:00
luiscuenca
41f3b792b6
Fix warnings
2018-01-19 14:34:52 -07:00
Bruce Brown
fab13a111c
Remove accidental -
2018-01-19 13:10:34 -08:00
David Rowe
24dcc8788c
Code review
2018-01-20 10:07:23 +13:00
John Conklin II
c366ed42ab
Merge pull request #12202 from amantley/urlbug
...
added a property check in renderableModelEntity for the animation url…
2018-01-19 12:52:43 -08:00
David Rowe
94e6a68d41
Code review
2018-01-20 09:50:24 +13:00
Bruce Brown
39e938ccc7
Removed Tabs & CR/LF
2018-01-19 11:52:09 -08:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
...
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Sam Gateau
9a8246f2b9
Merge pull request #12215 from Zvork/brdf
...
Normalized diffuse & specular for directional, point and spot lights
2018-01-19 11:08:29 -08:00
Seth Alves
63cd472fca
Merge pull request #12185 from AndrewMeadows/physics-shouldnt-set-dirty-flags
...
fix race condition whereby physics may incorrectly overwrite script/network property change
2018-01-19 11:06:22 -08:00
luiscuenca
27ea74f5bf
Fix sortOrder param on tablet buttons
2018-01-19 11:22:37 -07:00
Sam Gateau
ce550b4fa6
Merge pull request #12209 from SamGondelman/textures
...
Watch for attachment texture loading
2018-01-19 10:08:04 -08:00
Olivier Prat
12c48a38f7
Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials.
2018-01-19 13:58:35 +01:00
Bruce Brown
3004ee08e1
Fix lockup when no midi devices present.
2018-01-18 21:18:36 -08:00
David Rowe
fb684909ce
Merge branch 'master' into 21703
2018-01-19 17:25:12 +13:00
David Rowe
e0e6fc711b
Replace Pointers API function setNonHoverItems() with setDoesHover()
2018-01-19 16:05:09 +13:00
Alexander Ivash
67e816756c
make gcc happy
2018-01-19 01:51:41 +00:00
Andrew Meadows
75b5635d2f
less word salad
2018-01-18 17:43:22 -08:00
Andrew Meadows
3d3bfcf7a3
check dirty flags when harvesting physics results
2018-01-18 17:43:22 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
Elisa Lupin-Jimenez
42b8c293d6
Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name
...
Fixed typo in macro name
2018-01-18 14:44:43 -08:00
