Commit Graph

1397 Commits

Author SHA1 Message Date
Ben Marsh
bf75048443 [INTEGRATE] Change 2411119 by Matt.Kuhlenschmidt@matt_kuhlenschmidt_main on 2015/01/19 13:39:29
Fixed up the details panel name area to be aware of in world component editing.
	Fixed up usage of the details panel name area to use new enum based usage flag for name areas

[CL 2419254 by Ben Marsh in Main branch]
2015-01-26 17:14:50 -05:00
James Moran
c5c96c5855 Unreal Frontend Linker fix. Misplaced #endif
[CL 2419040 by James Moran in Main branch]
2015-01-26 14:52:47 -05:00
James Moran
4a715d8eaf Crash fix for missing html5 ini values.
[CL 2418736 by James Moran in Main branch]
2015-01-26 12:02:40 -05:00
James Moran
c5b4ca076e HTML5 SDK settings are now set via the Editor.
Android SDK path backslash duplication fix.
Fix for User inis not saving array properties correctly.

#codereview Ankit.Khare, Josh.Adams

[CL 2418611 by James Moran in Main branch]
2015-01-26 10:22:57 -05:00
Richard TalbotWatkin
9b3ee3dfb8 Fixed spurious notification when attempting to assign the Project Thumbnail (in Project Settings) to itself.
#jira UE-8070 - Display File path for Project Thumbnail in Project Settings

[CL 2418401 by Richard TalbotWatkin in Main branch]
2015-01-26 03:29:44 -05:00
Peter Sauerbrei
392b4a54c8 CIS fix for Mac and Slate Stats
#mac

[CL 2417522 by Peter Sauerbrei in Main branch]
2015-01-23 19:08:15 -05:00
Wes Hunt
cc4ba94e58 Fix a block of code not surrounded by SLATE_STATS
#codereview peter.sauerbrei

[CL 2417484 by Wes Hunt in Main branch]
2015-01-23 18:32:55 -05:00
Wes Hunt
5e497c92d4 Added custom slate stats, removed all but top level UE4 slate stats. #BUN
* See SlateStats.h for details on the new system, which allows for full hierarchical profiling with limited overhead.
* Moved SWidget::GetVisibility() out of line so we can instrument it without a full recompile.
* Widget debug info now uses FName to store the line number of the file. Keeps it in one place and the new stats system can utilize it as an FName.
* Exposed SWidget CreatedInFile debug info as an FName so new stats system can use it.
* FSlateVertex no longer uses FVector4, which is an aligned struct. Switched to float[4] instead. Goes from 48 to 36 bytes.
#codereview:nick.atamas,matt.kuhlenschmidt

[CL 2417281 by Wes Hunt in Main branch]
2015-01-23 16:49:16 -05:00
Jaroslaw Surowiec
3071ee1789 Profiler - Fixed Filters'n'Presets not being updated
[CL 2416959 by Jaroslaw Surowiec in Main branch]
2015-01-23 11:46:28 -05:00
Robert Manuszewski
37d4f02451 Fixing hot-reload not updating values on DSO's properties.
UE-8067

[CL 2416765 by Robert Manuszewski in Main branch]
2015-01-23 08:34:49 -05:00
Robert Jones
653f45a33a Adding Java_Home support to ini files for Android building.
[CL 2415356 by Robert Jones in Main branch]
2015-01-22 11:14:12 -05:00
Chris Wood
a0b6f674a9 Integrate - UE4-Fortnite => UE4
CL 2407159 - Fortnite/Portal: FriendsAndChat - Changed friends list background to the regular Fortnite window background pattern.
CL 2413625 - Fortnite/Portal: FriendsAndChat - Converted friend action buttons/menus into SFriendsAndChatCombo buttons and matched visual style to the online status button. Added placeholder versions to Portal so UI is working as before.

[CL 2415354 by Chris Wood in Main branch]
2015-01-22 11:12:18 -05:00
Josh Adams
02d7bd14b5 - No longer using curly brackets with {PROJECT_NAME} default, messes up in editor
- Fixed some tooltips
- Missed a file in changelist 2414384

#codereview peter.sauerbrei

