Commit Graph

3128 Commits

Author SHA1 Message Date
ben marsh
c8b8fcbbed LiveCoding: Suppress dev channel log messages from console. Add a new server log channel that they are written to instead.
#rb none
#jira UE-71257

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5350628 in //UE4/Release-4.22/... via CL 5364828
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5404827 by ben marsh in Dev-Networking branch]
2019-03-14 18:58:35 -04:00
ben marsh
cb25506110 Move live coding settings back under the editor preferences window, since it's a user-specific thing.
#rb none
#jira UE-71126

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5350227 in //UE4/Release-4.22/... via CL 5364819
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5404823 by ben marsh in Dev-Networking branch]
2019-03-14 18:58:32 -04:00
maxime mercier
cdf8c7b9b4 Fix build break
#jira UE-71251
#rb trivial

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: maxime.mercier
#ROBOMERGE-SOURCE: CL 5359443 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5403809 by maxime mercier in Dev-Networking branch]
2019-03-14 18:03:59 -04:00
alexis matte
43adf31bb8 Fix LOD Material assignment error when reimporting staticmesh and there is some LODs that are generated and the order of the SectionInfoMap is changed by old re-import.
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5351520 via CL 5351521 via CL 5354156 via CL 5354233
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5403185 by alexis matte in Dev-Networking branch]
2019-03-14 17:46:14 -04:00
ben marsh
b8fcc29a92 Fix new project dialog allowing creation of new code projects even if an IDE is not installed.
#rb none
#jira UE-71070
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5343356 in //UE4/Release-4.22/... via CL 5343357
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401615 by ben marsh in Dev-Networking branch]
2019-03-14 17:07:36 -04:00
ben marsh
06697b7c6a LiveCoding: Disable the editor compile button while a compile is in progress.
#rb none
#jira UE-71077

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5343160 in //UE4/Release-4.22/... via CL 5343162
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401595 by ben marsh in Dev-Networking branch]
2019-03-14 17:06:58 -04:00
ben marsh
958520ba80 Restore code that was accidentally commented out while debugging.
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5341380 in //UE4/Release-4.22/... via CL 5341387
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401394 by ben marsh in Dev-Networking branch]
2019-03-14 17:02:02 -04:00
peter sauerbrei
e68ce50723 disable XGE shader compiling for IOS
#jira UE-33401
#rb john.mauney

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: peter.sauerbrei
#ROBOMERGE-SOURCE: CL 5340798 in //UE4/Release-4.22/... via CL 5340840
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401373 by peter sauerbrei in Dev-Networking branch]
2019-03-14 17:01:27 -04:00
ben marsh
651c0a51bf LiveCoding: Expose a Tick() function so that systems that don't use fire EndFrame() callbacks can still tick the live coding module. Also add a -LiveCoding command line argument to force it on.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5340479 in //UE4/Release-4.22/... via CL 5340483
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401335 by ben marsh in Dev-Networking branch]
2019-03-14 17:00:04 -04:00
alexis matte
2dd188cef4 Fix the packing of UV, make sure the temporary destination has enough indices to receive the new computed UVLightMap
#jira UE-71048
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5337966 in //UE4/Release-4.22/... via CL 5338978
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401309 by alexis matte in Dev-Networking branch]
2019-03-14 16:59:24 -04:00
maxime mercier
68b9001952 Fix build break
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: maxime.mercier
#ROBOMERGE-SOURCE: CL 5336932 via CL 5338226 via CL 5338257
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401235 by maxime mercier in Dev-Networking branch]
2019-03-14 16:57:37 -04:00
maxime mercier
c7736d1e7d When picking pawn in the GameplayDebugger, also selecting it in the editor. That way the BehaviorTreeEditor automatically changes to the right one.
#rb meiszko.zielinski

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: maxime.mercier
#ROBOMERGE-SOURCE: CL 5336887 via CL 5338221 via CL 5338253
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401231 by maxime mercier in Dev-Networking branch]
2019-03-14 16:57:30 -04:00
ben marsh
37468fe6fb Better handling of window focus when compiling for live code.
* Console window is made visible and brought to the front when a compile is triggered.
* Patched application window is brought to the front once patching is complete.

