Commit Graph

27 Commits

Author SHA1 Message Date
josh adams
393524e397 - Updated icon files in some Epic programs for Modern Xcode, and point to existing plist files
#jira UE-192894

[CL 27108980 by josh adams in ue5-main branch]
2023-08-15 13:16:49 -04:00
robert millar
2ac24cb374 Add target rules option for enabling trace.
#rb ionut.matasaru

[CL 27011549 by robert millar in ue5-main branch]
2023-08-10 17:10:14 -04:00
valentin ritzi
584b19314c [Concert] Adapting ConcertSyncServer / UnrealMultiUserServer to work with QuicMessaging
Adapting the ConcertSyncServer and the UnrealMultiUserServer configs and code to work with QuicMessaging as an alternative to UdpMessaging.

#rb jason.walter, manuel.lang

[CL 26176714 by valentin ritzi in ue5-main branch]
2023-06-22 04:26:21 -04:00
christopher waters
6a4206d490 Removing bad Launch include paths from programs.
[CL 24328631 by christopher waters in ue5-main branch]
2023-02-20 17:39:13 -05:00
jason walter
52308eb827 Split concert client code from concert server code to allow us to incorporate game tags in the editor client.
#rb dominik.peacock
#jira UE-168182
#preflight 63c6cf3c02024f93d8635de3

[CL 23739781 by jason walter in ue5-main branch]
2023-01-17 12:04:24 -05:00
dominik peacock
39ca01eed3 Final UX improvements for Multi-User.
Non-code changes:
- Add taskbar icons for UnrealMultiUserServer (Windows, Mac, Linux)
- Update taskbar icons for UnrealMultiUserSlateServer (Windows, Mac, Linux)
- Adjust icon on the top-left corner of window UnrealMultiUserSlateServer
- Adjust the "Create Session" button icon (shown in editor)
- Adjust the "Close server" button icon (shown in editor)
Code change:
- Disable the "Create Session" button in UnrealMultiUserSlateServer
- Make the "Launch Server" button (shown in editor) launch the slate server by default instead of the console one

#jira UE-166219
#rb Jason.Walter
#lockdown Alejandro.Arango
#preflight 633eb5a8f171e4e68b6f2850

[CL 22388876 by dominik peacock in ue5-main branch]
2022-10-06 20:11:57 -04:00
jason walter
ed799330a4 Create separate program UnrealMultiUserSlateServer
Main implementation by Dominik with build and switchboard support added by me.

#jira UE-147235
#rb Dominik.Peacock
#preflight 6284fa081f474f0660ecb74e

[CL 20264867 by jason walter in ue5-main branch]
2022-05-18 14:02:54 -04:00
Dominik Peacock
50e7408a55 Rename ConcertServerUI to MultiUserServer and move it to ConcertApp folder
#jira none
#rb none
#preflight 6241802a775402d5ddd26a8a

[CL 19525053 by Dominik Peacock in ue5-main branch]
2022-03-28 06:36:49 -04:00
Dominik Peacock
ff8b0c25c7 Create slate UI for multi user server
#jira UE-138321
#rb Jason.Walter
#preflight 6204f7f8a8129f65b75914e9

[CL 18949739 by Dominik Peacock in ue5-main branch]
2022-02-11 02:23:45 -05:00
jason walter
222468639f Add missing logging to MacOS shutdown.
#rb none
#jira UE-135725

#ROBOMERGE-AUTHOR: jason.walter
#ROBOMERGE-SOURCE: CL 18284108 in //UE5/Release-5.0/... via CL 18284160
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18284167 by jason walter in ue5-release-engine-test branch]
2021-11-24 10:41:59 -05:00
jack porter
946b30a59a Remove UE3/UE4 references
#jira UE-112108
#jira UE-111469
#jira UE-111456
#jira UE-111451
#jira UE-111331
#jira UE-111149
#jira UE-111136
#jira UE-110941
#jira UE-104701
#rb trivial
[FYI] Chris.Babcock
#preflight 606446947a99880001b3cbac

#ROBOMERGE-SOURCE: CL 15872931 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15872932 by jack porter in ue5-main branch]
2021-03-31 06:40:14 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Patrick Laflamme
46a97aa166 On Mac, added a warning log when the console output device terminate the application because this was the last window closed (with the X)
On Mac, added a warning log when UnrealMultiUserServer terminates because user closed it with CMD-Q (or from menu) or by logging out, shutting down or rebooting the computer.
On Mac, added a reason (logout, sys. restart, sys shutdown, user quitting) to the engine quit request when UnrealMultiUserServer is asked to quit.

