5 Commits

Author	SHA1	Message	Date
Andrew Grant	04588ce474	Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 3037465) ... #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 3037044 on 2016/07/04 by Ben.Woodhouse (Content only change) Roll back WorldAlignedNormal material function to the previous version (which worked properly). The broken version was actually checked in back in 2014 (//depot/UE4-Fortnite/...@2342687), but it only hit //UE4/main very recently. #jira OR-24849 #rb me Change 3036463 on 2016/07/01 by Andrew.Grant Clarified BP compiler message #rb na #tests compiled AnimBP_Grux_Base Change 3036424 on 2016/07/01 by Andrew.Grant Integrated fix from //UE4/Main for state not being cleared when rebuidling HMSM. #rb na #tests verified warnings gone after resaving Agora_Terrain Change 3036317 on 2016/07/01 by Ben.Salem Allow FTests to be run in succession, and allow them to also be run in game instead of just editor. These are engine changes that have been tested extensively in fortnite, and have gone through a minor test pass here as well. #rb william.ewen, bob.tellez #tests Ran through all of Howitzer's new FTests in one run! Change 3036168 on 2016/07/01 by Frank.Fella MovieSceneRendering - Fix a crash when deserializing burn in options. Change from Andrew Rodham. #rb Me for Andrew. #tests Movie scene renders in a separate process no longer crash when the burn in options are missing. Change 3035632 on 2016/07/01 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2 @ CL 3035536 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3035630 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3035237 on 2016/07/01 by Dmitry.Rekman Updated WebRTC libs to avoid SIGPIPE (OR-24857). - Should also remove debug output. - These fixes has been previously done for OR-13279 but apparently libs have been recompiled from earlier sources since that. - Current libs have been compiled by Lee Clark (CL 3034752). #rb Lee Clark #codereview Lee.Clark, Andrew.Grant, Sam.Zamani #tests Run PS4 client, made sure XMPP connection was established and got some traffic. Change 3035210 on 2016/07/01 by Andrew.Grant Fix for broken AI / abilities #rb none #tests Golden path with gadget, all abilities working, AI are happy and combatitive again Change 3034936 on 2016/06/30 by Josh.Markiewicz #UE4 - separated out basic features from update/patch/hotfix manager into generic engine class - left Orion specific overloads around #rb none #tests PS4/PC/Server hotfix and update checks (with and without update required) #codereview ian.fox, ben.zeigler, bob.tellez Change 3034935 on 2016/06/30 by Josh.Markiewicz #UE4 - make sure that mcp client keys, names, and ids can't have extraneous spaces in them from the ini file #codereview sam.zamani, shon.love, david.nikdel, eric.newman #tests paragon launch #rb none Change 3034933 on 2016/06/30 by Josh.Markiewicz #UE4 - moved OnlineHotfixManager out of deprecated classes directory #rb none #tests compiles Change 3034524 on 2016/06/30 by Andrew.Grant Fix for team assignment being broken in blueprints #rb Dan.OConnor #tests Golden Path with sparrow, verified arrow AOE color is correct and harvesters deliver XP Change 3034521 on 2016/06/30 by Andrew.Grant Setting replay version to 0 for v29 #rb none #tests none Change 3034483 on 2016/06/30 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Repair main build integration #RB:none #Tests:none [CodeReviewed]: david.ratti #ROBOMERGE-SOURCE: CL 3034395 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3034481 on 2016/06/30 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2 @ CL 3034181 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3034319 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3034464 on 2016/06/30 by Martin.Wilson Fix for trying to load preview mesh for skeleton when the preview meshes skeleton doesn't match #rb Jurre.DeBaare #tests Asset loading in the editor Change 3034194 on 2016/06/30 by Martin.Wilson Fix for rendering crash #codereview Rolando.Caloca #rb Rolando.Caloca #test editor startup Change 3034192 on 2016/06/30 by Andrew.Grant Removing Fortnight madness #codereview Ben.Marsh #rb none #tests compiled Change 3034106 on 2016/06/30 by Martin.Wilson Fix retargetting of anim blueprints so that all animations referred to are collected and duplicated, not just direct bp variables #rb Thomas.Sarkanen #tests In editor retargeting of various blueprint setups Change 3034041 on 2016/06/30 by Jason.Bestimt #ROBOMERGE-AUTHOR: antony.carter Exposing some of the slate interfaces for upcoming Social Plugin usage #RB Jamie.Dale #TESTS NA #ROBOMERGE-SOURCE: CL 3034040 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3033591 on 2016/06/29 by Andrew.Grant Merging //UE4/Main @ 3033257 through Orion-Staging #rb none #tests engine QA, golden path in PIE and out, BuildCookRun PS4 Change 3033545 on 2016/06/29 by Josh.Markiewicz #UE4 - fixed shadowed variable #rb none #tests compiles Change 3033462 on 2016/06/29 by Josh.Markiewicz #UE4 - notify game about net guid mismatch or net checksum failures #rb john.pollard #codereview john.pollard, dave.ratti, andrew.grant, matt.oelfke #tests triggered fake mismatches while networked Change 3033453 on 2016/06/29 by Josh.Markiewicz #UE4 - turned off extra logging feature now that the auth expiration issues have been solved - removes some bad log spam showing up in live (starting when already started, stopped when not started) #rb none #tests none #codereview ben.zeigler, sam.zamani Change 3033020 on 2016/06/29 by Jason.Bestimt #ROBOMERGE-AUTHOR: david.nikdel #OGF Merging //GamePlugins/Main/PluginTestGame/Plugins/OnlineGameplayFramework/... to //Orion/Main/OrionGame/Plugins/OnlineGameplayFramework/... --------- - Support for exclusive profile locking (by dedicated servers) - PostAdd event for IMcpItemAware - New McpItemDefinitionBase class - Support for converting to new colon-based template ids - Improvements to FJsonObjectWrapper (technically an engine change) - Ability to specify an explicit fulfillment class to instantiate - Ability to split catalog localization out from the main data. - Couple of Orion fix ups for the new code - Re-exported catalog (loc data now separated out) --------- #RB: none #TESTS: login, mcp, etc [CodeReviewed]: Jason.Bestimt #ROBOMERGE-SOURCE: CL 3033018 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3032623 on 2016/06/29 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2 @ CL 3032459 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3032516 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3032451 on 2016/06/29 by bruce.nesbit Added code in AutoPopulateInstanceProperties to populate vector and scalar parameter data. #rb SimonT #tests PIE Change 3031620 on 2016/06/28 by Aaron.McLeran Implementing CL 3029659 to Dev-General. Adding new minor feature to add new concurrency mode to allow not stopping old sounds if new sound is not lower priority (or is same priority) than any existing sounds in concurrency group #rb marc.audy #TESTS existing concurrency doesn't break. New concurrency rule results in not stopping sounds if new sound is not lower pri than existing sounds Change 3031616 on 2016/06/28 by Jason.Bestimt #ROBOMERGE-AUTHOR: bob.ferreira Fixed an additional cast issue (hopefully the last!) in SetupSkyIrradianceEnvironmentMapConstants where Scene objects were not being cast and/or null checked #rb Marcus.Wassmer #tests Compiled and verified clients connected to server #jira OR-24678 #ROBOMERGE-SOURCE: CL 3031610 in //Orion/Release-28/... via CL 3031611 via CL 3031613 via CL 3031614 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3031607 on 2016/06/28 by Josh.Markiewicz #UE4 - pass the UniqueNetId along with client beacons so the server can tell who is making requests #rb sam.zamani #codereview paul.moore #tests draft lobby golden path Change 3031606 on 2016/06/28 by Josh.Markiewicz #UE4 - added code to stop logging out players from reservation beacon on timeouts if game doesn't request it #rb sam.zamani #codereview paul.moore #tests draft lobby golden path Change 3031598 on 2016/06/28 by Josh.Markiewicz #UE4 - FUniqueNetIdRepl is stored on the UNetConnection and passed into engine login functions rather than TSharedPtr<FUniqueNetId> - wrapped class is safer and simplifies some other code #rb sam.zamani #tests draft lobby golden path #codereview paul.moore Change 3031523 on 2016/06/28 by Josh.Markiewicz #UE4 - added ToDebugString to FUniqueNetIdRepl #rb none #tests draft lobby golden path Change 3031366 on 2016/06/28 by Jason.Bestimt #ROBOMERGE-AUTHOR: bob.ferreira Adding proper checks for Scene objects if it returns null #rb Marcus.Wassmer #tests Compiled and verified clients connected to server #jira OR-24678 #ROBOMERGE-SOURCE: CL 3031361 in //Orion/Release-28/... via CL 3031362 via CL 3031363 via CL 3031365 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3030919 on 2016/06/28 by Jason.Bestimt #ROBOMERGE-AUTHOR: bob.ferreira Fixed issue that was causing client bots to crash when running with -nullrhi. Now use interface provided by the Scene object. #rb Marcus.Wassmer #tests Compiled and verified clients connected to server #jira OR-24678 #ROBOMERGE-SOURCE: CL 3030914 in //Orion/Release-28/... via CL 3030915 via CL 3030916 via CL 3030917 #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3030715 on 2016/06/28 by David.Ratti removing warning. It is valid to use the ability system with actors without an animinstance. #rb none #test compile Change 3030663 on 2016/06/28 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2 @ CL 3030407 #RB:none #Tests:none #ROBOMERGE-SOURCE: CL 3030660 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3030533 on 2016/06/28 by Marcus.Wassmer Fix incorrect warning #rb none #test none #codereview Daniel.Lamb Change 3030526 on 2016/06/28 by bruce.nesbit Re-added MaxRoughness changes in scalability config and added ECVF_Scalability to the CVar for same #rb none #codereview Marcus.Wassmer #tests PIE Change 3029022 on 2016/06/27 by Jason.Bestimt #ROBOMERGE-AUTHOR: jason.bestimt #ORION_MAIN - Merge 28.2 @ CL 3028879 #RB:none #tests:none #ROBOMERGE-SOURCE: CL 3029020 in //Orion/Main/... #ROBOMERGE-BOT: ORION (Main -> Dev-General) Change 3028712 on 2016/06/27 by David.Ratti AbilitySystem debug hud -Made this more accessible from the base engine system. No longer required to forward calls from the owning actor class'es DisplayDebug function PlayerController::DisplayDebug -Set DisplayDebugManager's Y pos to the out Y pos, so that subsequent debug huds don't overlap with this one #rb none #tests gameplay ability sample project [CL 3043787 by Andrew Grant in Main branch]	2016-07-08 22:29:24 -04:00
Nick Darnell	6d921f179a	Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) ... #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2771249 on 2015/11/18 by Joe.Tidmarsh Ensure that UCircularThrobber's Radius determines the widget's desired size when a child of UCanvasPanelSlot. #jira UE-23186 Change 2794402 on 2015/12/08 by Joe.Tidmarsh Reverting recent changes to Circular throbber. It's unintuative to enforce Size To Content. Will find some other solution. Change 2803507 on 2015/12/15 by Richard.TalbotWatkin BSP poly extrusion can now only be done in the normal direction of the poly. #jira UE-24168 - BSP face breaks off when extruding on Y or Z axes Change 2803510 on 2015/12/15 by Richard.TalbotWatkin Building new static mesh LODs now initializes override vertex colors based on LOD0. #jira UE-23747 - CLONE - if LODs are generated for meshes with vertex colors in a level the vertex colors dont propagate to the LOD in the level Change 2808877 on 2015/12/18 by Alexis.Matte Make sure the delta scale sign is swap when we have multiple axis with different sign current axis value #jira UE-21574 #codereview nick.darnell Change 2810114 on 2015/12/21 by Alexis.Matte #jira UE-23769 We now expose a message telling the user that we found some mesh that are not reference by any scene node in the fbx file. #codereview nick.darnell Change 2810211 on 2015/12/21 by Richard.TalbotWatkin Fixed issue with Show Only Selected not showing members of actor groups. #jira UE-24453 - CLONE - Show Selected is broken for certain Orion meshes Change 2811035 on 2015/12/22 by Alexis.Matte #jira UE-24671 Polish UI #codereview nick.darnell Change 2811123 on 2015/12/22 by Alexis.Matte #jira UE-21936 We now can decide which fbx sdk compatibility version we can use when exportting to a fbx file. #codereview nick.darnell Change 2812830 on 2015/12/28 by Richard.TalbotWatkin Prevent engine assets' properties from having project assets assigned to them. #jira UE-18215 - Details panel: prevent engine content from referencing game content Change 2812854 on 2015/12/28 by Richard.TalbotWatkin Fixed issue where floating windows were having their border size erroneously added again and again. Allowed PIE windows to not respect work area bounds if they are created centered, so that they can overlap off the edge of the screen. #jira UE-24465 - 10 Pixels Added to Width & Height of Floating Editor Windows Each Time Project is Reopened #jira UE-24364 - "Always Center Window to Screen" No Longer Functioning in New Editor Window (PIE) Change 2812875 on 2015/12/28 by Alexis.Matte #jira ue-22237 first implementation for skeletal mesh scene import and reimport. Small refator to remove duplicate code in different fbx list ui. #codereview nick.darnell Change 2813172 on 2015/12/29 by Alexis.Matte #jira ue-21656 Partial submit, the base code is there to add all light type with there properties. #codereview nick.darnell Change 2813403 on 2015/12/30 by Richard.TalbotWatkin PIE in New Editor Window now respects the Game Gets Mouse Control setting. This provides a workaround for UE-24824 where attempting to drag a PIE window fails due to the viewport capturing and locking the mouse to itself in FSceneViewport::OnFocusReceived. Change 2813429 on 2015/12/30 by Alexis.Matte #jira ue-21656 -spotlight and point light support fbx attenuation -fix the light orientation so now directional and spotlight point to the same direction of the fbx #codereview nick.darnell Change 2813456 on 2015/12/30 by Alexis.Matte #jira ue-21656 -Import the camera from fbx #codereview nick.darnell Change 2813457 on 2015/12/30 by Richard.TalbotWatkin Fixed issues with the code which determines whether the user is attempting to assign a game asset/class to an engine asset's property. #jira UE-18215 - Details panel: prevent engine content from referencing game content Change 2813475 on 2015/12/30 by Richard.TalbotWatkin Removed erroneous debug code. Change 2814451 on 2016/01/04 by Joe.Tidmarsh Fixed Tint colour for circular throbber. #jira UE-24445 Change 2814546 on 2016/01/04 by Richard.TalbotWatkin Force Message Log to update its category list if a new category is added while it is open. #jira UE-24266 - Message Log not updating Categories in Real-Time Change 2814613 on 2016/01/04 by Alexis.Matte [CL 2851481 by Nick Darnell in Main branch]	2016-02-01 14:57:29 -05:00
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
Marc Audy	e5bb9b4d0d	Integrate all non-branch Engine/Source changes from //depot/UE4-Orion to //depot/UE4 ... #lockdown Ben.Marsh #platformnotify Josh.Adams [CL 2718236 by Marc Audy in Main branch]	2015-10-06 15:59:09 -04:00