diff --git a/.gitattributes b/.gitattributes index 9a986a87..6f62c6ac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ *.bmp -text *.ICO -text *.ico -text +*.zip -text diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp index 3418ca80..f07e81b4 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp @@ -772,7 +772,7 @@ void plInputInterfaceMgr::WriteKeyMap( void ) fprintf(gKeyFile, "#\n"); fprintf(gKeyFile, "# For example, to map Control-Shift-W to Walk Forward\n"); fprintf(gKeyFile, "# your key mapping entry would look like this:\n"); - fprintf(gKeyFile, "# Keyboard.BindAction W_C_S \"Walk Forward\"\n"); + fprintf(gKeyFile, "# Keyboard.BindAction \tW_C_S \t\"Walk Forward\"\n"); fprintf(gKeyFile, "# This also works for console command bindings\n"); diff --git a/Sources/Plasma/PubUtilLib/plSurface/ShaderSrc/AssShader.zip b/Sources/Plasma/PubUtilLib/plSurface/ShaderSrc/AssShader.zip index 065a9d77..40e75b97 100644 Binary files a/Sources/Plasma/PubUtilLib/plSurface/ShaderSrc/AssShader.zip and b/Sources/Plasma/PubUtilLib/plSurface/ShaderSrc/AssShader.zip differ diff --git a/Sources/Tools/MaxComponent/plPhysicalComponents.cpp b/Sources/Tools/MaxComponent/plPhysicalComponents.cpp index f1e22ed5..93233499 100644 --- a/Sources/Tools/MaxComponent/plPhysicalComponents.cpp +++ b/Sources/Tools/MaxComponent/plPhysicalComponents.cpp @@ -1578,7 +1578,7 @@ CLASS_DESC(plPhysSubWorldComponent, gPhysSubWorldDesc, "Subworld", "Subworld", C ParamBlockDesc2 gPhysSubWorldBk ( - plComponent::kBlkComp, _T("Subworld "), 0, &gPhysSubWorldDesc, P_AUTO_CONSTRUCT + P_AUTO_UI, plComponent::kRefComp, + plComponent::kBlkComp, _T("Subworld\t"), 0, &gPhysSubWorldDesc, P_AUTO_CONSTRUCT + P_AUTO_UI, plComponent::kRefComp, //Roll out IDD_COMP_PHYS_SUBWORLD, IDS_COMP_PHYS_SUBWORLD, 0, 0, NULL,