Commit Graph

5 Commits

Author SHA1 Message Date
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Andrew Grant
c0452957a1 Merging latest engine code from Orion via //depot/UE4-To-//UE4/Main
[CL 2744667 by Andrew Grant in Main branch]
2015-10-28 08:58:16 -04:00
Dmitry Rekman
91823b5880 QoSReporter: add average FPS (point-sampled) reporting.
(Merging CLs 2701668, 2702482, 2703275, 2703344,  2703548 to the main branch)

[CL 2704503 by Dmitry Rekman in Main branch]
2015-09-24 11:16:35 -04:00
Daniel Lamb
f36d8ac259 Fixed compilation issue.
#codereview Dmitry .Rekman

[CL 2690927 by Daniel Lamb in Main branch]
2015-09-14 17:35:14 -04:00
Dmitry Rekman
ee863dea42 QoS metrics: add generic module (OP-1132).
(Merging CLs 2688852, 2689232 to the main branch)

[CL 2690718 by Dmitry Rekman in Main branch]
2015-09-14 15:26:41 -04:00