Commit Graph

9461 Commits

Author SHA1 Message Date
graeme thornton
62991995ea UBT: When generating visual studio project files, projects with multiple editor targets will use the default editor target config setting, if it exists, to determine which editor target should be added to the main project file. All others will generate separate projects inside the VS solution.
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 13115425 via CL 13115430 via CL 13115434 via CL 13115440 via CL 13115446
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13115454 by graeme thornton in Main branch]
2020-04-30 10:55:26 -04:00
ori cohen
2e5c6ff31b Added desync concept to PT particles
#ROBOMERGE-SOURCE: CL 13114586 via CL 13114588 via CL 13114590
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13114592 by ori cohen in Main branch]
2020-04-30 09:43:12 -04:00
ben marsh
4605c70651 Remove unused test code.
#jira

#ROBOMERGE-SOURCE: CL 13113744 via CL 13113745 via CL 13113747
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13113750 by ben marsh in Main branch]
2020-04-30 08:09:34 -04:00
chris caulfield
cf6bea8aea Chaos - linear breakable joint unit test
#rb none

#ROBOMERGE-SOURCE: CL 13077181 via CL 13086727 via CL 13086908 via CL 13087105
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13087171 by chris caulfield in Main branch]
2020-04-29 21:31:41 -04:00
chris caulfield
7849bd50fe Chaos - fix headlesschaos compile
#rb none

#ROBOMERGE-SOURCE: CL 13076779 via CL 13076785 via CL 13076790 via CL 13076795
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13076814 by chris caulfield in Main branch]
2020-04-29 20:06:31 -04:00
ryan durand
6e84939c40 Wrapping CRC API URL in quotes to treat it as a string.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 13072767 via CL 13072777 via CL 13072783 via CL 13072864
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13072869 by ryan durand in Main branch]
2020-04-29 15:03:00 -04:00
josh adams
780e81649c - XboxOne Build/Resources files moving to PlatformExtensions
#rb david.harvey
#rnx

#ROBOMERGE-SOURCE: CL 13072487 via CL 13072492 via CL 13072497
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13072502 by josh adams in Main branch]
2020-04-29 14:37:34 -04:00
jeff newquist
ba5f688d8c Move Build platform files to platform extensions folder
#rb none
[FYI] josh.adams, ben.woodhouse
#rnx

#ROBOMERGE-SOURCE: CL 13072249 via CL 13072256 via CL 13072267
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13072279 by jeff newquist in Main branch]
2020-04-29 14:23:13 -04:00
ori cohen
b1f0577512 Fix another edge case with resim as slave
[FYI] David.Ratti

#ROBOMERGE-SOURCE: CL 13064895 via CL 13064897 via CL 13064899
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13064901 by ori cohen in Main branch]
2020-04-29 09:13:06 -04:00
donal maccarthy
77bf902ff5 Allow Shared PCHs in non-engine modules
#ROBOMERGE-SOURCE: CL 13064814 via CL 13064821 via CL 13064829 via CL 13064834 via CL 13064849
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13064854 by donal maccarthy in Main branch]
2020-04-29 09:02:35 -04:00
carlmagnus nordin
4338cf8025 Removed overly pessimistic error message when running UAT with -iostore without -pak
#rnx
#rb per.larsson

#ROBOMERGE-SOURCE: CL 13063865 via CL 13063866 via CL 13064692 via CL 13064764
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13064818 by carlmagnus nordin in Main branch]
2020-04-29 09:00:39 -04:00
andrew grant
65ec5074e4 Fix for Android builds not being discovered in Gauntlet
- Typo where when trying to remove 32-bit Android builds in favor of 64-bit builds we were setting them back to 32-bit.

#rb na
[FYI] josh.engebretson

#ROBOMERGE-SOURCE: CL 13062275 via CL 13062276 via CL 13062278 via CL 13062280
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13062281 by andrew grant in Main branch]
2020-04-28 21:21:57 -04:00
michael trepka
b8c8c8398f Use relative paths where possible when linking on Mac. This solves the "Argument list too long" error during linking
[FYI] Peter.Sauerbrei

