ben marsh
0376237b8a
Fix exception when exporting JSON for SwarmInterface. Fixes CIS error with IncludeTool.
...
#rb none
#jira UE-72992
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5980951 in //UE4/Release-4.22/... via CL 5980952
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5986787 by ben marsh in Dev-VR branch]
2019-04-18 13:01:58 -04:00
bart hawthorne
abb09908e2
Fix issue where live++ recompile would execute old hotreload system code that would trigger an exception in monolithic builds
...
[FYI] ben.marsh
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bart.hawthorne
#ROBOMERGE-SOURCE: CL 5563075 via CL 5564799 via CL 5564894
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5585998 by bart hawthorne in Dev-VR branch]
2019-03-27 01:47:48 -04:00
ben marsh
f51b07e8f9
Fix missing plugin error at startup.
...
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5459335 via CL 5461952 via CL 5462074
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5480322 by ben marsh in Dev-VR branch]
2019-03-20 13:52:14 -04:00
ben marsh
c27594562e
UBT: Make mismatched supported target platforms an error.
...
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5459241 via CL 5460114 via CL 5460172
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5480307 by ben marsh in Dev-VR branch]
2019-03-20 13:51:42 -04:00
ben marsh
a947a59b4f
Add a warning when a plugin reference overrides the plugin's list of supported target platforms. Silently failing at build time will cause errors at runtime.
...
[FYI] Justin.Marcus
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5459133 via CL 5459920 via CL 5460056
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5479786 by ben marsh in Dev-VR branch]
2019-03-20 13:48:20 -04:00
ben marsh
8281e6e108
Fix exception when hot-reloading a module that contains an additional bundle resource. List of hot-reload build products for each module now only includes import library and DLL.
...
#rb none
#jira UE-71692
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5458343 in //UE4/Release-4.22/... via CL 5458360
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5476657 by ben marsh in Dev-VR branch]
2019-03-20 13:27:20 -04:00
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
ben marsh
e40dec9ee0
Integrating live coding feature (aka Live++) into UE4.
...
Allows fast iteration of C++ changes without restarting the application. To use, select the "Live Coding (Experimental)" mode from the drop down menu next to the editor's compile button, or type "LiveCoding" into the console for a monolithic build. Press Ctrl+Alt+F11 to find changes and compile.
Changes vs standalone Live++ version:
* UBT is used to execute builds. This allows standard UE4 adaptive unity mode, allows us to reuse object files when we do regular builds, supports using any build executor allowed by UBT (XGE, SNDBS, etc..).
* Adding new source files is supported.
* Custom visualizer for FNames is supported via a weakly linked symbol in a static library (Engine/Extras/NatvisHelpers).
* Settings are exposed in the editor's project settings dialog.
* Standalone application has been rewritten as a Slate app ("LiveCodingConsole"). There is an additional option to start the program as hidden, where it will not be visible until Ctrl+Alt+F11 is hit. Similarly, closing the window will hide it instead of closing the application.
* Does not require a standalone licensed version of Live++.
Known issues:
* Does not currently support class layout changes / object reinstancing
#rb none
[FYI] Marc.Audy, Stefan.Boberg, Nick.Penwarden
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5304722 in //UE4/Release-4.22/... via CL 5309051
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5329502 by ben marsh in Dev-VR branch]
2019-03-06 18:34:25 -05:00
ben marsh
946b3616ed
UBT: Allow modules to disable PCHs entirely by setting PCHUsage = PCHUsageMode.NoPCHs.
...
#rb none
#jira
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5240326 in //UE4/Release-4.22/... via CL 5240327
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5257163 by ben marsh in Dev-VR branch]
2019-02-28 18:38:17 -05:00
josh adams
019c12863e
- Merging Dev-Kairos/Engine/... to Main/Engine/...
...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5244512 by josh adams in Dev-VR branch]
2019-02-28 17:06:02 -05:00
ben marsh
ac349c1ce9
Add a flag which allows overriding the shared compile environment with custom build settings.
...
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5200081 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5223256 by ben marsh in Dev-VR branch]
2019-02-26 22:17:10 -05:00
ben marsh
e639816144
UBT: Add support for writing a header containing the public compile environment for modules in the primary binary of a target (including all *_API macros in 'export' mode). To use, set ExportPublicHeader = "Foo.h" from the target.cs file.
...
#jira
[CODEREVIEW] Josh.Adams
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5175655 via CL 5175725 via CL 5177123
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5221734 by ben marsh in Dev-VR branch]
2019-02-26 21:33:54 -05:00
ben marsh
38a256cfc5
UBT: Fix module manifest not being updated correctly when -ModuleWithSuffix is passed on the command line.
...
#rb none
#rnx
#jira UE-69366
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4957024 in //UE4/Release-4.22/... via CL 4968440
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5030952 by ben marsh in Dev-VR branch]
2019-02-16 05:55:23 -05:00
ben marsh
f762e27764
UBT: Prevent hot reload attempting to build non-C++ modules.
...
#rb none
#jira UE-69518
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4952727 in //UE4/Release-4.22/... via CL 4968346
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5030939 by ben marsh in Dev-VR branch]
2019-02-16 05:54:58 -05:00
david harvey
6aba7c3e99
enable XMA2 streaming on platforms that support it
...
#rb aaron.mcleran
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4935528 via CL 4935535 via CL 4940171 via CL 4941360
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5023420 by david harvey in Dev-VR branch]
2019-02-16 02:52:18 -05:00
david harvey
a0b04cab91
add missing XMA2 streaming define, currently disabled.
...
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4931727 via CL 4931729 via CL 4939897 via CL 4939959
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5022678 by david harvey in Dev-VR branch]
2019-02-16 02:40:24 -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
ab8fb20fd6
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
#lockdown nick.whiting
[CL 4821712 by Ryan Vance in Dev-VR branch]
2019-01-27 21:49:07 -05:00
Ryan Vance
82046cb96e
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
#lockdown nick.whiting
[CL 4819818 by Ryan Vance in Dev-VR branch]
2019-01-25 23:58:19 -05:00
Joe Conley
c12a880a0c
Unshelved from pending changelist '4791207':
...
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5
#rb Ryan.Vance
[CL 4792243 by Joe Conley in Dev-VR branch]
2019-01-23 19:56:41 -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
Jason Bestimt
e7ed7cd3ff
Unblock robomerge from Main
...
#RB:none
[CL 4604382 by Jason Bestimt in Dev-VR branch]
2018-11-28 15:05:11 -05:00
marc audy
aa583e8b9b
Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4530863
...
#rb none
#rnx
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4530881 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4530887 by marc audy in Dev-VR branch]
2018-11-01 09:57:45 -04:00
Jason Bestimt
011680795f
Merging //UE4/Main to Dev-VR-Minimal (//UE4/Dev-VR-Minimal)
...
Unblocking robomerge
#RB:none
[CL 4524004 by Jason Bestimt in Dev-VR branch]
2018-10-30 11:00:11 -04:00
ben marsh
5a701625db
Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4502288 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4502301 by ben marsh in Dev-VR branch]
2018-10-24 11:55:58 -04:00