diff --git a/.gitignore b/.gitignore index 7efc294..ffe8c99 100755 --- a/.gitignore +++ b/.gitignore @@ -1,56 +1,2 @@ -Binaries/ -DerivedDataCache/ -Intermediate/ -Saved/ -Rama/ -Build/ -*.pdb -*.sdf -*.opensdf -*.sln -*.suo -*.opendb - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp -*.pdb - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon -# Thumbnails -._* - -# Files that might appear on external disk -.Spotlight-V100 -.Trashes - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk +Binaries +Intermediate diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 465b976..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,20 +0,0 @@ -Copyright 2020 by Nathan "Rama" Iyer - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 180f4cf..c7628fd 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,2 @@ # VictoryPlugin -Rama's Victory Blueprint Library -100+ Extra Blueprint Nodes For you! - -UE4 Forum Link ~ Victory BP Library Thread ~ https://forums.unrealengine.com/development-discussion/blueprint-visual-scripting/4014-39-rama-s-extra-blueprint-nodes-for-you-as-a-plugin-no-c-required - - - -# Software License - -https://forums.unrealengine.com/development-discussion/blueprint-visual-scripting/4014-39-rama-s-extra-blueprint-nodes-for-you-as-a-plugin-no-c-required?p=1718286#post1718286 - -♥ - -Rama diff --git a/Resources/Thumbs.db b/Resources/Thumbs.db new file mode 100644 index 0000000..c37cb4e Binary files /dev/null and b/Resources/Thumbs.db differ diff --git a/Source/VictoryBPLibrary/Private/VictoryBPFunctionLibrary.cpp b/Source/VictoryBPLibrary/Private/VictoryBPFunctionLibrary.cpp index d2d3b03..9fb4850 100644 --- a/Source/VictoryBPLibrary/Private/VictoryBPFunctionLibrary.cpp +++ b/Source/VictoryBPLibrary/Private/VictoryBPFunctionLibrary.cpp @@ -4150,7 +4150,9 @@ UTexture2D* UVictoryBPFunctionLibrary::LoadTexture2D_FromDDSFile(const FString& /* Add new mip */ else { - FTexture2DMipMap* Mip = new( Texture->PlatformData->Mips ) FTexture2DMipMap( ); + //FTexture2DMipMap* Mip = new( Texture->PlatformData->Mips ) FTexture2DMipMap( ); + FTexture2DMipMap* Mip = new FTexture2DMipMap(); + Texture->PlatformData->Mips.Add(Mip); Mip->SizeX = CurrentWidth; Mip->SizeY = CurrentHeight; @@ -5404,8 +5406,8 @@ void UVictoryBPFunctionLibrary::GenericArray_Sort(void* TargetArray, const FArra UObject* LeftObject = ObjectProperty->GetObjectPropertyValue(ArrayHelper.GetRawPtr(j)); UObject* RightObject = ObjectProperty->GetObjectPropertyValue(ArrayHelper.GetRawPtr(j + 1)); - FProperty* LeftProperty = FindField(LeftObject->GetClass(), VariableName); - FProperty* RightProperty = FindField(RightObject->GetClass(), VariableName); + FProperty* LeftProperty = FindFProperty(LeftObject->GetClass(), VariableName); + FProperty* RightProperty = FindFProperty(RightObject->GetClass(), VariableName); if (LeftProperty && RightProperty) { @@ -5426,7 +5428,7 @@ void UVictoryBPFunctionLibrary::GenericArray_Sort(void* TargetArray, const FArra if (const FStructProperty* StructProperty = Cast(ArrayProp->Inner)) { - Property = FindField(StructProperty->Struct, VariableName); + Property = FindFProperty(StructProperty->Struct, VariableName); } else { diff --git a/VictoryBPLibrary.uplugin b/VictoryBPLibrary.uplugin index 3278518..3e9fa09 100644 --- a/VictoryBPLibrary.uplugin +++ b/VictoryBPLibrary.uplugin @@ -1,38 +1,33 @@ { - "FileVersion" : 3, - "Version" : 1, - "VersionName" : "1.0", - "FriendlyName" : "Victory Plugin", - "Description" : "120+ Custom Blueprint Nodes For You! <3 Rama", - "Category" : "Rama", - "CreatedBy" : "Rama", - "CreatedByURL" : "http://www.ue4code.com", - "DocsURL" : "http://www.ue4code.com", - "MarketplaceURL" : "http://www.ue4code.com", - "SupportURL" : "http://www.ue4code.com", - "EnabledByDefault" : true, - "CanContainContent" : false, - "IsBetaVersion" : false, - "Installed" : true, - "RequiresBuildPlatform" : false, - "Modules" : - [ + "FileVersion": 3, + "Version": 1, + "VersionName": "1.0", + "FriendlyName": "Victory Plugin", + "Description": "120+ Custom Blueprint Nodes For You! <3 Rama", + "Category": "Rama", + "CreatedBy": "Rama", + "CreatedByURL": "http://www.ue4code.com", + "DocsURL": "http://www.ue4code.com", + "MarketplaceURL": "http://www.ue4code.com", + "SupportURL": "http://www.ue4code.com", + "EngineVersion": "4.26.0", + "CanContainContent": false, + "Installed": true, + "Modules": [ { - "Name" : "VictoryBPLibrary", - "Type" : "Runtime", - "LoadingPhase" : "PreDefault", - "WhitelistPlatforms" : - [ + "Name": "VictoryBPLibrary", + "Type": "Runtime", + "LoadingPhase": "PreDefault", + "WhitelistPlatforms": [ "Win64", - "Win32", + "Win32" ] } ], - "Plugins" : - [ + "Plugins": [ { "Name": "ApexDestruction", "Enabled": true } ] -} +} \ No newline at end of file