[CL 2415309 by Josh Adams in Main branch]
2015-01-22 09:52:25 -05:00
Jaroslaw Surowiec
ea397fe6a8 CrashDebugHelper - Added support to processing crashes where builds are not placed in P4, but only in the network drive
[CL 2415217 by Jaroslaw Surowiec in Main branch]
2015-01-22 08:03:55 -05:00
Peter Sauerbrei
dd68f2131d updates to generate plist as part of a build which moves all of the plist data in to the ini files
UEPLAT-114
#ios

[CL 2414979 by Peter Sauerbrei in Main branch]
2015-01-22 00:20:01 -05:00
Josh Adams
9cf8c67c77 - Generate AndroidManifest.xml from ProjectSettings
- Moved some Android settings to ProjectSettings, re-enabled SDK settings
- Removed SigningConfig.xml, and moved those settings into project settings
- Added concept of NotForLicensees and NoRedist engine and project config settings
- Removed BaseInternalGame.ini, replaced with NotForLicensees/BaseGame.ini
- Moved User*.ini to end of .ini hierarchy
- Added support for CLASS_GlobalUserConfig, so their settings will be saved to <AppData>/.../User*.ini (useful for SDK paths, etc)
- Enabled AndroidPlatformEditor module on Mac
- Changed Mac Build.sh to allow for Android on the commandline (just pass through if it's not an Xcode platform name)
- Iterative Android packaging now looks at just the important .ini sections, NOT entire .ini files

#codereview jamie.dale,james.moran,michael.trepka,robert.jones,chris.babcock

[CL 2413870 by Josh Adams in Main branch]
2015-01-21 11:17:55 -05:00
Dmitry Rekman
d697b470cf Fix incorrect case in header file name.
#codereview Robert.Jones

[CL 2413800 by Dmitry Rekman in Main branch]
2015-01-21 10:26:05 -05:00
Robert Jones
f018da7ec4 - Fixing variable case in SDKSetup function
[CL 2413702 by Robert Jones in Main branch]
2015-01-21 09:13:13 -05:00
Chris Babcock
3edc2a3401 Fixed Android SDKPath fallback to ANDROID_HOME environment variable
#ue4
#android
#codereview Rob.Jones,Josh.Adams

[CL 2412728 by Chris Babcock in Main branch]
2015-01-20 15:20:24 -05:00
Jack Porter
db8a6c14e0 Material compiler CustomOutput
Landscape Grass material output node
LandscapeGrassType asset and factory

[CL 2412252 by Jack Porter in Main branch]
2015-01-20 11:04:04 -05:00
Robert Jones
b5a273a278 SDK path editing in editor.
- Added class to hold values (AndroidSDKSettings)
- Added code to Android editor module to setup the values on load
- Changed device detection so that the thread is always started and the SDK path can be changed on the fly
- Changed Platform Target Management Module so that a single platform can be checked via UBT
- Settings can now be sourced from an ini file via temp direct reading code (auto seralisation is disabled until later changes are made)
-- Settings currently not exposed in editor

- Added Mac Environment var setting support

Unreleated
- Envars can now be passed down to process start points in tools

#codereview michael.trepka

[CL 2412194 by Robert Jones in Main branch]
2015-01-20 10:05:42 -05:00
Jaroslaw Palczynski
adecd4aaad UHT: Allows defining multiple UCLASSes in one header file.
[CL 2412156 by Jaroslaw Palczynski in Main branch]
2015-01-20 09:33:54 -05:00
Thomas Sarkanen
be75fe1eca Updated revision display to display strings rather than revision indices
API break: added new pure virtual ISourceControlProvider::UsesChangelists()
API break: added new pure virtual ISourceControlState::FindHistoryRevision(const FString&)
API break: added new pure virtual ISourceControlRevision::GetRevision()

Implementing a Git provider requires us to be able to display revisions that are not indices as Git revisions are hashes. This updates the relvant code to allow us to display these revisions correctly.

[CL 2411986 by Thomas Sarkanen in Main branch]
2015-01-20 05:48:14 -05:00
Ankit Khare
35252ac72f UEPLAT-131 Enable Rocket builds for HTML5.
(Currently just on Win64 host)

#codereview kellan.carr, ben.marsh

[CL 2411843 by Ankit Khare in Main branch]
2015-01-20 01:29:07 -05:00
Bob Tellez
55d87d9b67 #UE4 One more CIS fix. Header includes shifted.
[CL 2411523 by Bob Tellez in Main branch]
2015-01-19 18:04:11 -05:00