Commit Graph

588 Commits

Author SHA1 Message Date
Michael Trepka
f55bfcde0c Added Mac TADP installer to Engine/Extras/Android
[CL 2400934 by Michael Trepka in Main branch]
2015-01-08 10:14:48 -05:00
Thomas Sarkanen
4a3e3773a8 FText key stablization & key editing
FText DisplayString shared ptrs are persisted across property edits. This preserves their entry in the live table and also updates the string that the entry points to. We call GetString() to update the hashed value as persisting the DisplayString means that its location in the table is preserved.
On serialization, a valid key is still found in the live table for the display string, so the key is preserved.
Added funtionality to the property editor to allow key editing and re-generation so any key conflicts can be resolved in the future.

UE-5350 - As a translator, I would like the editor tutorial text to preserve it's history between changes in order to greatly improve the translation workflow.

Reviewed by Saul.Abreu

[CL 2400879 by Thomas Sarkanen in Main branch]
2015-01-08 09:26:03 -05:00
bruce nesbit
efa71c33f2 Merging 2396257 into main (Advancved vehicle blueprint template)
[CL 2400863 by bruce nesbit in Main branch]
2015-01-08 09:02:39 -05:00
bruce nesbit
797e395e42 Merging 2396243 to main. (Third person blueprint template refactor)
[CL 2400827 by bruce nesbit in Main branch]
2015-01-08 08:23:05 -05:00
bruce nesbit
7ded6f7324 Merging 2396255 to main (Twin stick blueprint template refactor)
[CL 2400825 by bruce nesbit in Main branch]
2015-01-08 08:21:40 -05:00
bruce nesbit
2e6f801ff8 Merging 2396254 to main (Topdown blueprint template refactor)
[CL 2400822 by bruce nesbit in Main branch]
2015-01-08 08:07:05 -05:00
bruce nesbit
0771837523 Merging 2396248 to main (2D side scroller blueprint template refactor)
[CL 2400821 by bruce nesbit in Main branch]
2015-01-08 08:06:21 -05:00
bruce nesbit
7fbf2442a2 Merging 2396253 to main (Side Scroller blueprint template refactor)
[CL 2400820 by bruce nesbit in Main branch]
2015-01-08 08:02:05 -05:00
bruce nesbit
0b21aa8724 Merging 2396240 into main (Rolling blueprint template)
[CL 2400806 by bruce nesbit in Main branch]
2015-01-08 07:13:37 -05:00
Sungjin Hong
566e769596 #loc UE4DocKor
[CL 2400801 by Sungjin Hong in Main branch]
2015-01-08 06:57:33 -05:00
bruce nesbit
166b509884 Merging 2396252 to main (Puzzle blueprint template refactor)
[CL 2400800 by bruce nesbit in Main branch]
2015-01-08 06:57:16 -05:00
bruce nesbit
1ab75cd8a8 Merging 2396251 to main (Flying blueprint template refactor)
[CL 2400795 by bruce nesbit in Main branch]
2015-01-08 06:45:59 -05:00
Ryan Brucks
d9c30b3178 new test content
[CL 2400377 by Ryan Brucks in Main branch]
2015-01-07 17:51:11 -05:00
ryan brucks
7163ff5824 added new matlayerblend function for normals
[CL 2400303 by ryan brucks in Main branch]
2015-01-07 17:20:17 -05:00
Chris Babcock
4eff2db754 Protect against IAP not enabled in onActivityResult
#android
#ue4
#codereview Terence.Burns

[CL 2400223 by Chris Babcock in Main branch]
2015-01-07 16:20:04 -05:00
UnrealBot
e446fc021c Snapshot for changelist 2400041.
[CL 2400041 in Main branch]
2015-01-07 16:53:33 -05:00
Saul Abreu
e9b412f2e4 Deleted ICU data from the old location at Engine/Content/Localization/ICU, since it now resides in Engine/Content/Internationalization.
[CL 2399960 by Saul Abreu in Main branch]
2015-01-07 12:34:30 -05:00
Ian Shadden
be37ae3257 #UE4 DOCS: fixed the tutorial not auto opening the BP Interfaces asset
[CL 2399953 by Ian Shadden in Main branch]
2015-01-07 12:22:26 -05:00
Mieszko Zielinski
558178f6c6 Fixed a name of a friend in SPECIAL THANKS part of the credits #UE4
[CL 2399837 by Mieszko Zielinski in Main branch]
2015-01-07 10:15:31 -05:00
bruce nesbit
f048fe5f87 Merging 2396258 into main from 4.7.
(Refactored FirstPerson blueprint template)

[CL 2399718 by bruce nesbit in Main branch]
2015-01-07 06:21:52 -05:00
UnrealBot
3c867079d5 Rebuilt binaries for promoted changelist 2398417.
[Promoted CL 2398417 in Main branch]
2015-01-06 17:17:09 -05:00
Michael Trepka
71af74ace1 Create libmsvcrt.dylib symlink in bundled Mono's lib folder to temporarily workaround some issues with Mono not being able to find it
[CL 2398916 by Michael Trepka in Main branch]
2015-01-06 13:59:58 -05:00
Rene Rivera
24d05774d3 [UE-7113] Don't use deprecated API for device unlocking on OS >= 3.2.
[CL 2398815 by Rene Rivera in Main branch]
2015-01-06 12:16:41 -05:00
James Moran
400cb2a51b Fix for HTML5 failing to give useful error messages before JS is completely parsed.
[CL 2398601 by James Moran in Main branch]
2015-01-06 06:44:34 -05:00
Richard TalbotWatkin
3d132f3e1b Added socket snap to vertex and socket metadata. Merged pull request, adapted to latest build, and added feature to set orientation of the socket to the normal of the selected vertex.
#jira UE-4621 - GitHub 200 : Socket snap to vertex and socket meta data
#github Pull request #200

[CL 2398522 by Richard TalbotWatkin in Main branch]
2015-01-06 04:14:48 -05:00