mickael gilabert
|
1cb70c6300
|
Fixed build
#jira ue-72594
#rnx
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mickael.gilabert
#ROBOMERGE-SOURCE: CL 5820741 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5858144 by mickael gilabert in Dev-VR branch]
|
2019-04-12 13:59:27 -04:00 |
|
krzysztof narkowicz
|
a622404ae6
|
Fixed FGeometryCollectionSceneProxy rendering assert.
#jira UE-72116
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: krzysztof.narkowicz
#ROBOMERGE-SOURCE: CL 5650371 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5657600 by krzysztof narkowicz in Dev-VR branch]
|
2019-03-29 17:31:12 -04:00 |
|
rolando caloca
|
1d1d8f7975
|
UE4.22 - Remove almost all of ENQUEUE_UNIQUE_RENDER_COMMAND_TWOPARAMETER
#rb none
#jira
#rnx
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5054105 in //UE4/Release-4.22/... via CL 5054376
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5134635 by rolando caloca in Dev-VR branch]
|
2019-02-22 03:27:38 -05:00 |
|
rolando caloca
|
4584acbc2d
|
Unshelved from pending changelist '4932645':
[CODEREVIEW] rolando.caloca,ben.marsh,cristina.riveron,nick.bullard,nick.penwarden
Merge conflict.
rolando.caloca, please merge this change by hand.
More info at https://robomerge.epicgames.net#RELEASE
/src/ROBOMERGE_RELEASE_Main/Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraEmitterInstanceBatcher.cpp - merging //UE4/Release-4.22/Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraEmitterInstanceBatcher.cpp#2
--------------------------------------
UE4.22 - Deprecate ENQUEUE_UNIQUE_RENDER_COMMAND_THREEPARAMETER
#rb none
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4932643 in //UE4/Release-4.22/... via CL 4932685
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5019529 by rolando caloca in Dev-VR branch]
|
2019-02-16 01:57:06 -05:00 |
|
marcus wassmer
|
b259f65406
|
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4854570 by marcus wassmer in Dev-VR branch]
|
2019-01-30 21:24:04 -05:00 |
|
Ryan Vance
|
cf29818a4d
|
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration
Unblocking RoboMerge
[CL 4836190 by Ryan Vance in Dev-VR branch]
|
2019-01-29 17:41:46 -05:00 |
|
Ryan Vance
|
7c51ff94af
|
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
CL 1 of 8
#rb integration
[CL 4748712 by Ryan Vance in Dev-VR branch]
|
2019-01-17 18:54:05 -05:00 |
|