Shannon Romano
|
0768cd58dc
|
Merge pull request #15427 from SamGondelman/materialMap
Case 22079: Bake existing materialMap in FST
|
2019-04-24 09:16:12 -07:00 |
|
Shannon Romano
|
7a9dd49eed
|
Merge pull request #15411 from Zvork/shadow
Case 22117: Shadows Appear Incorrectly Placed Relative to Avatars
|
2019-04-23 09:32:53 -07:00 |
|
Olivier Prat
|
8dabcb76b8
|
Taking into account comments
|
2019-04-22 21:30:57 +02:00 |
|
Sabrina Shanman
|
2a7ef5c5bb
|
Merge pull request #15426 from sabrina-shanman/bug_oven_texture-scale_master
(case 22282) Fix some baked models not preserving texture scale (master)
|
2019-04-22 09:52:36 -07:00 |
|
Sabrina Shanman
|
16da80b9b6
|
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread
(case 22011) Fix model processing occurring on main thread
|
2019-04-19 15:40:54 -07:00 |
|
SamGondelman
|
080cb36170
|
bake existing materialMap
|
2019-04-19 13:01:47 -07:00 |
|
Shannon Romano
|
c09e0eca1d
|
Merge pull request #15416 from SamGondelman/transparent83
Case 22283: Fix transparent textures on baked assets
|
2019-04-19 12:35:20 -07:00 |
|
sabrina-shanman
|
05a2b11c54
|
Fix mat4FromVariant
|
2019-04-19 11:29:28 -07:00 |
|
sabrina-shanman
|
74b4b47a2a
|
Save some bandwidth by not including unity texture transforms in material jsons
|
2019-04-19 11:29:28 -07:00 |
|
sabrina-shanman
|
9cb5ed888a
|
Remove unnecessary hasTexcoordTransform
|
2019-04-19 11:29:28 -07:00 |
|
sabrina-shanman
|
7b74561b27
|
Fix baked models not preserving scale in some cases
|
2019-04-19 11:29:27 -07:00 |
|
SamGondelman
|
b9934bce70
|
Merge remote-tracking branch 'upstream/master' into materialMap
|
2019-04-19 11:27:04 -07:00 |
|
Sam Gondelman
|
38ca699ff5
|
Merge pull request #15406 from sabrina-shanman/bug_oven_fst-rebake
(case 22271) (RC83) Fix baked models unable to rebake
|
2019-04-19 10:44:54 -07:00 |
|
Shannon Romano
|
4962bc8c10
|
Merge pull request #15395 from SamGondelman/oven
Case 22213: Fix materialJSON paths in domain baker
|
2019-04-19 10:39:42 -07:00 |
|
sabrina-shanman
|
7333b02f34
|
Fix model processing occurring on main thread
|
2019-04-19 09:48:30 -07:00 |
|
Shannon Romano
|
d5ab49c64c
|
Merge pull request #15402 from sabrina-shanman/hfm_bug_model-materials_master
(case 22216) Fix Interface not loading some baked models correctly
|
2019-04-19 08:53:40 -07:00 |
|
Olivier Prat
|
7d412f9109
|
Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias.
|
2019-04-19 11:03:43 +02:00 |
|
Sam Gondelman
|
2604afa454
|
Merge pull request #15396 from SamGondelman/oven2
Case 22244: Fix oven crash (RC83)
|
2019-04-18 20:22:36 -07:00 |
|
SamGondelman
|
27f1255899
|
fix transparent textures on baked assets
(cherry picked from commit b89dbf8346 )
|
2019-04-18 11:23:45 -07:00 |
|
Olivier Prat
|
39d03ce87a
|
Removed magic number
|
2019-04-18 19:19:38 +02:00 |
|
SamGondelman
|
0d914a695b
|
wip
|
2019-04-18 09:06:02 -07:00 |
|
Olivier Prat
|
9d0706ec8b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadow
|
2019-04-18 11:06:35 +02:00 |
|
Olivier Prat
|
3cb9c518ea
|
Exposed max shadow distance and a shadow bias scale parameter in graphics::Light
|
2019-04-18 11:06:12 +02:00 |
|
sabrina-shanman
|
d80b40e5a5
|
Fix baked FSTs unable to be rebaked by creating an FST in the original
output folder
|
2019-04-17 16:37:01 -07:00 |
|
Shannon Romano
|
bbab0b59b7
|
Merge pull request #15332 from raveenajain/gltf_brainstem_fix
Case 22060 fix model
|
2019-04-17 16:29:25 -07:00 |
|
sabrina-shanman
|
693cdabc2c
|
Small style fix for materialID bounds check in FBXSerializer_Mesh.cpp
|
2019-04-17 13:26:19 -07:00 |
|
sabrina-shanman
|
53f74abd49
|
Fix another Interface issue loading baked models
|
2019-04-17 13:24:04 -07:00 |
|
sabrina-shanman
|
343b853b59
|
Fix Interface not loading some baked models correctly
|
2019-04-17 13:24:04 -07:00 |
|
sabrina-shanman
|
b711ee8b8a
|
Fix MaterialBaker not including names in baked multi-materials
|
2019-04-17 13:24:04 -07:00 |
|
raveenajain
|
2fab5a0945
|
parents, skeleton, break fix
|
2019-04-17 21:14:44 +01:00 |
|
Shannon Romano
|
da314694b4
|
Merge pull request #15271 from amantley/overrideHandAnimsSquashed
Allow Hand Animations to be Overridden
|
2019-04-17 11:53:41 -07:00 |
|
Shannon Romano
|
5d1c1010c5
|
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
|
2019-04-17 11:43:12 -07:00 |
|
Sam Gateau
|
e6c76cdb19
|
Merge pull request #15329 from Zvork/amc
case 22219: Improved ambient maps
|
2019-04-17 10:20:53 -07:00 |
|
amantley
|
035c8a687d
|
fixed merge conflict
|
2019-04-17 10:16:39 -07:00 |
|
raveenajain
|
104ed758b9
|
re-order nodes, cluster update
|
2019-04-17 17:52:48 +01:00 |
|
Shannon Romano
|
f2069a2cd7
|
Merge pull request #15344 from amantley/bugTwoBoneOverFlow
Fixed out of range error in AnimTwoBoneIK
|
2019-04-17 09:51:09 -07:00 |
|
Olivier Prat
|
3fc711dba2
|
Added opacity mask to shadow casters
|
2019-04-17 12:35:24 +02:00 |
|
Olivier Prat
|
5d7b149a9e
|
Switched to clamped tangent for shadow slope bias
|
2019-04-17 11:12:59 +02:00 |
|
Olivier Prat
|
ae20a5d439
|
Fixed crash in debugShadow.js
|
2019-04-17 09:47:33 +02:00 |
|
SamGondelman
|
2d5cfbf4f5
|
fix oven crash
|
2019-04-16 15:16:26 -07:00 |
|
Shannon Romano
|
50f39e88d6
|
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check
Better head vs camera checks for avatar head cauterization
|
2019-04-16 15:07:46 -07:00 |
|
Shannon Romano
|
517710bcb8
|
Merge pull request #15388 from r3tk0n/running-fix
Case 22192: Adjust run speed constants.
|
2019-04-16 14:51:23 -07:00 |
|
Shannon Romano
|
7de56092f8
|
Merge pull request #15376 from SimonWalton-HiFi/delayed-node-adds-tweaks
Clear delayed Node-adds upon restart
|
2019-04-16 11:27:15 -07:00 |
|
Shannon Romano
|
4b91363226
|
Merge pull request #15375 from SimonWalton-HiFi/pingpunch-lower-rate
Increase ping interval for unconnected Nodes
|
2019-04-16 11:22:30 -07:00 |
|
SamGondelman
|
23918258d9
|
fix materialJSON paths in domain baker
|
2019-04-16 10:30:09 -07:00 |
|
r3tk0n
|
d0abb86366
|
Reversed costants because no sleep. >_<
|
2019-04-15 17:26:22 -07:00 |
|
Shannon Romano
|
4d255fce93
|
Merge pull request #15373 from sabrina-shanman/hfm_crash_textures
(case 21906) Fix TextureBaker failures and heap corruption in MaterialBaker
|
2019-04-15 15:12:39 -07:00 |
|
raveenajain
|
f458427067
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_brainstem_fix
|
2019-04-15 12:59:43 -07:00 |
|
raveenajain
|
3c84a46cba
|
update how nodes are initially parsed
|
2019-04-15 20:27:54 +01:00 |
|
r3tk0n
|
12d7e35722
|
Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release.
|
2019-04-15 10:56:07 -07:00 |
|