Commit graph

78097 commits

Author SHA1 Message Date
Olivier Prat
3cb9c518ea Exposed max shadow distance and a shadow bias scale parameter in graphics::Light 2019-04-18 11:06:12 +02:00
Sam Gateau
3d78592bb8 Adding more style widgets andbringing luci1 into the panels of luci2 2019-04-18 00:19:19 -07:00
Wayne Chen
3b1751f2c9 adding proper logic for shield icon behavior 2019-04-17 20:19:21 -07:00
Sam Gateau
0359caec8d Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-04-17 18:22:52 -07:00
Sam Gateau
9873c10353 Better canvas ICon qml and activation of the jobs 2019-04-17 17:58:48 -07:00
Wayne Chen
7d38cd9290 change text to display 2019-04-17 17:25:02 -07:00
Shannon Romano
6c15719618
Merge pull request #15310 from danteruiz/fix-keyboard-scaling
Case 21513: Keyboad doesn't scale to avatar after reloading content
2019-04-17 16:59:42 -07: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
SamGondelman
e7d12dc4f8 fix snapshots and preview 2019-04-17 15:43:05 -07:00
Thijs Wenker
dc9f8895f8 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties
# Conflicts:
#	scripts/system/html/js/entityProperties.js
2019-04-18 00:21:11 +02: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
Anthony Thibault
b4a993bec6
Merge pull request #15033 from hyperlogic/feature/coding-standard
Added coding standard file to repo
2019-04-17 11:06:07 -07:00
SamGondelman
54d7bde91a grid ignorePickIntersection 2019-04-17 10:56:55 -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
Sam Gateau
92c1fd69c1 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-17 10:09:20 -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
David Back
d1f451ddcc
Merge pull request #15354 from dback2/undoEditOrderFix
Case 20960: Fix Create's undo edit order
2019-04-17 09:28:56 -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
Sam Gateau
4ce7d75720 FInding a path 2019-04-16 23:38:40 -07:00
Sam Gateau
f6001c178d Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-04-16 18:43:30 -07:00
Sam Gateau
f2b747a68d Adding indentation of the folder in the header and refining background color 2019-04-16 18:15:00 -07:00
luiscuenca
1ad197df26
Send avatar skeleton trait 2019-04-16 17:40:43 -07:00
unknown
2839879657 Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix 2019-04-16 15:26:47 -07:00
Shannon Romano
ec22f7847e
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster
Case 22130: PR 15366 changes from v82 to Master
2019-04-16 15:17:08 -07: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
amantley
ba9b539bd2 removed hand fbx files that will be used in the future for default hand overrides 2019-04-16 14:12:32 -07:00
Shannon Romano
adbcbe6585
Merge pull request #15381 from dback2/materialTargetMasterFollowup2
Case 22195: PR 15380 changes from v82 to Master
2019-04-16 11:48:07 -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
David Rowe
7af55de43d Messages JSDoc update 2019-04-16 14:20:40 +12:00
r3tk0n
d0abb86366 Reversed costants because no sleep. >_< 2019-04-15 17:26:22 -07:00
David Rowe
60298245da Menu JSDoc update 2019-04-16 11:24:24 +12:00
Sam Gateau
db9df76337
Merge pull request #15391 from sabrina-shanman/hfm_disable-embedded-materials_master
(master) Disable baking of embedded material textures in material entities
2019-04-15 15:51:41 -07:00
Shannon Romano
3500a1b19e
Merge pull request #15386 from danteruiz/fix-bubble
Case 22203: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields of RC83
2019-04-15 15:15:53 -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
sabrina-shanman
8f87afd7db Disable baking of embedded material textures in material entities 2019-04-15 15:00:14 -07:00