Commit Graph

197 Commits

Author SHA1 Message Date
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Frank Fella
c0408228de Sequencer - Add support for snapping, and different snapping options.
#codereview matt.kuhlenschmidt

[CL 2377933 by Frank Fella in Main branch]
2014-12-05 14:03:51 -05:00
Mike Beach
3c8b5fb5ea [UE-5075/UE-5070] Adding accept source/target buttons to the merge tool.
#codereview Dan.OConnor

[CL 2376351 by Mike Beach in Main branch]
2014-12-04 15:45:39 -05:00
Gil Gribb
89ad70df9d Merging development branch (CL 2365488) to //depot/UE4/... Engine only, mostly hierarchical foliage
[CL 2376199 by Gil Gribb in Main branch]
2014-12-04 12:41:25 -05:00
Ben Marsh
c7d6d0301c Fixing warnings on build machines. Fonts/Roboto-Italic.ttf doesn't exist in Engine/Content/Slate/Fonts, only Engine/Content/Editor/Slate/Fonts.
#codereview Thomas.Sarkanen

[CL 2370721 by Ben Marsh in Main branch]
2014-11-26 08:26:02 -05:00
Richard TalbotWatkin
6518041cde Implemented some missing Slate Widget styles.
#jira UE-1404 - EDITOR: Viewport options warning Unable to find Slate Widget Style

[CL 2368377 by Richard TalbotWatkin in Main branch]
2014-11-24 12:49:33 -05:00
Nick Darnell
05117ea783 Editor - Adding a new section for just general reusable icons to the slate style.
[CL 2367470 by Nick Darnell in Main branch]
2014-11-21 10:06:53 -05:00
Michael Noland
da8beb7db9 Editor: Add dummy icons to some asset context menu options to provide consistent padding in the sections they appear in
[CL 2366039 by Michael Noland in Main branch]
2014-11-19 23:55:24 -05:00
Martin Wilson
788a750143 Add warning that changes to the preview properties wont be saved into the asset
[CL 2365458 by Martin Wilson in Main branch]
2014-11-19 16:15:49 -05:00
Laurent Delayen
a48d435e94 BranchingPoints refactor:
- BranchingPoints are now regular AnimNotifies, with their MontageTickType set to 'BranchingPoint' instead of 'Queued'.
- We now supported blueprints and AnimNotify_State as branching points!
- Old branching points are converted to custom AnimNotifies.
- Fixed AnimNotify tool tips not showing up.

#codereview lina.halper, benn.gallagher

[CL 2365358 by Laurent Delayen in Main branch]
2014-11-19 15:10:50 -05:00
Chris Gagnon
aebc9054e2 Fix for styles not being loaded in UFE.
[CL 2360841 by Chris Gagnon in Main branch]
2014-11-14 17:33:39 -05:00
Lina Halper
e108fbb56e #Animation Editing Feature
- If you select bone and modify, you can add to the additive layer track
- You can also move curve keys during SIE

[CL 2359126 by Lina Halper in Main branch]
2014-11-13 17:30:49 -05:00
Carlos Cuello
7cbc96c488 [INTEGRATE] UE4-LauncherReleases->UE4 integrate all from launcher releases up to 2353416, including supersearch bar integration, free purchase flow, and various bug fixes
[CL 2357313 by Carlos Cuello in Main branch]
2014-11-12 14:07:04 -05:00
Eric Newman
65fa5864ff Fortnite Dev > Main Integration
Merged CL# 2352617 using UE4-Fortnite-To-UE4

[CL 2355906 by Eric Newman in Main branch]
2014-11-11 10:35:51 -05:00
Andrew Rodham
dba45c6c86 Backing out change to SlateEditorStyle.cpp from CL#2345039 which resulted in missing icons
[CL 2355797 by Andrew Rodham in Main branch]
2014-11-11 09:16:45 -05:00
Michael Noland
6d2b7ff428 Editor: Add LogTimestampMode editor config setting to control how timestamps are displayed in the output log (still defaults to None)
[CL 2354931 by Michael Noland in Main branch]
2014-11-10 15:13:41 -05:00
Ben Cosh
33d058a99a Fix for dark comment colors obscuring text. The text should now select a light or dark foreground color based on the bubble luminance.
#Branche UE4
#Proj GraphEditor