#ROBOMERGE-SOURCE: CL 13060611 via CL 13061159 via CL 13061215 via CL 13061321
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13061378 by michael trepka in Main branch]
2020-04-28 18:54:19 -04:00
ori cohen
88ea23cf77 Fix some edge cases in resim of slave objects that are sleeping
[FYI] David.Ratti

#ROBOMERGE-SOURCE: CL 13058949 via CL 13058954 via CL 13058957
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13058958 by ori cohen in Main branch]
2020-04-28 14:32:46 -04:00
marc audy
0aff069f59 Move headers in to place and delete stale/unused generated headers asynchronously while moving on to parsing next package
#rb Steve.Robb
#jira
#rnx

#ROBOMERGE-SOURCE: CL 13055676 via CL 13055683 via CL 13055702
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13055705 by marc audy in Main branch]
2020-04-28 12:02:34 -04:00
steven barnett
8c7f178401 Fix runtime crash in PBDCollisionConstraints... Removed check(false) for condition which is actually valid for destruction. re-added early-out when a shape has no material assigned. Updated tests to have empty unique material arrays.
#ROBOMERGE-SOURCE: CL 13055492 via CL 13055494 via CL 13055500 via CL 13055504
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13055505 by steven barnett in Main branch]
2020-04-28 11:43:05 -04:00
ori cohen
01dceee24f Make it so non FullResim particles automatically have their dynamics reapplied
[FYI] David.Ratti

#ROBOMERGE-SOURCE: CL 13054947 via CL 13054948 via CL 13054957
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13054965 by ori cohen in Main branch]
2020-04-28 10:27:14 -04:00
ben salem
4fb6536162 Lower a warning in the gif-ify process in gauntlet to an info like all of the rest of the errors. Also, cause image conversion not to delete the source item when it has the same location as the post conversion file.
#ROBOMERGE-SOURCE: CL 13053795 via CL 13053796 via CL 13053797 via CL 13053798 via CL 13053799
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13053800 by ben salem in Main branch]
2020-04-28 00:33:26 -04:00
graeme thornton
2718631fa8 Strip comments from ini files when staging
josh.adams
[FYI] joe.barrett

#ROBOMERGE-SOURCE: CL 13050771 via CL 13052127 via CL 13052156 via CL 13052203 via CL 13052241
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13052267 by graeme thornton in Main branch]
2020-04-27 18:44:44 -04:00
chris babcock
c8135249c6 Add Opus libraries for Android x86
#jira UE-85785
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 13051799 in //UE4/Release-4.25/... via CL 13051805 via CL 13051811
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13051816 by chris babcock in Main branch]
2020-04-27 17:59:56 -04:00
marc audy
e235ae1375 Improve header generation time by ~4 seconds
#rb
#rnx
#jira

#ROBOMERGE-SOURCE: CL 13050907 via CL 13050910 via CL 13050915
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13050917 by marc audy in Main branch]
2020-04-27 17:17:39 -04:00
ori cohen
1c4b72ea70 Added resim type. Made it so simulated objects don't invalidate over and over. Added simplest version of resim as slave, missing pre forces and various edge cases
[FYI] Dave.Ratti
#rb Satchit.Subramanian

#ROBOMERGE-SOURCE: CL 13050815 via CL 13050830 via CL 13050834
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13050836 by ori cohen in Main branch]
2020-04-27 17:03:37 -04:00
ben marsh
63cc69c46e Fix exception when packaging projects, due to UAT not setting TargetRules.File.
#jira

#ROBOMERGE-SOURCE: CL 13047766 via CL 13047771 via CL 13047773
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13048573 by ben marsh in Main branch]
2020-04-27 13:06:51 -04:00
ben marsh
ea42e32cee MemoryProfiler2: Search for source files in platform extension directories.
#jira

#ROBOMERGE-SOURCE: CL 13045554 via CL 13045555 via CL 13045557
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13048371 by ben marsh in Main branch]
2020-04-27 12:58:39 -04:00
ben marsh
bd6ee509b1 Put Gauntlet platform files in the correct subfolder.
#jira

#ROBOMERGE-SOURCE: CL 13045524 via CL 13045525 via CL 13045526
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13048365 by ben marsh in Main branch]
2020-04-27 12:58:26 -04:00