Commit Graph

7 Commits

Author SHA1 Message Date
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
nick darnell
dc83a2239e Make sure we don't crash in CommonInput if the platforms are missing.
#ROBOMERGE-SOURCE: CL 16611053 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16611076 by nick darnell in ue5-release-engine-test branch]
2021-06-09 15:33:09 -04:00
nick darnell
e9b668bb05 CommonInput - Don't try to load alll platforms input data outside of the editor.
#ROBOMERGE-SOURCE: CL 16608006 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16608015 by nick darnell in ue5-release-engine-test branch]
2021-06-09 13:07:10 -04:00
nick darnell
9e0bf96273 Fixing several CIS issues with IWUY.
#ROBOMERGE-SOURCE: CL 16606760 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16606770 by nick darnell in ue5-release-engine-test branch]
2021-06-09 12:12:20 -04:00
nick darnell
c611471f65 CommonInput - Using the new UPlatformSettings, to store per-platform information into an NDA location when each platform is configured. These changes make it so we use the 'real' platform ini name, e.g. There's no more "PC" platform as far as the common input exists for configuring the platforms. So if you setup linux, that's another platform you'd configure. The gamepads are still wonky, they're trying to use platform ini names for gamepad names, going to refactor that so it's not coming from platform names. Made an upgrade path for the old settings that will update and then clear the old configuration. Also removed some settings that were added to DataDrivenPlatformInfo that don't make sense, and updated some platforms that never got the settings to begin with.
Josh.Adams, Michael.Noland, Daren.Cheng
[FYI] Josh.Adams, Michael.Noland, Daren.Cheng

#ROBOMERGE-SOURCE: CL 16605253 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16605300 by nick darnell in ue5-release-engine-test branch]
2021-06-09 10:46:45 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00