[CL 2353131 by Ben Cosh in Main branch]
2014-11-07 10:49:44 -05:00
Frank Fella
ec05ac91a5 AddContentDialog - A dialog and lower level infrastructure for adding additional content to an existing game. Currently there is only support for the new "feature pack" upack files.
#codereview matt.kuhlenschmidt, nick.atamas

[CL 2353064 by Frank Fella in Main branch]
2014-11-07 09:55:57 -05:00
Justin Sargent
c9d10057e6 Fixed visual regression with scrollbars that prevented certain styling methods.
[CL 2348570 by Justin Sargent in Main branch]
2014-11-04 11:51:50 -05:00
Ben Cosh
3650f14795 This change makes the comment bubbles interactive widgets which allow the user to double click the comment to edit and have extra optional pinning and visibility options.
#UE-2764 - ROCKET: TASK: K2: PUNTABLE: Allow double clicking on comment bubble to edit it.
#Branch UE4
#Proj Engine, UnrealEd, Slate, GraphEditor, BehaviourTreeEditor, EnvironmentQueryEditor, EditorStyle, ReferenceViewer, WorldBrowser

#codereview Nick.Atamas

[CL 2346951 by Ben Cosh in Main branch]
2014-11-03 10:40:57 -05:00
Chris Gagnon
0e6d657c3d Refactor to unify keyboard and controller input and focus.
Native controller navigation support.

[CL 2345039 by Chris Gagnon in Main branch]
2014-10-30 12:29:36 -04:00
sebastian kowalczyk
f85dffb1d0 LogVisualizer - fixed toolbar icons #ue4
[CL 2342361 by sebastian kowalczyk in Main branch]
2014-10-28 11:23:11 -04:00
Jamie Dale
f7430ac704 Initial support for composite fonts for Slate, UMG, and Canvas
Slate now has the concept of composite fonts and font families (via FCompositeFont and FTypeface). A composite font is a font that contains a default font family, as well as any number of sub-font families which should be used for a given set of character ranges. This change will greatly improve the localization support for fonts.

UFont assets can now use two forms of caching "offline" (which is the way they have always worked historically), and "runtime" (which utilizes the Slate font cache to cache glyphs on demand). These runtime cached UFont assets are now the only way to specify which font to use for a UMG widget, and address the previous issues about ensuring that the required font files were staged for your game.

The Slate font cache now works on FFontData instances, rather than filenames. This allows the UFont asset to embed a blob of TTF or OTF font data inside it, rather than require the fonts be loaded from files on disk.

The Canvas text renderer has been updated to support runtime cached UFont assets. This gives our legacy Canvas based tools the same improved font localization support as the rest of the Slate-based editor UI.

UFont asset creation has been changed to use runtime caching by default, and additionally, you can now import a TTF or OTF file via the Content Browser and it will automatically create a UFont asset. If you still want an offline cached UFont asset, you can just change the cache type in the font editor, and the usual font picker dialog will appear and allow you to generate a font texture atlas.

[CL 2342203 by Jamie Dale in Main branch]
2014-10-28 09:02:03 -04:00
Max Preussner
9884344213 Settings: Various improvements to the API
- made public headers compilable individually
- easier access to settings section delegates
- removed module singleton accessor
- moved non-trivial definitions into cpp files
- code & documentation cleanup

#UpgradeNotes:

- instead of ISettingsModule::Get() use FModuleManager::GetModulePtr<ISettingsModule>("Settings")
- instead of using FSettingsSectionDelegates assign delegates directly through the new ISettingsSection methods

[CL 2340711 by Max Preussner in Main branch]
2014-10-27 07:53:18 -04:00
Laurent Delayen
b96f1c8d03 Multi-Montages support
. Slots now belong to a Group. One montage can play at a time per group.
. Removed old Slot and Group name lists and created new Anim Slot Manager. Add, Create Slots and Groups, assign Slots to groups and save changes.
. New Montage assets and Slot nodes default to a valid 'DefaultSlot' so they are functional when created. (Eliminates common mistake of empty slot names).
. Montage tracks and slot nodes picks slots from a combo box of valid entries, no more typing name by hand.
. Montage tracks will warn if not setup properly (different groups used, same slot used multiple times).

#codereview lina.halper

[CL 2340250 by Laurent Delayen in Main branch]
2014-10-24 15:46:54 -04:00