Ryan Vance
|
35eb0041ab
|
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration
[CL 5387703 by Ryan Vance in Dev-VR branch]
|
2019-03-13 15:19:08 -04:00 |
|
marcus wassmer
|
d0f97133e3
|
Force integrate 5317515 from release-4.22 to fix some issues with 'undo'.
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 5337699 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5387476 by marcus wassmer in Dev-VR branch]
|
2019-03-13 14:52:34 -04:00 |
|
juan canada
|
20bb1c977d
|
Undo //UE4/Main/... changelist 5335728
#rb marcus.wassmer
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5335770 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5387094 by juan canada in Dev-VR branch]
|
2019-03-13 14:40:42 -04:00 |
|
juan canada
|
880a03181c
|
Copying //UE4/Private-Woodchuck-Staging[at]5316917 to Release-4.22 (//UE4/Release-4.22)
#rb none
#JIRA
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5317515 in //UE4/Release-4.22/... via CL 5335728
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5387087 by juan canada in Dev-VR branch]
|
2019-03-13 14:40:25 -04:00 |
|
nick darnell
|
8396c5ecfb
|
Trying to get main compiling again, changing LightColor to >GetEffectiveLightColor, please review this to make sure it is correct.
Marcus.Wassmer
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.darnell
#ROBOMERGE-SOURCE: CL 5164453 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5221434 by nick darnell in Dev-VR branch]
|
2019-02-26 21:24:46 -05:00 |
|
juan canada
|
8a0d324456
|
Copying //UE4/Private-Woodchuck-Staging[at]4997051 to Release-4.22 (//UE4/Release-4.22)
#rb none
#jira
[FYI] marcus.wassmer
[FYI] zachary.wilson
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 4997195 in //UE4/Release-4.22/... via CL 4997198
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5077272 by juan canada in Dev-VR branch]
|
2019-02-19 18:10:24 -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 |
|