#jira UE-106186 - Expected warnings are not shown in logs when UnrealMultiUserServer window is closed
#rb Jason.Walter, Michael.Trepka

[CL 15145104 by Patrick Laflamme in ue5-main branch]
2021-01-20 12:01:55 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
JeanMichel Dignard
84facd6d15 Copy from dev-enterprise cl 11097196
#rb none
#rnx

[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-23 16:28:59 -05:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
Ryan Durand
74c879d5f3 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870960 by Ryan Durand in Main branch]
2019-12-26 23:06:02 -05:00
Chris Gagnon
346a4b05ea Copy up from Dev-Editor @10681378
#rb none

[CL 10837446 by Chris Gagnon in Dev-Tools-Staging branch]
2019-12-19 18:07:47 -05:00
Patrick Laflamme
b6c6bd4be0 #jira UE-82767 - Multi-User log spam in editor
- Fixed verbosity of Multi-User/DisasterRecover endpoint discovery by adding a new log category "LogConcertDebug" defaulting to "Warning" except for the Multi-User server which default to "Log" level. The category verbosity can be adjusted from the command line as: -LogCmds="LogConcertDebug Verbose" or from a console command as: log LogConcertDebug Verbose.
  - Prevented Disaster Recovery client from discovering (and logging) all recovery services running.

#rb Francis.Hurteau

[CL 10467794 by Patrick Laflamme in Dev-VirtualProduction branch]
2019-11-27 09:00:18 -05:00
patrick laflamme
93ab27052b #jira UE-83339 - Disaster Recovery can fail to recover its session when the project is opened from the Project Browser
- Fixed a disaster recovery bug preventing the Editor from recovering a session because another instance of the Editor on another project already locked all the sessions.

Problem:

On windows, the CrashReportClientEditor (hosting disaster recovery service) is started in the static initialization, before the engine is initialized, not allowing lot of command line configuration. The Editor project browser would start a first CrashReportClientEditor instance, which would load and lock all the available sessions (unless another CrashReportClientEditor was running). When the user selected a project, a new Editor and CrashReportClientEditor were launched before the first one was closed. The second instance could not access the existing sessions because they were still locked by the first instance.

Solution:

Because CrashReportClientEditor is launch before the engine is initialized, we don't have any context at the launch time. The best the was to delay the moment when the server reloads the existing sessions and enable each clients to store their sessions in different folders (repositories) mounted on demand by the server.

Implementation details:
  - Implemented new RPC API to allow the client to list/create/load/drop specific repositories containing its own sessions on demand.
  - Updated the Concert server to manage multiples directories where session can be stored/found (session repositories) rather than just one.
  - Added a settings to allow the user to specify where the disaster recovery sessions should be stored on the disk. Now default in the current project folder.
  - Added a settings to prevent the Concert server from scanning the sessions in the default location.
  - Updated disaster recovery to start without any session repository and let the client decide if a new one needs to be created or an existing one be mounted to restore a previous session.
  - Changed the code to let disaster recovery client manage its session history rather than letting the server rotate the old session. Defaulted the history to 0, user has no flow to visualize and pick from the history.

#rb Jamie.Dale

#ROBOMERGE-SOURCE: CL 10260823 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v591-10236483)

[CL 10260830 by patrick laflamme in Main branch]
2019-11-15 12:55:57 -05:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
francis hurteau
ba7ee8e78c Properly go through shutdown process and flush logs when shutting down the server abnormaly
#jira UE-72745
#rb Jamie.Dale

#ROBOMERGE-SOURCE: CL 7248229 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7248230 by francis hurteau in Main branch]
2019-07-09 10:13:19 -04:00
francis hurteau
9e430f8ba5 Properly flush logs when shutting down the multi-user server
#jira UE-72745
#rb none
[CODEREVIEW] Jamie.Dale

#ROBOMERGE-SOURCE: CL 7233710 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7233713 by francis hurteau in Main branch]
2019-07-08 16:53:12 -04:00
JeanMichel Dignard
0f9ad96858 Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden
#rb none

[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -04:00
Ben Marsh
a22b952aa9 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -05:00