#rb none
#jira UE-71128

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5337696 in //UE4/Release-4.22/... via CL 5338036
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401218 by ben marsh in Dev-Networking branch]
2019-03-14 16:57:01 -04:00
alexis matte
d6e615ff6b Fix mesh merge utilities LOD extra material
#jira UE-70753
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5337463 in //UE4/Release-4.22/... via CL 5338031
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401213 by alexis matte in Dev-Networking branch]
2019-03-14 16:56:53 -04:00
user37337
00779196ea PR #5167: Fix infinite loop while building HLOD proxy meshes (Contributed by user37337)
#jira UE-65147
#rb Thomas.Sarkanen

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 5336919 in //UE4/Release-4.22/... via CL 5337927
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5400495 by jurre debaare in Dev-Networking branch]
2019-03-14 16:36:48 -04:00
jurre debaare
ea71807b2c Textures and Materials have their merged actor's name appended to their names
#jira UE-68800
#rb Thomas.Sarkanen

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 5336917 in //UE4/Release-4.22/... via CL 5337919
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5400493 by jurre debaare in Dev-Networking branch]
2019-03-14 16:36:45 -04:00
marcus wassmer
db87425ef0 Force integrate 5317515 from release-4.22 to fix some issues with 'undo'.
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 5337699 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376632 by marcus wassmer in Dev-Networking branch]
2019-03-12 21:25:54 -04:00
yujiang wang
dbb7e450d3 Fix various issues related to lightmap 2-texel padding not being considered
* UVs in lightmap density view were shifting after building lighting. Fixed by considering the padding even if lightmap data is invalid
* Auto generated lightmap UV was snapping charts to the whole padded lightmap instead of the actual valid center region. Fixed by subtracing 2 texels from the packing resolution
* Also fixed some merging conflicts of auto gen

#rb none
[FYI] brian.karis, daniel.wright
#jira UE-64923

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: yujiang.wang
#ROBOMERGE-SOURCE: CL 5320218 in //UE4/Release-4.22/... via CL 5337165
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376583 by yujiang wang in Dev-Networking branch]
2019-03-12 21:25:00 -04:00
brandon schaefer
25a566f107 Live coding is only available for Win32/Win64, dont try to include diasdk dir for other platforms
#jira none
#rb Ben.Marsh

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 5318794 in //UE4/Release-4.22/... via CL 5337033
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376481 by brandon schaefer in Dev-Networking branch]
2019-03-12 21:23:51 -04:00
rolando caloca
dfff9caa0b UE4.22 - Tessellation on Vulkan (experimental, disabled)
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5318719 in //UE4/Release-4.22/... via CL 5337029
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376475 by rolando caloca in Dev-Networking branch]
2019-03-12 21:23:47 -04:00
alexis matte
c8a8891e70 Fix MeshMergeUtilities when remapping polygon group
#jira UE-71016
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5317646 in //UE4/Release-4.22/... via CL 5336840
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376471 by alexis matte in Dev-Networking branch]
2019-03-12 21:23:36 -04:00
juan canada
31b2097cfb Undo //UE4/Main/... changelist 5335728
#rb marcus.wassmer

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5335770 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376135 by juan canada in Dev-Networking branch]
2019-03-12 21:19:38 -04:00
juan canada
341a17ce77 Copying //UE4/Private-Woodchuck-Staging[at]5316917 to Release-4.22 (//UE4/Release-4.22)
#rb none
#JIRA

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5317515 in //UE4/Release-4.22/... via CL 5335728
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376119 by juan canada in Dev-Networking branch]
2019-03-12 21:19:16 -04:00
mark satterthwaite
c1bd6d924f Duplicate 5263216 to aid debugging Metal shader issues in games using native shader libraries without having to cook locally:
Package Metal shader source into a zip file rather than a tgz so it can be done on Windows builds too and do this asynchronously while generating the Metal libraries. This file is stored in the MetaData folder so should be moved out of the content and not get packaged. Must be unzipped at the command-line for some reason, but it works.

#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5333983 via CL 5333997
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5374261 by mark satterthwaite in Dev-Networking branch]
2019-03-12 21:08:32 -04:00
alexis matte
2903e387b4 Make sure reduce LOD iterate the polygons in the same order has FOverlappingCorner
#jira UE-70292
#rb Brian.Karis

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5312959 in //UE4/Release-4.22/... via CL 5317545
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5331922 by alexis matte in Dev-Networking branch]
2019-03-06 18:47:14 -05:00