Commit Graph

14 Commits

Author SHA1 Message Date
sebastian nordgren
926e5fe8bb Added support for parentheses in EditConditions. Added as a result of a UDN feature request.
[at]lauren.barnes

#ROBOMERGE-AUTHOR: sebastian.nordgren
#ROBOMERGE-SOURCE: CL 18017850 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v885-17909292)

[CL 18017926 by sebastian nordgren in ue5-release-engine-test branch]
2021-11-02 09:24:19 -04:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
jeanmichel dignard
2ce7666d2d Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/...
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v626-10872990)

[CL 10898071 by jeanmichel dignard in Dev-Tools-Staging branch]
2020-01-07 15:54:23 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
sebastian nordgren
fa3f7d6cef Added missing TEXT() macros in unit test code.
#rb none
#rnx

[CL 9967386 by sebastian nordgren in Dev-Editor branch]
2019-11-04 10:02:13 -05:00
sebastian nordgren
cf86a119f9 EditCondition now supports bitflags that use enums. Eg. MyIntProperty & MyEnum::Flag (and negation by tacking on == false).
Flags must be enums with integral values. Powers of two are not checked for to allow for the use of combinations of flags, eg. Foo = 1, Bar = 2, FooAndBar = Foo | Bar.

#rb chris.gagnon

[CL 9580343 by sebastian nordgren in Dev-Editor branch]
2019-10-15 03:46:06 -04:00
sebastian nordgren
5a26ba3922 Added handling of UObject pointers to edit conditions to enable equality, inequality and nullptr checks of UObject pointers in the form of: MyProperty != nullptr, or MyProperty == OtherProperty.
#rb chris.gagnon

[CL 9533510 by sebastian nordgren in Dev-Editor branch]
2019-10-10 10:08:16 -04:00
sebastian nordgren
ddd37ea4cf Fixed crash when using Merge Actors with Replace Source Actors enabled.
Edit conditions are now correctly applied to fields of nested structs.

#jira UE-76079

#rb chris.gagnon

[FYI] jamie.dale

#ROBOMERGE-SOURCE: CL 6969280 in //UE4/Dev-Editor/...
#ROBOMERGE-BOT: ENGINE (Dev-Editor -> Main) (v366-6836689)

[CL 6969287 by sebastian nordgren in Main branch]
2019-06-13 10:10:53 -04:00
sebastian nordgren
4c86ec2917 Fixed crash when using Merge Actors with Replace Source Actors enabled.
Edit conditions are now correctly applied to fields of nested structs.

#jira UE-76079

#rb chris.gagnon

#fyi jamie.dale

#robomerge UE4-Main

[CL 6969280 by sebastian nordgren in Dev-Editor branch]
2019-06-13 10:10:27 -04:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
sebastian nordgren
567f78dfd0 Fixed EditCondition triggering ensures when an EditCondition uses a property that does not exist in a struct (anymore).
Fixed enum value evaluation when a property is stored as a TEnumAsByte. Split EditConditionContext into its own file. Added unit tests using UObject to confirm that edit conditions don't break in the future.

#jira UE-75420

#rb chris.gagnon

#lockdown chris.gagnon

[CL 6829359 by sebastian nordgren in Dev-Editor branch]
2019-06-04 05:48:07 -04:00
sebastian nordgren
2bd1f4e009 Removed optimization pragma.
#rb none

[CL 6662902 by sebastian nordgren in Dev-Editor branch]
2019-05-29 05:45:23 -04:00
sebastian nordgren
069b2fab65 UPROPERTY meta EditCondition now supports a full-fledged expression parser, allowing for multiple conditions to be used in EditConditions.
Previous functionality still works as it did before.

#rb chris.gagnon

[CL 6662859 by sebastian nordgren in Dev-Editor branch]
2019-05-29 05:16:00 -04:00